From 4670be9bba6eaccdf373206cf17da88f198dc6bf Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Fri, 14 Feb 2025 17:48:18 +0530 Subject: [PATCH] Move --- web/packages/gallery/components/FileInfo.tsx | 10 ++++++++-- .../components/FileInfoComponents.tsx} | 2 +- web/packages/new/photos/components/gallery/reducer.ts | 10 +++++----- web/packages/new/photos/services/ml/blob.ts | 2 +- web/packages/new/photos/services/ml/index.ts | 2 +- web/packages/new/photos/services/ml/worker.ts | 2 +- 6 files changed, 17 insertions(+), 11 deletions(-) rename web/packages/{new/photos/components/FileInfo.tsx => gallery/components/FileInfoComponents.tsx} (93%) diff --git a/web/packages/gallery/components/FileInfo.tsx b/web/packages/gallery/components/FileInfo.tsx index 0e28b39e37..120f81517d 100644 --- a/web/packages/gallery/components/FileInfo.tsx +++ b/web/packages/gallery/components/FileInfo.tsx @@ -2,7 +2,13 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ /* eslint-disable @typescript-eslint/no-unnecessary-condition */ /* eslint-disable @typescript-eslint/no-unused-expressions */ -/* TODO: Audit this file */ +/* TODO: Audit this file +Plan of action: +- Move common components into FileInfoComponents.tsx + +- Move the rest out to files in the apps themeselves: albums/SharedFileInfo + and photos/FileInfo to deal with the @/new/photos imports here. +*/ /* @ts-nocheck */ import { LinkButtonUndecorated } from "@/base/components/LinkButton"; @@ -18,6 +24,7 @@ import { haveWindow } from "@/base/env"; import { nameAndExtension } from "@/base/file-name"; import log from "@/base/log"; import type { Location } from "@/base/types"; +import { CopyButton } from "@/gallery/components/FileInfoComponents"; import { changeCaption, changeFileName, @@ -32,7 +39,6 @@ import { type ParsedMetadataDate, } from "@/media/file-metadata"; import { FileType } from "@/media/file-type"; -import { CopyButton } from "@/new/photos/components/FileInfo"; import { ChipButton } from "@/new/photos/components/mui/ChipButton"; import { FilePeopleList } from "@/new/photos/components/PeopleList"; import { PhotoDateTimePicker } from "@/new/photos/components/PhotoDateTimePicker"; diff --git a/web/packages/new/photos/components/FileInfo.tsx b/web/packages/gallery/components/FileInfoComponents.tsx similarity index 93% rename from web/packages/new/photos/components/FileInfo.tsx rename to web/packages/gallery/components/FileInfoComponents.tsx index 57a9277cea..fda2bc286e 100644 --- a/web/packages/new/photos/components/FileInfo.tsx +++ b/web/packages/gallery/components/FileInfoComponents.tsx @@ -1,9 +1,9 @@ +import { aboveFileViewerContentZ } from "@/new/photos/components/utils/z-index"; import ContentCopyIcon from "@mui/icons-material/ContentCopy"; import DoneIcon from "@mui/icons-material/Done"; import { IconButton, Tooltip, type SvgIconProps } from "@mui/material"; import { t } from "i18next"; import { useState } from "react"; -import { aboveFileViewerContentZ } from "./utils/z-index"; interface CopyButtonProps { /** diff --git a/web/packages/new/photos/components/gallery/reducer.ts b/web/packages/new/photos/components/gallery/reducer.ts index 72c6d31b4f..8c4f9c3b27 100644 --- a/web/packages/new/photos/components/gallery/reducer.ts +++ b/web/packages/new/photos/components/gallery/reducer.ts @@ -1,3 +1,8 @@ +import { + isArchivedCollection, + isArchivedFile, + isPinnedCollection, +} from "@/gallery/services/magic-metadata"; import { COLLECTION_ROLE, CollectionType, @@ -34,11 +39,6 @@ import { sortFiles, uniqueFilesByID, } from "../../services/files"; -import { - isArchivedCollection, - isArchivedFile, - isPinnedCollection, -} from "../../services/magic-metadata"; import type { PeopleState, Person } from "../../services/ml/people"; import type { SearchSuggestion } from "../../services/search/types"; import type { FamilyData } from "../../services/user-details"; diff --git a/web/packages/new/photos/services/ml/blob.ts b/web/packages/new/photos/services/ml/blob.ts index cfab9eea1d..57634e995c 100644 --- a/web/packages/new/photos/services/ml/blob.ts +++ b/web/packages/new/photos/services/ml/blob.ts @@ -1,12 +1,12 @@ import { basename } from "@/base/file-name"; import type { ElectronMLWorker } from "@/base/types/ipc"; import { downloadManager } from "@/gallery/services/download"; +import type { UploadItem } from "@/gallery/services/upload"; import { renderableImageBlob } from "@/gallery/utils/convert"; import { readStream } from "@/gallery/utils/native-stream"; import type { EnteFile } from "@/media/file"; import { FileType } from "@/media/file-type"; import { decodeLivePhoto } from "@/media/live-photo"; -import type { UploadItem } from "../upload/types"; /** * An image bitmap and its RGBA data. diff --git a/web/packages/new/photos/services/ml/index.ts b/web/packages/new/photos/services/ml/index.ts index 9d40315ff1..207a02d863 100644 --- a/web/packages/new/photos/services/ml/index.ts +++ b/web/packages/new/photos/services/ml/index.ts @@ -9,13 +9,13 @@ import log from "@/base/log"; import { masterKeyFromSession } from "@/base/session-store"; import type { Electron } from "@/base/types/ipc"; import { ComlinkWorker } from "@/base/worker/comlink-worker"; +import type { UploadItem } from "@/gallery/services/upload"; import type { EnteFile } from "@/media/file"; import { FileType } from "@/media/file-type"; import { throttled } from "@/utils/promise"; import { proxy, transfer } from "comlink"; import { getRemoteFlag, updateRemoteFlag } from "../remote-store"; import { setSearchPeople } from "../search"; -import type { UploadItem } from "../upload/types"; import { addUserEntity, pullUserEntities, diff --git a/web/packages/new/photos/services/ml/worker.ts b/web/packages/new/photos/services/ml/worker.ts index 1b76ed7df8..48f6213677 100644 --- a/web/packages/new/photos/services/ml/worker.ts +++ b/web/packages/new/photos/services/ml/worker.ts @@ -3,11 +3,11 @@ import { assertionFailed } from "@/base/assert"; import { isHTTP4xxError } from "@/base/http"; import log from "@/base/log"; import type { ElectronMLWorker } from "@/base/types/ipc"; +import type { UploadItem } from "@/gallery/services/upload"; import { fileLogID, type EnteFile } from "@/media/file"; import { wait } from "@/utils/promise"; import { expose, wrap } from "comlink"; import { getAllLocalFiles, getLocalTrashedFiles } from "../files"; -import type { UploadItem } from "../upload/types"; import { createImageBitmapAndData, fetchRenderableBlob,