π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[web][photos] Cancel superseded map navigation
AswinAsokd8f24ecd4cf0
diff --git a/web/apps/photos/src/components/gallery/use-map-navigation.ts b/web/apps/photos/src/components/gallery/use-map-navigation.tsnew file mode 100644index 0000000000..7ce5b4d8ac--- /dev/null+++ b/web/apps/photos/src/components/gallery/use-map-navigation.ts@@ -0,0 +1,35 @@+import { useCallback, useEffect, useRef } from "react";++/** Keep the current view until maps are enabled, ignoring superseded requests. */+export const useMapNavigation = ({+ mapEnabled,+ enableMap,+ onError,+}: {+ mapEnabled: boolean;+ enableMap: () => Promise<void>;+ onError: (error: unknown) => void;+}) => {+ const requestID = useRef(0);+ const cancel = useCallback(() => {+ requestID.current += 1;+ }, []);++ useEffect(() => cancel, [cancel]);++ const open = useCallback(+ async (activate: () => void) => {+ const id = ++requestID.current;+ try {+ if (!mapEnabled) await enableMap();+ } catch (error) {+ if (id === requestID.current) onError(error);+ return;+ }+ if (id === requestID.current) activate();+ },+ [mapEnabled, enableMap, onError],+ );++ return { open, cancel };+};diff --git a/web/apps/photos/src/pages/gallery.tsx b/web/apps/photos/src/pages/gallery.tsxindex 90897cc564..285ae20b37 100644--- a/web/apps/photos/src/pages/gallery.tsx+++ b/web/apps/photos/src/pages/gallery.tsx@@ -146,6 +146,7 @@ import {} from "ente-new/photos/services/ml";import { contactsGetDiff, contactsGetProfilePicture } from "ente-photos-wasm";+import { useMapNavigation } from "@/components/gallery/use-map-navigation";import { ensureAuthenticatedSession } from "@/services/authenticated-session";import { postPullFiles, prePullFiles, pullFiles } from "@/services/pull";import { uploadManager } from "@/services/upload-manager";@@ -328,22 +329,26 @@ const Page: React.FC = () => {const closeCollectionMap = collectionMapVisibilityProps.onClose;const [isMapView, setIsMapView] = useState(false);+ const { open: openMap, cancel: cancelPendingMap } = useMapNavigation({+ mapEnabled,+ enableMap: () => updateMapEnabled(true),+ onError: onGenericError,+ });+const handleShowCollectionMap = useCallback((embedded = false) => {- void (async () => {- if (!mapEnabled) {- try {- await updateMapEnabled(true);- } catch (e) {- onGenericError(e);- return;- }- }- if (embedded) setIsMapView(true);- else showCollectionMap();- })();+ void openMap(() => {+ if (embedded) {+ setCleanupView(undefined);+ dispatch({+ type: "showCollectionSummary",+ collectionSummaryID: PseudoCollectionID.all,+ });+ setIsMapView(true);+ } else showCollectionMap();+ });},- [mapEnabled, onGenericError, showCollectionMap],+ [openMap, dispatch, showCollectionMap],);const [albumAddedNotification, setAlbumAddedNotification] = useState<{@@ -1506,6 +1511,7 @@ const Page: React.FC = () => {searchOption: SearchOption | undefined,options?: { shouldExitSearchMode?: boolean },) => {+ cancelPendingMap();setIsMapView(false);if (searchOption) {const type = searchOption.suggestion.type;@@ -1563,6 +1569,7 @@ const Page: React.FC = () => {const handleShowCollectionSummaryWithID = useCallback((collectionSummaryID: number | undefined) => {+ cancelPendingMap();setIsMapView(false);setCleanupView(undefined);// Museum deletes collection contents asynchronously; pull on entry.@@ -1572,7 +1579,7 @@ const Page: React.FC = () => {dispatch({ type: "showCollectionSummary", collectionSummaryID });},- [],+ [cancelPendingMap],);useEffect(() => {@@ -1598,6 +1605,7 @@ const Page: React.FC = () => {const handleShowCleanupView = useCallback((view: "large-files" | "duplicates") => {+ cancelPendingMap();setIsMapView(false);setSelected({ownCount: 0,@@ -1610,7 +1618,7 @@ const Page: React.FC = () => {dispatch({ type: "exitSearch", shouldExitSearchMode: true });setCleanupView(view);},- [closeCollectionMap, closeSlideshow],+ [cancelPendingMap, closeCollectionMap, closeSlideshow],);const handleShowLargeFiles = useCallback(@@ -1636,6 +1644,7 @@ const Page: React.FC = () => {);const handleShowPeople = (onNavigate?: () => void) => {+ cancelPendingMap();if (!isMLEnabled()) {pendingPeopleSearchReset.current = onNavigate;showPeopleConsent();@@ -1649,6 +1658,7 @@ const Page: React.FC = () => {};const handleShowAlbumOverview = (filter: AlbumFilter) => {+ cancelPendingMap();setCleanupView(undefined);clearSelection();setAlbumFilter(filter);@@ -1656,6 +1666,7 @@ const Page: React.FC = () => {};const handleBackToAlbums = useCallback(() => {+ cancelPendingMap();setCleanupView(undefined);setAlbumSearchQuery("");setSelected({@@ -1666,9 +1677,10 @@ const Page: React.FC = () => {});setAlbumFilter("ente");dispatch({ type: "showAlbumOverview", albumFilter: "ente" });- }, []);+ }, [cancelPendingMap]);const handleChangeBarMode = (mode: GalleryBarMode) => {+ cancelPendingMap();if (mode == "links") {setCleanupView(undefined);clearSelection();@@ -1780,6 +1792,7 @@ const Page: React.FC = () => {const handleSelectCollection = useCallback((collectionID: number) => {+ cancelPendingMap();setIsMapView(false);closeCollectionMap();dispatch({@@ -1787,17 +1800,18 @@ const Page: React.FC = () => {collectionSummaryID: collectionID,});},- [closeCollectionMap],+ [cancelPendingMap, closeCollectionMap],);const handleSelectPerson = useCallback((personID: string) => {+ cancelPendingMap();setCleanupView(undefined);setIsMapView(false);closeCollectionMap();dispatch({ type: "showPerson", personID });},- [closeCollectionMap],+ [cancelPendingMap, closeCollectionMap],);const handleOpenCollectionSelector = useCallback(@@ -2230,12 +2244,7 @@ const Page: React.FC = () => {}}onSidebar={showSidebar}onUpload={openUploader}- onShowMap={() => {- handleShowCollectionSummaryWithID(- PseudoCollectionID.all,- );- handleShowCollectionMap(true);- }}+ onShowMap={() => handleShowCollectionMap(true)}onHome={() => {setIsMapView(false);handleShowCollectionSummaryWithID(