From 543b180137c23ad71d5e437f2aedf2b498a36170 Mon Sep 17 00:00:00 2001 From: Manav Rathi Date: Mon, 5 Aug 2024 20:20:58 +0530 Subject: [PATCH] Rename II --- .../components/Collections/CollectionOptions/index.tsx | 8 ++++---- web/apps/photos/src/services/collectionService.ts | 2 +- web/apps/photos/src/utils/collection/index.ts | 2 +- web/apps/photos/src/utils/file/index.ts | 4 ++-- web/apps/photos/src/utils/magicMetadata/index.ts | 6 +++--- web/packages/new/photos/types/magicMetadata.ts | 9 ++++++--- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/web/apps/photos/src/components/Collections/CollectionOptions/index.tsx b/web/apps/photos/src/components/Collections/CollectionOptions/index.tsx index 09a6f968ef..21af23df98 100644 --- a/web/apps/photos/src/components/Collections/CollectionOptions/index.tsx +++ b/web/apps/photos/src/components/Collections/CollectionOptions/index.tsx @@ -209,11 +209,11 @@ const CollectionOptions = (props: CollectionOptionsProps) => { }; const archiveCollection = () => { - changeCollectionVisibility(activeCollection, FileVisibility.ARCHIVED); + changeCollectionVisibility(activeCollection, FileVisibility.archived); }; const unArchiveCollection = () => { - changeCollectionVisibility(activeCollection, FileVisibility.VISIBLE); + changeCollectionVisibility(activeCollection, FileVisibility.visible); }; const downloadCollection = () => { @@ -335,14 +335,14 @@ const CollectionOptions = (props: CollectionOptionsProps) => { const hideAlbum = async () => { await changeCollectionVisibility( activeCollection, - FileVisibility.HIDDEN, + FileVisibility.hidden, ); setActiveCollectionID(ALL_SECTION); }; const unHideAlbum = async () => { await changeCollectionVisibility( activeCollection, - FileVisibility.VISIBLE, + FileVisibility.visible, ); setActiveCollectionID(HIDDEN_ITEMS_SECTION); }; diff --git a/web/apps/photos/src/services/collectionService.ts b/web/apps/photos/src/services/collectionService.ts index f94f34dc61..16b01c48f7 100644 --- a/web/apps/photos/src/services/collectionService.ts +++ b/web/apps/photos/src/services/collectionService.ts @@ -1375,7 +1375,7 @@ export async function getDefaultHiddenCollection(): Promise { export function createHiddenCollection() { return createCollection(HIDDEN_COLLECTION_NAME, CollectionType.album, { subType: SUB_TYPE.DEFAULT_HIDDEN, - visibility: FileVisibility.HIDDEN, + visibility: FileVisibility.hidden, }); } diff --git a/web/apps/photos/src/utils/collection/index.ts b/web/apps/photos/src/utils/collection/index.ts index 27d7f88274..ab1d0649c9 100644 --- a/web/apps/photos/src/utils/collection/index.ts +++ b/web/apps/photos/src/utils/collection/index.ts @@ -418,7 +418,7 @@ export const isDefaultHiddenCollection = (collection: Collection) => collection.magicMetadata?.data.subType === SUB_TYPE.DEFAULT_HIDDEN; export const isHiddenCollection = (collection: Collection) => - collection.magicMetadata?.data.visibility === FileVisibility.HIDDEN; + collection.magicMetadata?.data.visibility === FileVisibility.hidden; export const isQuickLinkCollection = (collection: Collection) => collection.magicMetadata?.data.subType === SUB_TYPE.QUICK_LINK_COLLECTION; diff --git a/web/apps/photos/src/utils/file/index.ts b/web/apps/photos/src/utils/file/index.ts index d245645c01..8e46d8e2cb 100644 --- a/web/apps/photos/src/utils/file/index.ts +++ b/web/apps/photos/src/utils/file/index.ts @@ -658,10 +658,10 @@ export const handleFileOps = async ( fixTimeHelper(files, setFixCreationTimeAttributes); break; case FILE_OPS_TYPE.ARCHIVE: - await changeFilesVisibility(files, FileVisibility.ARCHIVED); + await changeFilesVisibility(files, FileVisibility.archived); break; case FILE_OPS_TYPE.UNARCHIVE: - await changeFilesVisibility(files, FileVisibility.VISIBLE); + await changeFilesVisibility(files, FileVisibility.visible); break; } }; diff --git a/web/apps/photos/src/utils/magicMetadata/index.ts b/web/apps/photos/src/utils/magicMetadata/index.ts index 67259fc396..d874a51655 100644 --- a/web/apps/photos/src/utils/magicMetadata/index.ts +++ b/web/apps/photos/src/utils/magicMetadata/index.ts @@ -10,7 +10,7 @@ export function isArchivedFile(item: EnteFile): boolean { if (!item || !item.magicMetadata || !item.magicMetadata.data) { return false; } - return item.magicMetadata.data.visibility === FileVisibility.ARCHIVED; + return item.magicMetadata.data.visibility === FileVisibility.archived; } export function isArchivedCollection(item: Collection): boolean { @@ -19,12 +19,12 @@ export function isArchivedCollection(item: Collection): boolean { } if (item.magicMetadata && item.magicMetadata.data) { - return item.magicMetadata.data.visibility === FileVisibility.ARCHIVED; + return item.magicMetadata.data.visibility === FileVisibility.archived; } if (item.sharedMagicMetadata && item.sharedMagicMetadata.data) { return ( - item.sharedMagicMetadata.data.visibility === FileVisibility.ARCHIVED + item.sharedMagicMetadata.data.visibility === FileVisibility.archived ); } return false; diff --git a/web/packages/new/photos/types/magicMetadata.ts b/web/packages/new/photos/types/magicMetadata.ts index fcd4560ee6..7ef21dd97e 100644 --- a/web/packages/new/photos/types/magicMetadata.ts +++ b/web/packages/new/photos/types/magicMetadata.ts @@ -11,9 +11,12 @@ export type EncryptedMagicMetadata = MagicMetadataCore; * The visibility of an {@link EnteFile}. */ export enum FileVisibility { - VISIBLE = 0, - ARCHIVED = 1, - HIDDEN = 2, + /** The normal state - The file is visible. */ + visible = 0, + /** The file has been archived. */ + archived = 1, + /** The file has been hidden. */ + hidden = 2, } export enum SUB_TYPE {