From 084a97a77a7e4d83073a99be91df4e4a64b6c930 Mon Sep 17 00:00:00 2001 From: martin <74269598+martabal@users.noreply.github.com> Date: Mon, 15 Apr 2024 22:21:54 +0200 Subject: [PATCH] fix(web): delete trashed item (#8821) * fix: delete trashed item * fix: simplify --- web/src/lib/components/photos-page/asset-grid.svelte | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelte index c8ca6b17a6..06b5627d1b 100644 --- a/web/src/lib/components/photos-page/asset-grid.svelte +++ b/web/src/lib/components/photos-page/asset-grid.svelte @@ -71,11 +71,13 @@ }; const onDelete = () => { - if (!isTrashEnabled && $showDeleteModal) { + const hasTrashedAsset = Array.from($selectedAssets).some((asset) => asset.isTrashed); + + if ($showDeleteModal && (!isTrashEnabled || hasTrashedAsset)) { isShowDeleteConfirmation = true; return; } - handlePromiseError(trashOrDelete(false)); + handlePromiseError(trashOrDelete(hasTrashedAsset)); }; const onForceDelete = () => {