From 5f10a4cae7c24c468521362e1fd9189f9b4648ca Mon Sep 17 00:00:00 2001
From: Lukas <lukas@slucky.de>
Date: Mon, 14 Jul 2025 21:24:32 +0200
Subject: [PATCH] fix(web): allow renaming person without merging (#19923)

* fix(web): allow renaming person without merging

* improve return type
---
 .../[[photos=photos]]/[[assetId=id]]/+page.svelte | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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
index 70fe6a41d2..a4a0050de6 100644
--- 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
@@ -221,9 +221,9 @@
     viewMode = PersonPageViewMode.VIEW_ASSETS;
   };
 
-  const handleMergeSuggestion = async () => {
+  const handleMergeSuggestion = async (): Promise<{ merged: boolean }> => {
     if (!personMerge1 || !personMerge2) {
-      return;
+      return { merged: false };
     }
 
     const result = await modalManager.show(PersonMergeSuggestionModal, {
@@ -233,7 +233,7 @@
     });
 
     if (!result) {
-      return;
+      return { merged: false };
     }
 
     const [personToMerge, personToBeMergedInto] = result;
@@ -241,9 +241,10 @@
     people = people.filter((person: PersonResponseDto) => person.id !== personToMerge.id);
     if (personToBeMergedInto.name != personName && person.id === personToBeMergedInto.id) {
       await updateAssetCount();
-      return;
+      return { merged: true };
     }
     await goto(`${AppRoute.PEOPLE}/${personToBeMergedInto.id}`, { replaceState: true });
+    return { merged: true };
   };
 
   const handleSuggestPeople = async (person2: PersonResponseDto) => {
@@ -317,8 +318,10 @@
             !person.isHidden,
         )
         .slice(0, 3);
-      await handleMergeSuggestion();
-      return;
+      const { merged } = await handleMergeSuggestion();
+      if (merged) {
+        return;
+      }
     }
     await changeName();
   };