Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-07-31 15:08:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): allow renaming person without merging (#19923)

Browse Source 
* fix(web): allow renaming person without merging

* improve return type
This commit is contained in:
Lukas 2025-07-14 21:24:32 +02:00 committed by GitHub
parent 9abb95d34a
commit 5f10a4cae7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte
View File

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