From e4fd78250d2a8d30497f13fb13a37774be2dfae0 Mon Sep 17 00:00:00 2001
From: Manav Rathi <manav@mnvr.in>
Date: Thu, 26 Jun 2025 10:16:58 +0530
Subject: [PATCH] Use

---
 .../src/components/FilesDownloadProgress.tsx  | 51 +++++++++++--------
 web/apps/photos/src/pages/gallery.tsx         |  5 ++
 2 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/web/apps/photos/src/components/FilesDownloadProgress.tsx b/web/apps/photos/src/components/FilesDownloadProgress.tsx
index 3c56c901e2..e37a4ee131 100644
--- a/web/apps/photos/src/components/FilesDownloadProgress.tsx
+++ b/web/apps/photos/src/components/FilesDownloadProgress.tsx
@@ -1,8 +1,6 @@
 import { useBaseContext } from "ente-base/context";
 import { Notification } from "ente-new/photos/components/Notification";
 import { t } from "i18next";
-import { GalleryContext } from "pages/gallery";
-import { useContext } from "react";
 
 export interface FilesDownloadProgressAttributes {
     id: number;
@@ -30,6 +28,14 @@ interface FilesDownloadProgressProps {
      * context of the public albums app.
      */
     onShowHiddenSection?: () => Promise<void>;
+    /**
+     * Called when the collection with the given {@link collectionID} should be
+     * shown.
+     *
+     * This is only relevant in the context of the photos app, and can be
+     * omitted by the public albums app.
+     */
+    onShowCollection?: (collectionID: number) => void;
 }
 
 export const isFilesDownloadStarted = (
@@ -67,9 +73,9 @@ export const FilesDownloadProgress: React.FC<FilesDownloadProgressProps> = ({
     attributesList,
     setAttributesList,
     onShowHiddenSection,
+    onShowCollection,
 }) => {
     const { showMiniDialog } = useBaseContext();
-    const galleryContext = useContext(GalleryContext);
 
     if (!attributesList) {
         return <></>;
@@ -105,23 +111,23 @@ export const FilesDownloadProgress: React.FC<FilesDownloadProgressProps> = ({
         }
     };
 
-    const handleOnClick = (id: number) => () => {
-        const attributes = attributesList.find((attr) => attr.id === id);
-        const electron = globalThis.electron;
-        if (electron) {
-            electron.openDirectory(attributes.downloadDirPath);
-        } else {
-            if (attributes.isHidden) {
-                void onShowHiddenSection().then(() => {
-                    galleryContext.setActiveCollectionID(
-                        attributes.collectionID,
-                    );
-                });
-            } else {
-                galleryContext.setActiveCollectionID(attributes.collectionID);
+    const createHandleOnClick =
+        (id: number, onShowCollection: (collectionID: number) => void) =>
+        () => {
+            const attributes = attributesList.find((attr) => attr.id === id);
+            const electron = globalThis.electron;
+            if (electron) {
+                electron.openDirectory(attributes.downloadDirPath);
+            } else if (onShowCollection) {
+                if (attributes.isHidden) {
+                    void onShowHiddenSection().then(() => {
+                        onShowCollection(attributes.collectionID);
+                    });
+                } else {
+                    onShowCollection(attributes.collectionID);
+                }
             }
-        }
-    };
+        };
 
     return (
         <>
@@ -150,7 +156,12 @@ export const FilesDownloadProgress: React.FC<FilesDownloadProgressProps> = ({
                                   count: attributes.success + attributes.failed,
                                   total: attributes.total,
                               }),
-                        onClick: handleOnClick(attributes.id),
+                        onClick: onShowCollection
+                            ? createHandleOnClick(
+                                  attributes.id,
+                                  onShowCollection,
+                              )
+                            : undefined,
                     }}
                 />
             ))}
diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsx
index eacf64c4c9..16de25a02b 100644
--- a/web/apps/photos/src/pages/gallery.tsx
+++ b/web/apps/photos/src/pages/gallery.tsx
@@ -761,6 +761,10 @@ const Page: React.FC = () => {
         collectionSummaryID: number | undefined,
     ) => dispatch({ type: "showCollectionSummary", collectionSummaryID });
 
+    // The same function can also be used to show collections since the
+    // namespace for the collection IDs and collection summary IDs are disjoint.
+    const handleShowCollection = handleShowCollectionSummary;
+
     const handleChangeBarMode = (mode: GalleryBarMode) =>
         mode == "people"
             ? dispatch({ type: "showPeople" })
@@ -913,6 +917,7 @@ const Page: React.FC = () => {
                     attributesList={filesDownloadProgressAttributesList}
                     setAttributesList={setFilesDownloadProgressAttributesList}
                     onShowHiddenSection={handleShowHiddenSection}
+                    onShowCollection={handleShowCollection}
                 />
                 <FixCreationTime
                     {...fixCreationTimeVisibilityProps}