diff --git a/web/src/lib/components/album-page/album-viewer.svelte b/web/src/lib/components/album-page/album-viewer.svelte index 448b7f84b5..e0182d1c08 100644 --- a/web/src/lib/components/album-page/album-viewer.svelte +++ b/web/src/lib/components/album-page/album-viewer.svelte @@ -16,7 +16,7 @@ import { SlideshowNavigation, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store'; import { handlePromiseError } from '$lib/utils'; import { fileUploadHandler, openFileUploadDialog } from '$lib/utils/file-uploader'; - import type { AlbumResponseDto, SharedLinkResponseDto, UserResponseDto } from '@immich/sdk'; + import type { AlbumResponseDto, SharedLinkResponseDto } from '@immich/sdk'; import { ActionButton, IconButton, Logo } from '@immich/ui'; import { mdiDownload, mdiFileImagePlusOutline, mdiPresentationPlay } from '@mdi/js'; import { t } from 'svelte-i18n'; @@ -26,10 +26,9 @@ interface Props { sharedLink: SharedLinkResponseDto; - user?: UserResponseDto | undefined; } - let { sharedLink, user = undefined }: Props = $props(); + let { sharedLink }: Props = $props(); const album = sharedLink.album as AlbumResponseDto; @@ -97,11 +96,7 @@
{#if assetMultiSelectManager.selectionActive} - assetMultiSelectManager.clear()} - > + {#if sharedLink.allowDownload} diff --git a/web/src/lib/components/memory-page/memory-viewer.svelte b/web/src/lib/components/memory-page/memory-viewer.svelte index 9e24a0a050..f053164066 100644 --- a/web/src/lib/components/memory-page/memory-viewer.svelte +++ b/web/src/lib/components/memory-page/memory-viewer.svelte @@ -336,11 +336,7 @@ {#if assetMultiSelectManager.selectionActive}
- assetMultiSelectManager.clear()} - > + {@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())} {#if assetMultiSelectManager.selectionActive} - assetMultiSelectManager.clear()} - > + - assetMultiSelectManager.clear()} - > + diff --git a/web/src/lib/components/timeline/AssetSelectControlBar.svelte b/web/src/lib/components/timeline/AssetSelectControlBar.svelte index e722ce90c8..8ebccd03b8 100644 --- a/web/src/lib/components/timeline/AssetSelectControlBar.svelte +++ b/web/src/lib/components/timeline/AssetSelectControlBar.svelte @@ -1,32 +1,26 @@ - - - + {#snippet leading()}

{assets.length}

diff --git a/web/src/lib/managers/asset-multi-select-manager.svelte.ts b/web/src/lib/managers/asset-multi-select-manager.svelte.ts index ec282f659a..eb75825102 100644 --- a/web/src/lib/managers/asset-multi-select-manager.svelte.ts +++ b/web/src/lib/managers/asset-multi-select-manager.svelte.ts @@ -43,7 +43,8 @@ export class AssetMultiSelectManager { asControlContext(): AssetControlContext { return { - getOwnedAssets: () => this.assets.filter((asset) => asset.ownerId === this.#userId), + getOwnedAssets: () => + this.#userId ? this.assets.filter((asset) => asset.ownerId === this.#userId) : this.assets, getAssets: () => this.assets, clearSelect: () => this.clear(), }; diff --git a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte index 60372f5ad4..c4fb6e91f9 100644 --- a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -451,10 +451,7 @@ {#if assetMultiSelectManager.selectionActive} - assetMultiSelectManager.clear()} - > + {@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())} diff --git a/web/src/routes/(user)/archive/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/archive/[[photos=photos]]/[[assetId=id]]/+page.svelte index 0b2df6079c..c7d5d73f06 100644 --- a/web/src/routes/(user)/archive/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/archive/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -59,7 +59,7 @@ {#if assetMultiSelectManager.selectionActive} - assetMultiSelectManager.clear()}> + {@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())} {#if assetMultiSelectManager.selectionActive} - assetMultiSelectManager.clear()}> + {@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())} timelineManager.removeAssets(assetIds)} /> diff --git a/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte index 264f36fdff..9299e9001b 100644 --- a/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -110,7 +110,7 @@ {#if assetMultiSelectManager.selectionActive}
- assetMultiSelectManager.clear()}> + {@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())} diff --git a/web/src/routes/(user)/locked/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/locked/[[photos=photos]]/[[assetId=id]]/+page.svelte index a0d2992409..a01b47884c 100644 --- a/web/src/routes/(user)/locked/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/locked/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -74,7 +74,7 @@ {#if assetMultiSelectManager.selectionActive} - assetMultiSelectManager.clear()}> + diff --git a/web/src/routes/(user)/partners/[userId]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/partners/[userId]/[[photos=photos]]/[[assetId=id]]/+page.svelte index dbe9276c4b..97b1d89bae 100644 --- a/web/src/routes/(user)/partners/[userId]/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/partners/[userId]/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -39,7 +39,7 @@ {#if assetMultiSelectManager.selectionActive} - assetMultiSelectManager.clear()}> + {@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())} diff --git a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte index 611ea2ccd8..9e5ddbb960 100644 --- a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -458,7 +458,7 @@
{#if assetMultiSelectManager.selectionActive} - assetMultiSelectManager.clear()}> + {@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())} diff --git a/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte index 5376804c17..aa7ba28812 100644 --- a/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte @@ -25,7 +25,7 @@ import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte'; import { Route } from '$lib/route'; import { getAssetBulkActions } from '$lib/services/asset.service'; - import { preferences, user } from '$lib/stores/user.store'; + import { preferences } from '$lib/stores/user.store'; import { getAssetMediaUrl, memoryLaneTitle } from '$lib/utils'; import { updateStackedAssetInTimeline, @@ -112,11 +112,7 @@ {#if assetMultiSelectManager.selectionActive} - assetMultiSelectManager.clear()} - > + {@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())} diff --git a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte index 1de18569b0..970d2f5886 100644 --- a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -318,10 +318,7 @@
{#if assetMultiSelectManager.selectionActive}
- assetMultiSelectManager.clear()} - > + {@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())} diff --git a/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte index b79d5d76e1..56786821f6 100644 --- a/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -27,7 +27,7 @@ import { Route } from '$lib/route'; import { getAssetBulkActions } from '$lib/services/asset.service'; import { getTagActions } from '$lib/services/tag.service'; - import { preferences, user } from '$lib/stores/user.store'; + import { preferences } from '$lib/stores/user.store'; import { joinPaths, TreeNode } from '$lib/utils/tree-utils'; import { getAllTags, type TagResponseDto } from '@immich/sdk'; import { ActionButton, CommandPaletteDefaultProvider, Text } from '@immich/ui'; @@ -113,11 +113,7 @@
{#if assetMultiSelectManager.selectionActive}
- assetMultiSelectManager.clear()} - > + {@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())} diff --git a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte index 3c75444f40..18b793c566 100644 --- a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -68,7 +68,7 @@ {/if} {#if assetMultiSelectManager.selectionActive} - assetMultiSelectManager.clear()}> + timelineManager.removeAssets(assetIds)} /> timelineManager.removeAssets(assetIds)} />