From 1bd15a83657e6eadaff0fd14ce6807a3e041d171 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mrmr.io>
Date: Mon, 21 Oct 2024 15:19:06 +0530
Subject: [PATCH] Make optional

---
 .../photos/src/services/collectionService.ts  |  2 +-
 .../new/photos/components/gallery/reducer.ts  | 88 ++++++-------------
 .../new/photos/services/collection/ui.ts      |  7 +-
 3 files changed, 35 insertions(+), 62 deletions(-)

diff --git a/web/apps/photos/src/services/collectionService.ts b/web/apps/photos/src/services/collectionService.ts
index d7a72f111f..f74992d7ce 100644
--- a/web/apps/photos/src/services/collectionService.ts
+++ b/web/apps/photos/src/services/collectionService.ts
@@ -1003,7 +1003,7 @@ export const sortCollectionSummaries = (
                         compareCollectionsLatestFile(b.latestFile, a.latestFile)
                     );
                 case "updation-time-desc":
-                    return b.updationTime - a.updationTime;
+                    return (b.updationTime ?? 0) - (a.updationTime ?? 0);
             }
         })
         .sort((a, b) => b.order ?? 0 - a.order ?? 0)
diff --git a/web/packages/new/photos/components/gallery/reducer.ts b/web/packages/new/photos/components/gallery/reducer.ts
index 72867b277f..a552ab48bc 100644
--- a/web/packages/new/photos/components/gallery/reducer.ts
+++ b/web/packages/new/photos/components/gallery/reducer.ts
@@ -22,7 +22,6 @@ import {
     TRASH_SECTION,
 } from "../../services/collection";
 import type {
-    CollectionSummaries,
     CollectionSummary,
     CollectionSummaryType,
 } from "../../services/collection/ui";
@@ -487,10 +486,16 @@ export const deriveCollectionSummaries = (
         files,
     );
 
-    collectionSummaries.set(
-        ALL_SECTION,
-        getAllSectionSummary(files, archivedCollectionIDs),
+    const allSectionFiles = findAllSectionVisibleFiles(
+        files,
+        archivedCollectionIDs,
     );
+    collectionSummaries.set(ALL_SECTION, {
+        id: ALL_SECTION,
+        type: "all",
+        name: t("section_all"),
+        ...pseudoCollectionOptionsForFiles(allSectionFiles),
+    });
     collectionSummaries.set(
         TRASH_SECTION,
         getTrashedCollectionSummary(trashedFiles),
@@ -500,6 +505,13 @@ export const deriveCollectionSummaries = (
     return collectionSummaries;
 };
 
+const pseudoCollectionOptionsForFiles = (files: EnteFile[]) => ({
+    coverFile: files[0],
+    latestFile: files[0],
+    fileCount: files.length,
+    updationTime: files[0]?.updationTime,
+});
+
 /**
  * Helper function to compute hidden collection summaries from their
  * dependencies.
@@ -676,16 +688,6 @@ const isSharedOnlyViaLink = (collection: Collection) =>
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     collection.publicURLs?.length && !collection.sharees?.length;
 
-function getSectionSummaries(
-    files: EnteFile[],
-    trashedFiles: EnteFile[],
-    archivedCollections: Set<number>,
-): CollectionSummaries {
-    const collectionSummaries: CollectionSummaries = new Map();
-
-    return collectionSummaries;
-}
-
 function getArchivedSectionSummary(files: EnteFile[]): CollectionSummary {
     const archivedFiles = uniqueFilesByID(
         files.filter((file) => isArchivedFile(file)),
@@ -716,54 +718,20 @@ function getArchivedSectionSummary(files: EnteFile[]): CollectionSummary {
     };
 }
 
-function getAllSectionSummary(
+/**
+ * Return all list of files that should be shown in the "All" section.
+ */
+const findAllSectionVisibleFiles = (
     files: EnteFile[],
-    archivedCollections: Set<number>,
-): CollectionSummary {
-    const allSectionFiles = getAllSectionVisibleFiles(
-        files,
-        archivedCollections,
+    archivedCollectionIDs: Set<number>,
+) =>
+    uniqueFilesByID(
+        files.filter(
+            (file) =>
+                !isArchivedFile(file) &&
+                !archivedCollectionIDs.has(file.collectionID),
+        ),
     );
-    return {
-        id: ALL_SECTION,
-        name: t("section_all"),
-        type: "all",
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        coverFile: allSectionFiles?.[0],
-        // See: [Note: strict mode migration]
-        //
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        latestFile: allSectionFiles?.[0],
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        fileCount: allSectionFiles?.length || 0,
-        // See: [Note: strict mode migration]
-        //
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        updationTime: allSectionFiles?.[0]?.updationTime,
-    };
-}
-
-function getAllSectionVisibleFiles(
-    files: EnteFile[],
-    archivedCollections: Set<number>,
-): EnteFile[] {
-    const allSectionVisibleFiles = uniqueFilesByID(
-        files.filter((file) => {
-            if (
-                isArchivedFile(file) ||
-                archivedCollections.has(file.collectionID)
-            ) {
-                return false;
-            }
-            return true;
-        }),
-    );
-    return allSectionVisibleFiles;
-}
 
 function getTrashedCollectionSummary(
     trashedFiles: EnteFile[],
diff --git a/web/packages/new/photos/services/collection/ui.ts b/web/packages/new/photos/services/collection/ui.ts
index ac3efb4497..3a56e94ed5 100644
--- a/web/packages/new/photos/services/collection/ui.ts
+++ b/web/packages/new/photos/services/collection/ui.ts
@@ -62,7 +62,12 @@ export interface CollectionSummary {
      * that belong to this pseudo-collection.
      */
     fileCount: number;
-    updationTime: number;
+    /**
+     * The time when the collection was last updated. For pseudo-collections
+     * this will (usually) be the updation time of the latest file that it
+     * contains.
+     */
+    updationTime: number | undefined;
     order?: number;
 }