From f3fe043c22efc54616d567808cff6ac0c2ce2b7c Mon Sep 17 00:00:00 2001 From: Min Idzelis Date: Sun, 20 Apr 2025 03:47:51 +0000 Subject: [PATCH] Remove generics from AssetInteraction --- .../components/album-page/album-viewer.svelte | 4 ++-- .../photos-page/actions/download-action.svelte | 8 ++------ .../actions/select-all-assets.svelte | 4 ++-- .../photos-page/asset-date-group.svelte | 4 ++-- .../components/photos-page/asset-grid.svelte | 2 +- .../asset-select-control-bar.svelte | 8 ++++---- .../stores/asset-interaction.svelte.spec.ts | 12 ++++++------ web/src/lib/utils/asset-utils.ts | 18 ++++++++++-------- .../[[assetId=id]]/+page.svelte | 6 +++--- .../[[assetId=id]]/+page.svelte | 4 ++-- .../[[assetId=id]]/+page.svelte | 4 ++-- .../[[assetId=id]]/+page.svelte | 4 ++-- .../[[assetId=id]]/+page.svelte | 2 +- .../[[assetId=id]]/+page.svelte | 4 ++-- .../[[assetId=id]]/+page.svelte | 4 ++-- 15 files changed, 43 insertions(+), 45 deletions(-) diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index b5e70958d7..fbbfbb26e9 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -4,7 +4,7 @@ import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte'; import { AssetInteraction } from '$lib/stores/asset-interaction.svelte'; import { assetViewingStore } from '$lib/stores/asset-viewing.store'; - import { AssetStore, type TimelineAsset } from '$lib/stores/assets-store.svelte'; + import { AssetStore } from '$lib/stores/assets-store.svelte'; import { dragAndDropFilesStore } from '$lib/stores/drag-and-drop-files.store'; import { handlePromiseError } from '$lib/utils'; import { cancelMultiselect, downloadAlbum } from '$lib/utils/asset-utils'; @@ -36,7 +36,7 @@ $effect(() => void assetStore.updateOptions({ albumId: album.id, order: album.order })); onDestroy(() => assetStore.destroy()); - const assetInteraction = new AssetInteraction(); + const assetInteraction = new AssetInteraction(); dragAndDropFilesStore.subscribe((value) => { if (value.isDragging && value.files.length > 0) { diff --git a/web/src/lib/components/photos-page/actions/download-action.svelte b/web/src/lib/components/photos-page/actions/download-action.svelte index 546403db35..b4aa8b17c7 100644 --- a/web/src/lib/components/photos-page/actions/download-action.svelte +++ b/web/src/lib/components/photos-page/actions/download-action.svelte @@ -3,8 +3,7 @@ import CircleIconButton from '$lib/components/elements/buttons/circle-icon-button.svelte'; import { getKey } from '$lib/utils'; import { downloadArchive, downloadFile } from '$lib/utils/asset-utils'; - import { isTimelineAsset } from '$lib/utils/timeline-util'; - import { getAssetInfo, type AssetResponseDto } from '@immich/sdk'; + import { getAssetInfo } from '@immich/sdk'; import { mdiCloudDownloadOutline, mdiFileDownloadOutline, mdiFolderDownloadOutline } from '@mdi/js'; import { t } from 'svelte-i18n'; import MenuOption from '../../shared-components/context-menu/menu-option.svelte'; @@ -23,10 +22,7 @@ const assets = [...getAssets()]; if (assets.length === 1) { clearSelect(); - let asset: AssetResponseDto = assets[0] as AssetResponseDto; - if (isTimelineAsset(assets[0])) { - asset = await getAssetInfo({ id: assets[0].id, key: getKey() }); - } + let asset = await getAssetInfo({ id: assets[0].id, key: getKey() }); await downloadFile(asset); return; } diff --git a/web/src/lib/components/photos-page/actions/select-all-assets.svelte b/web/src/lib/components/photos-page/actions/select-all-assets.svelte index 3c6bbcbb3d..f64f6406c9 100644 --- a/web/src/lib/components/photos-page/actions/select-all-assets.svelte +++ b/web/src/lib/components/photos-page/actions/select-all-assets.svelte @@ -1,6 +1,6 @@