From 22c42dd8ff5621226c5dfdc38d8224f6c9b3e83a Mon Sep 17 00:00:00 2001 From: martabal <74269598+martabal@users.noreply.github.com> Date: Sat, 11 May 2024 22:43:56 +0200 Subject: [PATCH] pr feedback --- .../faces-page/person-side-panel.svelte | 12 ++++---- .../unassigned-faces-side-panel.svelte | 30 +++++++++---------- .../faces-page/unmerge-face-selector.svelte | 18 +++++------ web/src/lib/utils/people-utils.ts | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/web/src/lib/components/faces-page/person-side-panel.svelte b/web/src/lib/components/faces-page/person-side-panel.svelte index ac6dbf5cc3..d925d061cf 100644 --- a/web/src/lib/components/faces-page/person-side-panel.svelte +++ b/web/src/lib/components/faces-page/person-side-panel.svelte @@ -21,7 +21,7 @@ import { linear } from 'svelte/easing'; import { fly } from 'svelte/transition'; import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte'; - import type { FaceWithGeneretedThumbnail } from '$lib/utils/people-utils'; + import type { FaceWithGeneratedThumbnail } from '$lib/utils/people-utils'; import { NotificationType, notificationController, @@ -45,11 +45,11 @@ let peopleWithFaces: AssetFaceResponseDto[] = []; let selectedPersonToReassign: Record = {}; let selectedPersonToCreate: Record = {}; - let selectedPersonToAdd: Record = {}; + let selectedPersonToAdd: Record = {}; let selectedFaceToRemove: Record = {}; let editedPerson: PersonResponseDto; let editedFace: AssetFaceResponseDto; - let unassignedFaces: FaceWithGeneretedThumbnail[] = []; + let unassignedFaces: FaceWithGeneratedThumbnail[] = []; // loading spinners let isShowLoadingDone = false; @@ -75,7 +75,7 @@ } }), ); - unassignedFaces = peopleWithGeneratedImage.filter((item): item is FaceWithGeneretedThumbnail => item !== undefined); + unassignedFaces = peopleWithGeneratedImage.filter((item): item is FaceWithGeneratedThumbnail => item !== undefined); }; async function loadPeople() { @@ -225,7 +225,7 @@ showSelectedFaces = true; } }; - const handleCreateOrReassignFaceFromUnassignedFace = (face: FaceWithGeneretedThumbnail) => { + const handleCreateOrReassignFaceFromUnassignedFace = (face: FaceWithGeneratedThumbnail) => { selectedPersonToAdd[face.id] = face; selectedPersonToAdd = selectedPersonToAdd; showUnassignedFaces = false; @@ -234,7 +234,7 @@ const handleOpenAvailableFaces = () => { showUnassignedFaces = !showUnassignedFaces; }; - const handleRemoveAddedFace = (face: FaceWithGeneretedThumbnail) => { + const handleRemoveAddedFace = (face: FaceWithGeneratedThumbnail) => { $boundingBoxesArray = []; delete selectedPersonToAdd[face.id]; diff --git a/web/src/lib/components/faces-page/unassigned-faces-side-panel.svelte b/web/src/lib/components/faces-page/unassigned-faces-side-panel.svelte index 8613be61fe..6bf5bf549b 100644 --- a/web/src/lib/components/faces-page/unassigned-faces-side-panel.svelte +++ b/web/src/lib/components/faces-page/unassigned-faces-side-panel.svelte @@ -2,7 +2,7 @@ import { fly } from 'svelte/transition'; import { linear } from 'svelte/easing'; import { mdiAccountOff, mdiArrowLeftThin, mdiClose, mdiMinus } from '@mdi/js'; - import type { FaceWithGeneretedThumbnail } from '$lib/utils/people-utils'; + import type { FaceWithGeneratedThumbnail } from '$lib/utils/people-utils'; import { boundingBoxesArray } from '$lib/stores/people.store'; import type { AssetFaceResponseDto, AssetTypeEnum, PersonResponseDto } from '@immich/sdk'; import ImageThumbnail from '$lib/components/assets/thumbnail/image-thumbnail.svelte'; @@ -11,28 +11,28 @@ import { getPeopleThumbnailUrl } from '$lib/utils'; import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte'; - export let unassignedFaces: FaceWithGeneretedThumbnail[]; + export let unassignedFaces: FaceWithGeneratedThumbnail[]; export let allPeople: PersonResponseDto[]; - export let selectedPersonToAdd: Record; + export let selectedPersonToAdd: Record; export let selectedFaceToRemove: Record; export let assetType: AssetTypeEnum; export let assetId: string; export let onResetFacesToBeRemoved = () => {}; export let onClose = () => {}; - export let onCreatePerson: (face: FaceWithGeneretedThumbnail) => void; - export let onReassign: (face: FaceWithGeneretedThumbnail) => void; + export let onCreatePerson: (face: FaceWithGeneratedThumbnail) => void; + export let onReassign: (face: FaceWithGeneratedThumbnail) => void; export let onAbortRemove: (id: string) => void; - let showSeletecFaces = false; - let editedFace: FaceWithGeneretedThumbnail; + let showSelectedFaces = false; + let editedFace: FaceWithGeneratedThumbnail; - const handleSelectedFace = (face: FaceWithGeneretedThumbnail) => { + const handleSelectedFace = (face: FaceWithGeneratedThumbnail) => { editedFace = face; - showSeletecFaces = true; + showSelectedFaces = true; }; const handleCreatePerson = (newFeaturePhoto: string | null) => { - showSeletecFaces = false; + showSelectedFaces = false; if (newFeaturePhoto) { editedFace.customThumbnail = newFeaturePhoto; onCreatePerson(editedFace); @@ -43,7 +43,7 @@ const handleReassignFace = (person: PersonResponseDto | null) => { if (person) { - showSeletecFaces = false; + showSelectedFaces = false; editedFace.person = person; onReassign(editedFace); } else { @@ -95,8 +95,8 @@ @@ -165,10 +165,10 @@ disabled={disableButtons || hasSelection} on:click={handleCreate} > - {#if !showLoadingSpinnerCreate} - - {:else} + {#if showLoadingSpinnerCreate} + {:else} + {/if} Create new Person @@ -178,12 +178,12 @@ disabled={disableButtons || !hasSelection} on:click={handleReassign} > - {#if !showLoadingSpinnerReassign} + {#if showLoadingSpinnerReassign} + + {:else}
- {:else} - {/if} Reassign diff --git a/web/src/lib/utils/people-utils.ts b/web/src/lib/utils/people-utils.ts index d2daea837a..60d720518d 100644 --- a/web/src/lib/utils/people-utils.ts +++ b/web/src/lib/utils/people-utils.ts @@ -20,7 +20,7 @@ export interface boundingBox { height: number; } -export interface FaceWithGeneretedThumbnail extends AssetFaceResponseDto { +export interface FaceWithGeneratedThumbnail extends AssetFaceResponseDto { customThumbnail: string; }