immich-app/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-12-29 17:25:00 +03:00
Code Issues Packages Projects Releases 18 Wiki Activity

feat: smart merge (#6508)

Browse Source 
* pr feedback

* fix: tests

* update assets statistics

* pr feedback

* pr feedback

* fix: linter

* pr feedback

* fix: don't limit the smart merge

* pr feedback

* fix: server code

* remove slider

* fix: tests

---------

Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
This commit is contained in:
martin
2024-01-19 18:52:26 +01:00
committed by GitHub
parent f80f867976
commit 17eaeb695e
6 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/routes/(user)/people/+page.svelte
View File

@@ -165,8 +165,12 @@
id: personMerge2.id,
mergePersonDto: { ids: [personToMerge.id] },
});
const { data: mergedPerson } = await api.personApi.getPerson({ id: personToMerge.id });
countVisiblePeople--;
people = people.filter((person: PersonResponseDto) => person.id !== personToMerge.id);
people = people.map((person: PersonResponseDto) => (person.id === personMerge2.id ? mergedPerson : person));
notificationController.show({
message: 'Merge people succesfully',

9
web/src/routes/(user)/people/[personId]/+page.svelte
View File

@@ -185,8 +185,13 @@
}
};
const handleMerge = () => {
const handleMerge = async (person: PersonResponseDto) => {
const { data: statistics } = await api.personApi.getPersonStatistics({ id: person.id });
numberOfAssets = statistics.assets;
handleGoBack();
data.person = person;
refreshAssetGrid = !refreshAssetGrid;
};
@@ -374,7 +379,7 @@
{/if}
{#if viewMode === ViewMode.MERGE_PEOPLE}
<MergeFaceSelector person={data.person} on:back={handleGoBack} on:merge={handleMerge} />
<MergeFaceSelector person={data.person} on:back={handleGoBack} on:merge={({ detail }) => handleMerge(detail)} />
{/if}
<header>