fix: after merge route

immich-app · Oct 14, 2024 · 096179c · 096179c
1 parent b852468
commit 096179c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/web/src/lib/constants.ts b/web/src/lib/constants.ts
@@ -71,6 +71,7 @@ export const dateFormats = {
 
 export enum QueryParameter {
   ACTION = 'action',
+  AFTER_MERGE_ROUTE = 'afterMergeRoute',
   ID = 'id',
   IS_OPEN = 'isOpen',
   ONBOARDING_STEP = 'step',

diff --git a/web/src/routes/(user)/people/+page.svelte b/web/src/routes/(user)/people/+page.svelte
@@ -194,7 +194,7 @@
 
   const handleMergePeople = async (detail: PersonResponseDto) => {
     await goto(
-      `${AppRoute.PEOPLE}/${detail.id}?${QueryParameter.ACTION}=${ActionQueryParameterValue.MERGE}&${QueryParameter.PREVIOUS_ROUTE}=${AppRoute.PEOPLE}`,
+      `${AppRoute.PEOPLE}/${detail.id}?${QueryParameter.ACTION}=${ActionQueryParameterValue.MERGE}&${QueryParameter.PREVIOUS_ROUTE}=${AppRoute.PEOPLE}&${QueryParameter.AFTER_MERGE_ROUTE}=${AppRoute.PEOPLE}`,
     );
   };
 

diff --git a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -90,6 +90,7 @@
   let viewMode: ViewMode = ViewMode.VIEW_ASSETS;
   let isEditingName = false;
   let previousRoute: string = AppRoute.EXPLORE;
+  let afterMergeRoute: string | undefined = undefined;
   let people: PersonResponseDto[] = [];
   let personMerge1: PersonResponseDto;
   let personMerge2: PersonResponseDto;
@@ -119,6 +120,11 @@
     if (getPreviousRoute && !isExternalUrl(getPreviousRoute)) {
       previousRoute = getPreviousRoute;
     }
+
+    const getAfterMergeRoute = $page.url.searchParams.get(QueryParameter.AFTER_MERGE_ROUTE);
+    if (getAfterMergeRoute && !isExternalUrl(getAfterMergeRoute)) {
+      afterMergeRoute = getAfterMergeRoute;
+    }
     if (action == 'merge') {
       viewMode = ViewMode.MERGE_PEOPLE;
     }
@@ -188,6 +194,10 @@
   };
 
   const handleMerge = async (person: PersonResponseDto) => {
+    if (afterMergeRoute) {
+      await goto(afterMergeRoute);
+      return;
+    }
     await updateAssetCount();
     await handleGoBack();