feat(server, web): smart merge (#5796)

* 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 --------- Co-authored-by: Jason Rasmussen <jrasm91@gmail.com>
2024-01-18 02:52:11 +01:00
parent c55503496f
commit f0b328fb6b
8 changed files with 168 additions and 91 deletions
@@ -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',