π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[web][photos] Dismiss destructive prompts on navigation
AswinAsok4a31e252d467
diff --git a/web/apps/photos/src/components/utils/dialog-attributes.tsx b/web/apps/photos/src/components/utils/dialog-attributes.tsxindex a4fb1c27d1..8f5f8d0955 100644--- a/web/apps/photos/src/components/utils/dialog-attributes.tsx+++ b/web/apps/photos/src/components/utils/dialog-attributes.tsx@@ -7,6 +7,7 @@ export const trashFilesDialogAttributes = (count: number,onConfirm: () => void | Promise<void>,): MiniDialogAttributes => ({+ dismissOnRouteChange: true,title: t("trash_items_title", {count,fallbackLng: false,diff --git a/web/apps/photos/src/pages/_app.tsx b/web/apps/photos/src/pages/_app.tsxindex 6b30a6fb27..5450d4ca2a 100644--- a/web/apps/photos/src/pages/_app.tsx+++ b/web/apps/photos/src/pages/_app.tsx@@ -74,7 +74,8 @@ const App: React.FC<PhotosAppProps> = ({ Component, pageProps }) => {const isI18nReady = useSetupI18n();const isChangingRoute = useIsRouteChangeInProgress();const router = useRouter();- const { showMiniDialog, miniDialogProps } = useAttributedMiniDialog();+ const { showMiniDialog, miniDialogProps, dismissRouteScopedMiniDialog } =+ useAttributedMiniDialog();const { showNotification, notificationProps } = useNotification();const { loadingBarRef, showLoadingBar, hideLoadingBar } = useLoadingBar();@@ -83,6 +84,13 @@ const App: React.FC<PhotosAppProps> = ({ Component, pageProps }) => {const logout = useCallback(() => void photosLogout(), []);+ useEffect(() => {+ router.events.on("routeChangeStart", dismissRouteScopedMiniDialog);+ return () => {+ router.events.off("routeChangeStart", dismissRouteScopedMiniDialog);+ };+ }, [router.events, dismissRouteScopedMiniDialog]);+useEffect(() => {logStartupBanner(savedLocalUser()?.id);void isLocalStorageAndIndexedDBMismatch().then((mismatch) => {diff --git a/web/apps/photos/tests/delete-empty-albums.test.ts b/web/apps/photos/tests/delete-empty-albums.test.tsindex 287324e103..5f209eaf01 100644--- a/web/apps/photos/tests/delete-empty-albums.test.ts+++ b/web/apps/photos/tests/delete-empty-albums.test.ts@@ -70,6 +70,7 @@ describe("shared empty album deletion", () => {const dialog = start();expect(mocks.showMiniDialog).toHaveBeenCalledOnce();expect(dialog.illustration).toBeDefined();+ expect(dialog.dismissOnRouteChange).toBe(true);expect(dialog.continue?.text).toEqual({key: "delete",opts: undefined,diff --git a/web/apps/photos/tests/mini-dialog.test.ts b/web/apps/photos/tests/mini-dialog.test.tsindex 703e2167b3..27960eba1a 100644--- a/web/apps/photos/tests/mini-dialog.test.ts+++ b/web/apps/photos/tests/mini-dialog.test.ts@@ -8,6 +8,42 @@ vi.mock("i18next", () => ({}));describe("mini dialog lifecycle", () => {+ test("navigation clears the trash confirmation and its captured action", () => {+ const action = vi.fn();+ const prompt = miniDialogReducer(+ { open: false, id: 0 },+ { type: "show", attributes: trashFilesDialogAttributes(3, action) },+ );+ const dismissed = miniDialogReducer(prompt, { type: "routeChange" });+ expect(dismissed.open).toBe(false);+ expect(dismissed.attributes).toBeUndefined();+ expect(dismissed.id).not.toBe(prompt.id);+ expect(action).not.toHaveBeenCalled();++ const next = miniDialogReducer(dismissed, {+ type: "show",+ attributes: { title: "Another page" },+ });+ expect(miniDialogReducer(next, { type: "close", id: prompt.id })).toBe(+ next,+ );+ });++ test("navigation preserves app-wide prompts, including session expiry", () => {+ const prompt = miniDialogReducer(+ { open: false, id: 0 },+ {+ type: "show",+ attributes: {+ title: "Session expired",+ nonClosable: true,+ nonReplaceable: true,+ },+ },+ );+ expect(miniDialogReducer(prompt, { type: "routeChange" })).toBe(prompt);+ });+test("an earlier action cannot close a follow-up notice", () => {const first = miniDialogReducer({ open: false, id: 0 },@@ -61,6 +97,7 @@ describe("trash confirmation attributes", () => {expect(attributes.title).toBe(`trash_items_title:${count}`);expect(attributes.message).toBe(`trash_items_message:${count}`);expect(attributes.illustration).toBeDefined();+ expect(attributes.dismissOnRouteChange).toBe(true);expect(attributes.continue?.color).toBe("critical");expect(attributes.continue?.text).toBe("move_to_trash");},diff --git a/web/packages/base/components/MiniDialog.tsx b/web/packages/base/components/MiniDialog.tsxindex 78053cd1d2..9257cbdf38 100644--- a/web/packages/base/components/MiniDialog.tsx+++ b/web/packages/base/components/MiniDialog.tsx@@ -25,6 +25,7 @@ export interface MiniDialogAttributes {message?: React.ReactNode;nonClosable?: boolean;nonReplaceable?: boolean;+ dismissOnRouteChange?: boolean;continue?: {text?: string;color?: ButtonProps["color"];diff --git a/web/packages/base/components/utils/dialog.tsx b/web/packages/base/components/utils/dialog.tsxindex 5ec412ec05..f9f3701e6b 100644--- a/web/packages/base/components/utils/dialog.tsx+++ b/web/packages/base/components/utils/dialog.tsx@@ -21,8 +21,13 @@ export const useAttributedMiniDialog = () => {dispatch({ type: "close", id: dialog.id });}, [dialog.id]);+ const dismissRouteScopedMiniDialog = useCallback(() => {+ dispatch({ type: "routeChange" });+ }, []);+return {showMiniDialog,+ dismissRouteScopedMiniDialog,miniDialogProps: {dialogID: dialog.id,open: dialog.open,diff --git a/web/packages/base/components/utils/mini-dialog-state.ts b/web/packages/base/components/utils/mini-dialog-state.tsindex e326b2d021..4f176902d7 100644--- a/web/packages/base/components/utils/mini-dialog-state.ts+++ b/web/packages/base/components/utils/mini-dialog-state.ts@@ -8,12 +8,18 @@ interface MiniDialogState {type MiniDialogAction =| { type: "show"; attributes: MiniDialogAttributes }+ | { type: "routeChange" }| { type: "close"; id: number };export const miniDialogReducer = (current: MiniDialogState,action: MiniDialogAction,): MiniDialogState => {+ if (action.type === "routeChange") {+ return current.open && current.attributes?.dismissOnRouteChange+ ? { open: false, id: current.id + 1 }+ : current;+ }if (action.type === "close") {// An older async action must not dismiss a replacement prompt.return current.id === action.id ? { ...current, open: false } : current;