Move

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";

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 {
     /**

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";

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.

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,

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,