From c68702c0a714c4c25094e9947dd33f6290399bd3 Mon Sep 17 00:00:00 2001
From: martin <74269598+martabal@users.noreply.github.com>
Date: Sat, 7 Oct 2023 13:04:08 +0200
Subject: [PATCH] fix(web): merge faces (#4383)

* fix(web): merge faces

* pr feedback
---
 .../faces-page/merge-face-selector.svelte          | 11 ++++-------
 web/src/lib/stores/assets.store.ts                 |  1 -
 .../routes/(user)/people/[personId]/+page.svelte   | 14 +++++++++++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/web/src/lib/components/faces-page/merge-face-selector.svelte b/web/src/lib/components/faces-page/merge-face-selector.svelte
index 3747d812d4..3fbfa9c7a2 100644
--- a/web/src/lib/components/faces-page/merge-face-selector.svelte
+++ b/web/src/lib/components/faces-page/merge-face-selector.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { createEventDispatcher, onMount } from 'svelte';
+  import { createEventDispatcher } from 'svelte';
   import { api, type PersonResponseDto } from '@api';
   import FaceThumbnail from './face-thumbnail.svelte';
   import { quintOut } from 'svelte/easing';
@@ -17,7 +17,7 @@
   import SwapHorizontal from 'svelte-material-icons/SwapHorizontal.svelte';
 
   export let person: PersonResponseDto;
-  let people: PersonResponseDto[] = [];
+  export let people: PersonResponseDto[];
   let selectedPeople: PersonResponseDto[] = [];
   let screenHeight: number;
   let isShowConfirmation = false;
@@ -27,10 +27,6 @@
   $: unselectedPeople = people.filter(
     (source) => !selectedPeople.some((selected) => selected.id === source.id) && source.id !== person.id,
   );
-  onMount(async () => {
-    const { data } = await api.personApi.getAllPeople({ withHidden: false });
-    people = data.people;
-  });
 
   const onClose = () => {
     dispatch('go-back');
@@ -69,8 +65,9 @@
         message: `Merged ${count} ${count === 1 ? 'person' : 'people'}`,
         type: NotificationType.Info,
       });
+      people = people.filter((person) => !results.some((result) => result.id === person.id && result.success === true));
       await invalidateAll();
-      onClose();
+      dispatch('merge');
     } catch (error) {
       handleError(error, 'Cannot merge faces');
     } finally {
diff --git a/web/src/lib/stores/assets.store.ts b/web/src/lib/stores/assets.store.ts
index 3902c8b102..c641931cef 100644
--- a/web/src/lib/stores/assets.store.ts
+++ b/web/src/lib/stores/assets.store.ts
@@ -87,7 +87,6 @@ export class AssetStore {
       }),
 
       websocketStore.onAssetTrash.subscribe((ids) => {
-        console.log('onAssetTrash', ids);
         if (ids) {
           for (const id of ids) {
             this.pendingChanges.push({ type: 'trash', value: id });
diff --git a/web/src/routes/(user)/people/[personId]/+page.svelte b/web/src/routes/(user)/people/[personId]/+page.svelte
index 5dac37b506..c259dd28d2 100644
--- a/web/src/routes/(user)/people/[personId]/+page.svelte
+++ b/web/src/routes/(user)/people/[personId]/+page.svelte
@@ -66,8 +66,10 @@
   let personMerge2: PersonResponseDto;
   let potentialMergePeople: PersonResponseDto[] = [];
 
+  let refreshAssetGrid = false;
+
   let personName = '';
-  let thumbnailData = api.getPeopleThumbnailUrl(data.person.id);
+  $: thumbnailData = api.getPeopleThumbnailUrl(data.person.id);
 
   let name: string = data.person.name;
   let suggestedPeople: PersonResponseDto[] = [];
@@ -118,6 +120,7 @@
         personId: data.person.id,
       });
       previousPersonId = data.person.id;
+      refreshAssetGrid = !refreshAssetGrid;
     }
   });
 
@@ -139,6 +142,11 @@
     }
   };
 
+  const handleMerge = () => {
+    handleGoBack();
+    refreshAssetGrid = !refreshAssetGrid;
+  };
+
   const handleSelectFeaturePhoto = async (asset: AssetResponseDto) => {
     if (viewMode !== ViewMode.SELECT_FACE) {
       return;
@@ -302,7 +310,7 @@
 {/if}
 
 {#if viewMode === ViewMode.MERGE_FACES}
-  <MergeFaceSelector person={data.person} on:go-back={handleGoBack} />
+  <MergeFaceSelector person={data.person} bind:people on:go-back={handleGoBack} on:merge={handleMerge} />
 {/if}
 
 <header>
@@ -344,7 +352,7 @@
 </header>
 
 <main class="relative h-screen overflow-hidden bg-immich-bg pt-[var(--navbar-height)] dark:bg-immich-dark-bg">
-  {#key previousPersonId}
+  {#key refreshAssetGrid}
     <AssetGrid
       {assetStore}
       {assetInteractionStore}