Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-06-03 21:54:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(web): cancel people merge selection: do not show "Change name successfully" notification (#15744)

Browse Source 
fix(web): cancel people merge selection: do not show "Change name successfully" notification.

Co-authored-by: André Ventura <afv@users.noreply.github.com>
This commit is contained in:
André Ventura 2025-01-28 17:43:52 +00:00 committed by GitHub
parent c2ba1cc202
commit 060300de8a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,7 @@
let personMerge1: PersonResponseDto | undefined = $state(); let personMerge1: PersonResponseDto | undefined = $state();
let personMerge2: PersonResponseDto | undefined = $state(); let personMerge2: PersonResponseDto | undefined = $state();
let potentialMergePeople: PersonResponseDto[] = $state([]); let potentialMergePeople: PersonResponseDto[] = $state([]);
let isSuggestionSelectedByUser = $state(false);
let personName = ''; let personName = '';
let suggestedPeople: PersonResponseDto[] = $state([]); let suggestedPeople: PersonResponseDto[] = $state([]);
@ -233,15 +234,22 @@
personName = person.name; personName = person.name;
personMerge1 = person; personMerge1 = person;
personMerge2 = person2; personMerge2 = person2;
isSuggestionSelectedByUser = true;
viewMode = PersonPageViewMode.SUGGEST_MERGE; viewMode = PersonPageViewMode.SUGGEST_MERGE;
}; };
const changeName = async () => { const changeName = async () => {
viewMode = PersonPageViewMode.VIEW_ASSETS; viewMode = PersonPageViewMode.VIEW_ASSETS;
person.name = personName; person.name = personName;
try { isEditingName = false;
isEditingName = false;
if (isSuggestionSelectedByUser) {
// User canceled the merge
isSuggestionSelectedByUser = false;
return;
}
try {
person = await updatePerson({ id: person.id, personUpdateDto: { name: personName } }); person = await updatePerson({ id: person.id, personUpdateDto: { name: personName } });
notificationController.show({ notificationController.show({