mirror of
https://github.com/immich-app/immich.git
synced 2026-05-18 03:10:24 +03:00
refactor: asset select manager (#27327)
This commit is contained in:
+13
-14
@@ -49,7 +49,6 @@
|
||||
import { SlideshowNavigation, SlideshowState, slideshowStore } from '$lib/stores/slideshow.store';
|
||||
import { preferences, user } from '$lib/stores/user.store';
|
||||
import { handlePromiseError } from '$lib/utils';
|
||||
import { cancelMultiselect } from '$lib/utils/asset-utils';
|
||||
import { handleError } from '$lib/utils/handle-error';
|
||||
import { isAlbumsRoute, navigate, type AssetGridRouteSearchParams } from '$lib/utils/navigation';
|
||||
import { AlbumUserRole, AssetVisibility, getAlbumInfo, updateAlbumInfo, type AlbumResponseDto } from '@immich/sdk';
|
||||
@@ -127,7 +126,7 @@
|
||||
return;
|
||||
}
|
||||
if (assetMultiSelectManager.selectionActive) {
|
||||
cancelMultiselect(assetMultiSelectManager);
|
||||
assetMultiSelectManager.clear();
|
||||
return;
|
||||
}
|
||||
await goto(Route.albums());
|
||||
@@ -148,13 +147,13 @@
|
||||
};
|
||||
|
||||
const handleCloseSelectAssets = async () => {
|
||||
timelineMultiSelectManager.clearMultiselect();
|
||||
timelineMultiSelectManager.clear();
|
||||
await setModeToView();
|
||||
};
|
||||
|
||||
const handleSetVisibility = (assetIds: string[]) => {
|
||||
timelineManager.removeAssets(assetIds);
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
};
|
||||
|
||||
const handleRemoveAssets = async (assetIds: string[]) => {
|
||||
@@ -175,13 +174,13 @@
|
||||
await updateThumbnail(assetId);
|
||||
|
||||
viewMode = AlbumPageViewMode.VIEW;
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
};
|
||||
|
||||
const updateThumbnailUsingCurrentSelection = async () => {
|
||||
if (assetMultiSelectManager.selectedAssets.length === 1) {
|
||||
const [firstAsset] = assetMultiSelectManager.selectedAssets;
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
if (assetMultiSelectManager.assets.length === 1) {
|
||||
const [firstAsset] = assetMultiSelectManager.assets;
|
||||
assetMultiSelectManager.clear();
|
||||
await updateThumbnail(firstAsset.id);
|
||||
}
|
||||
};
|
||||
@@ -290,7 +289,7 @@
|
||||
}
|
||||
|
||||
await refreshAlbum();
|
||||
timelineMultiSelectManager.clearMultiselect();
|
||||
timelineMultiSelectManager.clear();
|
||||
await setModeToView();
|
||||
};
|
||||
|
||||
@@ -312,7 +311,7 @@
|
||||
|
||||
const { Cast } = $derived(getGlobalActions($t));
|
||||
const { Share } = $derived(getAlbumActions($t, album));
|
||||
const { AddAssets, Upload } = $derived(getAlbumAssetsActions($t, album, timelineMultiSelectManager.selectedAssets));
|
||||
const { AddAssets, Upload } = $derived(getAlbumAssetsActions($t, album, timelineMultiSelectManager.assets));
|
||||
|
||||
const Close = $derived({
|
||||
title: $t('go_back'),
|
||||
@@ -453,8 +452,8 @@
|
||||
|
||||
{#if assetMultiSelectManager.selectionActive}
|
||||
<AssetSelectControlBar
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => assetMultiSelectManager.clearMultiselect()}
|
||||
assets={assetMultiSelectManager.assets}
|
||||
clearSelect={() => assetMultiSelectManager.clear()}
|
||||
>
|
||||
{@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())}
|
||||
<CommandPaletteDefaultProvider name={$t('assets')} actions={Object.values(Actions)} />
|
||||
@@ -480,7 +479,7 @@
|
||||
/>
|
||||
<SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} />
|
||||
{/if}
|
||||
{#if assetMultiSelectManager.selectedAssets.length === 1}
|
||||
{#if assetMultiSelectManager.assets.length === 1}
|
||||
<MenuOption
|
||||
text={$t('set_as_album_cover')}
|
||||
icon={mdiImageOutline}
|
||||
@@ -597,7 +596,7 @@
|
||||
{#if !timelineMultiSelectManager.selectionActive}
|
||||
{$t('add_to_album')}
|
||||
{:else}
|
||||
{$t('selected_count', { values: { count: timelineMultiSelectManager.selectedAssets.length } })}
|
||||
{$t('selected_count', { values: { count: timelineMultiSelectManager.assets.length } })}
|
||||
{/if}
|
||||
</p>
|
||||
{/snippet}
|
||||
|
||||
@@ -32,14 +32,14 @@
|
||||
|
||||
const handleEscape = () => {
|
||||
if (assetMultiSelectManager.selectionActive) {
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
const handleSetVisibility = (assetIds: string[]) => {
|
||||
timelineManager.removeAssets(assetIds);
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
};
|
||||
</script>
|
||||
|
||||
@@ -59,10 +59,7 @@
|
||||
</UserPageLayout>
|
||||
|
||||
{#if assetMultiSelectManager.selectionActive}
|
||||
<AssetSelectControlBar
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => assetMultiSelectManager.clearMultiselect()}
|
||||
>
|
||||
<AssetSelectControlBar assets={assetMultiSelectManager.assets} clearSelect={() => assetMultiSelectManager.clear()}>
|
||||
{@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())}
|
||||
<CommandPaletteDefaultProvider name={$t('assets')} actions={Object.values(Actions)} />
|
||||
<ArchiveAction
|
||||
|
||||
@@ -35,14 +35,14 @@
|
||||
|
||||
const handleEscape = () => {
|
||||
if (assetMultiSelectManager.selectionActive) {
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
const handleSetVisibility = (assetIds: string[]) => {
|
||||
timelineManager.removeAssets(assetIds);
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
};
|
||||
</script>
|
||||
|
||||
@@ -63,10 +63,7 @@
|
||||
|
||||
<!-- Multiselection mode app bar -->
|
||||
{#if assetMultiSelectManager.selectionActive}
|
||||
<AssetSelectControlBar
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => assetMultiSelectManager.clearMultiselect()}
|
||||
>
|
||||
<AssetSelectControlBar assets={assetMultiSelectManager.assets} clearSelect={() => assetMultiSelectManager.clear()}>
|
||||
{@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())}
|
||||
<CommandPaletteDefaultProvider name={$t('assets')} actions={Object.values(Actions)} />
|
||||
<FavoriteAction removeFavorite onFavorite={(assetIds) => timelineManager.removeAssets(assetIds)} />
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
import { getAssetBulkActions } from '$lib/services/asset.service';
|
||||
import { foldersStore } from '$lib/stores/folders.svelte';
|
||||
import { preferences } from '$lib/stores/user.store';
|
||||
import { cancelMultiselect } from '$lib/utils/asset-utils';
|
||||
import { toTimelineAsset } from '$lib/utils/timeline-util';
|
||||
import { joinPaths } from '$lib/utils/tree-utils';
|
||||
import { ActionButton, CommandPaletteDefaultProvider, IconButton, Text } from '@immich/ui';
|
||||
@@ -45,30 +44,29 @@
|
||||
|
||||
const getLinkForPath = (path: string) => Route.folders({ path });
|
||||
|
||||
afterNavigate(function clearAssetSelection() {
|
||||
// Clear the asset selection when we navigate (like going to another folder)
|
||||
cancelMultiselect(assetMultiSelectManager);
|
||||
afterNavigate(() => {
|
||||
assetMultiSelectManager.clear();
|
||||
});
|
||||
|
||||
function navigateToView(path: string) {
|
||||
const navigateToView = (path: string) => {
|
||||
return goto(getLinkForPath(path), { keepFocus: true, noScroll: true });
|
||||
}
|
||||
};
|
||||
|
||||
async function triggerAssetUpdate() {
|
||||
cancelMultiselect(assetMultiSelectManager);
|
||||
const triggerAssetUpdate = async () => {
|
||||
assetMultiSelectManager.clear();
|
||||
if (data.tree.path) {
|
||||
await foldersStore.refreshAssetsByPath(data.tree.path);
|
||||
}
|
||||
await invalidateAll();
|
||||
}
|
||||
};
|
||||
|
||||
function handleSelectAllAssets() {
|
||||
const handleSelectAllAssets = () => {
|
||||
if (!data.pathAssets) {
|
||||
return;
|
||||
}
|
||||
|
||||
assetMultiSelectManager.selectAssets(data.pathAssets.map((asset) => toTimelineAsset(asset)));
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<UserPageLayout title={data.meta.title}>
|
||||
@@ -112,10 +110,7 @@
|
||||
|
||||
{#if assetMultiSelectManager.selectionActive}
|
||||
<div class="fixed top-0 start-0 w-full">
|
||||
<AssetSelectControlBar
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => cancelMultiselect(assetMultiSelectManager)}
|
||||
>
|
||||
<AssetSelectControlBar assets={assetMultiSelectManager.assets} clearSelect={() => assetMultiSelectManager.clear()}>
|
||||
{@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())}
|
||||
<CommandPaletteDefaultProvider name={$t('assets')} actions={Object.values(Actions)} />
|
||||
<CreateSharedLink />
|
||||
|
||||
@@ -33,13 +33,13 @@
|
||||
|
||||
const handleEscape = () => {
|
||||
if (assetMultiSelectManager.selectionActive) {
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
const handleMoveOffLockedFolder = (assetIds: string[]) => {
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
timelineManager.removeAssets(assetIds);
|
||||
};
|
||||
|
||||
@@ -74,10 +74,7 @@
|
||||
|
||||
<!-- Multi-selection mode app bar -->
|
||||
{#if assetMultiSelectManager.selectionActive}
|
||||
<AssetSelectControlBar
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => assetMultiSelectManager.clearMultiselect()}
|
||||
>
|
||||
<AssetSelectControlBar assets={assetMultiSelectManager.assets} clearSelect={() => assetMultiSelectManager.clear()}>
|
||||
<SelectAllAssets withText {timelineManager} assetInteraction={assetMultiSelectManager} />
|
||||
<SetVisibilityAction unlock onVisibilitySet={handleMoveOffLockedFolder} />
|
||||
<ButtonContextMenu icon={mdiDotsVertical} title={$t('menu')}>
|
||||
|
||||
+2
-5
@@ -28,7 +28,7 @@
|
||||
|
||||
const handleEscape = () => {
|
||||
if (assetMultiSelectManager.selectionActive) {
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
return;
|
||||
}
|
||||
};
|
||||
@@ -39,10 +39,7 @@
|
||||
</main>
|
||||
|
||||
{#if assetMultiSelectManager.selectionActive}
|
||||
<AssetSelectControlBar
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => assetMultiSelectManager.clearMultiselect()}
|
||||
>
|
||||
<AssetSelectControlBar assets={assetMultiSelectManager.assets} clearSelect={() => assetMultiSelectManager.clear()}>
|
||||
{@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())}
|
||||
<CommandPaletteDefaultProvider name={$t('assets')} actions={Object.values(Actions)} />
|
||||
<CreateSharedLink />
|
||||
|
||||
+8
-11
@@ -26,13 +26,13 @@
|
||||
import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';
|
||||
import Timeline from '$lib/components/timeline/Timeline.svelte';
|
||||
import { PersonPageViewMode, QueryParameter, SessionStorageKey } from '$lib/constants';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
|
||||
import PersonMergeSuggestionModal from '$lib/modals/PersonMergeSuggestionModal.svelte';
|
||||
import { Route } from '$lib/route';
|
||||
import { getAssetBulkActions } from '$lib/services/asset.service';
|
||||
import { getPersonActions } from '$lib/services/person.service';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { locale } from '$lib/stores/preferences.store';
|
||||
import { preferences } from '$lib/stores/user.store';
|
||||
import { websocketEvents } from '$lib/stores/websocket';
|
||||
@@ -106,7 +106,7 @@
|
||||
|
||||
const handleEscape = async () => {
|
||||
if (assetMultiSelectManager.selectionActive) {
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -126,8 +126,8 @@
|
||||
});
|
||||
|
||||
const handleUnmerge = () => {
|
||||
timelineManager.removeAssets(assetMultiSelectManager.selectedAssets.map((a) => a.id));
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
timelineManager.removeAssets(assetMultiSelectManager.assets.map((a) => a.id));
|
||||
assetMultiSelectManager.clear();
|
||||
viewMode = PersonPageViewMode.VIEW_ASSETS;
|
||||
};
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
handleError(error, $t('errors.unable_to_set_feature_photo'));
|
||||
}
|
||||
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
|
||||
viewMode = PersonPageViewMode.VIEW_ASSETS;
|
||||
};
|
||||
@@ -282,7 +282,7 @@
|
||||
|
||||
const handleSetVisibility = (assetIds: string[]) => {
|
||||
timelineManager.removeAssets(assetIds);
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
};
|
||||
|
||||
const onPersonUpdate = async (response: PersonResponseDto) => {
|
||||
@@ -458,10 +458,7 @@
|
||||
|
||||
<header>
|
||||
{#if assetMultiSelectManager.selectionActive}
|
||||
<AssetSelectControlBar
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => assetMultiSelectManager.clearMultiselect()}
|
||||
>
|
||||
<AssetSelectControlBar assets={assetMultiSelectManager.assets} clearSelect={() => assetMultiSelectManager.clear()}>
|
||||
{@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())}
|
||||
<CommandPaletteDefaultProvider name={$t('assets')} actions={Object.values(Actions)} />
|
||||
<CreateSharedLink />
|
||||
@@ -521,7 +518,7 @@
|
||||
|
||||
{#if viewMode === PersonPageViewMode.UNASSIGN_ASSETS}
|
||||
<UnMergeFaceSelector
|
||||
assetIds={assetMultiSelectManager.selectedAssets.map((a) => a.id)}
|
||||
assetIds={assetMultiSelectManager.assets.map((a) => a.id)}
|
||||
personAssets={person}
|
||||
onClose={() => (viewMode = PersonPageViewMode.VIEW_ASSETS)}
|
||||
onConfirm={handleUnmerge}
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';
|
||||
import Timeline from '$lib/components/timeline/Timeline.svelte';
|
||||
import { AssetAction } from '$lib/constants';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';
|
||||
import { memoryManager } from '$lib/managers/memory-manager.svelte';
|
||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||
import { Route } from '$lib/route';
|
||||
import { getAssetBulkActions } from '$lib/services/asset.service';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { preferences, user } from '$lib/stores/user.store';
|
||||
import { getAssetMediaUrl, memoryLaneTitle } from '$lib/utils';
|
||||
import {
|
||||
@@ -44,7 +44,7 @@
|
||||
let timelineManager = $state<TimelineManager>() as TimelineManager;
|
||||
const options = { visibility: AssetVisibility.Timeline, withStacked: true, withPartners: true };
|
||||
|
||||
let selectedAssets = $derived(assetMultiSelectManager.selectedAssets);
|
||||
let selectedAssets = $derived(assetMultiSelectManager.assets);
|
||||
let isAssetStackSelected = $derived(selectedAssets.length === 1 && !!selectedAssets[0].stack);
|
||||
let isLinkActionAvailable = $derived.by(() => {
|
||||
const isLivePhoto = selectedAssets.length === 1 && !!selectedAssets[0].livePhotoVideoId;
|
||||
@@ -61,7 +61,7 @@
|
||||
return;
|
||||
}
|
||||
if (assetMultiSelectManager.selectionActive) {
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
return;
|
||||
}
|
||||
};
|
||||
@@ -78,7 +78,7 @@
|
||||
|
||||
const handleSetVisibility = (assetIds: string[]) => {
|
||||
timelineManager.removeAssets(assetIds);
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
};
|
||||
|
||||
const items = $derived(
|
||||
@@ -114,8 +114,8 @@
|
||||
{#if assetMultiSelectManager.selectionActive}
|
||||
<AssetSelectControlBar
|
||||
ownerId={$user.id}
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => assetMultiSelectManager.clearMultiselect()}
|
||||
assets={assetMultiSelectManager.assets}
|
||||
clearSelect={() => assetMultiSelectManager.clear()}
|
||||
>
|
||||
{@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())}
|
||||
<CommandPaletteDefaultProvider name={$t('assets')} actions={Object.values(Actions)} />
|
||||
@@ -132,7 +132,7 @@
|
||||
|
||||
<ButtonContextMenu icon={mdiDotsVertical} title={$t('menu')}>
|
||||
<DownloadAction menuItem />
|
||||
{#if assetMultiSelectManager.selectedAssets.length > 1 || isAssetStackSelected}
|
||||
{#if assetMultiSelectManager.assets.length > 1 || isAssetStackSelected}
|
||||
<StackAction
|
||||
unstack={isAssetStackSelected}
|
||||
onStack={(result) => updateStackedAssetInTimeline(timelineManager, result)}
|
||||
@@ -142,7 +142,7 @@
|
||||
{#if isLinkActionAvailable}
|
||||
<LinkLivePhotoAction
|
||||
menuItem
|
||||
unlink={assetMultiSelectManager.selectedAssets.length === 1}
|
||||
unlink={assetMultiSelectManager.assets.length === 1}
|
||||
onLink={handleLink}
|
||||
onUnlink={handleUnlink}
|
||||
/>
|
||||
|
||||
@@ -19,15 +19,14 @@
|
||||
import TagAction from '$lib/components/timeline/actions/TagAction.svelte';
|
||||
import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';
|
||||
import { QueryParameter } from '$lib/constants';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
|
||||
import type { Viewport } from '$lib/managers/timeline-manager/types';
|
||||
import { Route } from '$lib/route';
|
||||
import { getAssetBulkActions } from '$lib/services/asset.service';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { lang, locale } from '$lib/stores/preferences.store';
|
||||
import { preferences } from '$lib/stores/user.store';
|
||||
import { handlePromiseError } from '$lib/utils';
|
||||
import { cancelMultiselect } from '$lib/utils/asset-utils';
|
||||
import { parseUtcDate } from '$lib/utils/date-time';
|
||||
import { handleError } from '$lib/utils/handle-error';
|
||||
import { isAlbumsRoute, isPeopleRoute } from '$lib/utils/navigation';
|
||||
@@ -110,7 +109,7 @@
|
||||
};
|
||||
|
||||
const handleSetVisibility = (assetIds: string[]) => {
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
onAssetDelete(assetIds);
|
||||
};
|
||||
|
||||
@@ -224,7 +223,7 @@
|
||||
}
|
||||
|
||||
const onAlbumAddAssets = ({ assetIds }: { assetIds: string[] }) => {
|
||||
cancelMultiselect(assetMultiSelectManager);
|
||||
assetMultiSelectManager.clear();
|
||||
|
||||
if (terms.isNotInAlbum) {
|
||||
const assetIdSet = new Set(assetIds);
|
||||
@@ -320,8 +319,8 @@
|
||||
{#if assetMultiSelectManager.selectionActive}
|
||||
<div class="fixed top-0 start-0 w-full z-2">
|
||||
<AssetSelectControlBar
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => cancelMultiselect(assetMultiSelectManager)}
|
||||
assets={assetMultiSelectManager.assets}
|
||||
clearSelect={() => assetMultiSelectManager.clear()}
|
||||
>
|
||||
{@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())}
|
||||
<CommandPaletteDefaultProvider name={$t('assets')} actions={Object.values(Actions)} />
|
||||
|
||||
@@ -22,11 +22,11 @@
|
||||
import TagAction from '$lib/components/timeline/actions/TagAction.svelte';
|
||||
import { AssetAction } from '$lib/constants';
|
||||
import SkipLink from '$lib/elements/SkipLink.svelte';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||
import { Route } from '$lib/route';
|
||||
import { getAssetBulkActions } from '$lib/services/asset.service';
|
||||
import { getTagActions } from '$lib/services/tag.service';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { preferences, user } from '$lib/stores/user.store';
|
||||
import { joinPaths, TreeNode } from '$lib/utils/tree-utils';
|
||||
import { getAllTags, type TagResponseDto } from '@immich/sdk';
|
||||
@@ -56,7 +56,7 @@
|
||||
|
||||
const handleSetVisibility = (assetIds: string[]) => {
|
||||
timelineManager.removeAssets(assetIds);
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
};
|
||||
|
||||
const onRefresh = async () => {
|
||||
@@ -115,8 +115,8 @@
|
||||
<div class="fixed top-0 start-0 w-full">
|
||||
<AssetSelectControlBar
|
||||
ownerId={$user.id}
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => assetMultiSelectManager.clearMultiselect()}
|
||||
assets={assetMultiSelectManager.assets}
|
||||
clearSelect={() => assetMultiSelectManager.clear()}
|
||||
>
|
||||
{@const Actions = getAssetBulkActions($t, assetMultiSelectManager.asControlContext())}
|
||||
<CommandPaletteDefaultProvider name={$t('assets')} actions={Object.values(Actions)} />
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
import SelectAllAssets from '$lib/components/timeline/actions/SelectAllAction.svelte';
|
||||
import AssetSelectControlBar from '$lib/components/timeline/AssetSelectControlBar.svelte';
|
||||
import Timeline from '$lib/components/timeline/Timeline.svelte';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';
|
||||
import { serverConfigManager } from '$lib/managers/server-config-manager.svelte';
|
||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||
import { Route } from '$lib/route';
|
||||
import { getTrashActions } from '$lib/services/trash.service';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { handlePromiseError } from '$lib/utils';
|
||||
import { t } from 'svelte-i18n';
|
||||
import type { PageData } from './$types';
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
const handleEscape = () => {
|
||||
if (assetMultiSelectManager.selectionActive) {
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
return;
|
||||
}
|
||||
};
|
||||
@@ -68,10 +68,7 @@
|
||||
{/if}
|
||||
|
||||
{#if assetMultiSelectManager.selectionActive}
|
||||
<AssetSelectControlBar
|
||||
assets={assetMultiSelectManager.selectedAssets}
|
||||
clearSelect={() => assetMultiSelectManager.clearMultiselect()}
|
||||
>
|
||||
<AssetSelectControlBar assets={assetMultiSelectManager.assets} clearSelect={() => assetMultiSelectManager.clear()}>
|
||||
<SelectAllAssets {timelineManager} assetInteraction={assetMultiSelectManager} />
|
||||
<DeleteAssets force onAssetDelete={(assetIds) => timelineManager.removeAssets(assetIds)} />
|
||||
<RestoreAssets onRestore={(assetIds) => timelineManager.removeAssets(assetIds)} />
|
||||
|
||||
@@ -4,15 +4,14 @@
|
||||
import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';
|
||||
import Timeline from '$lib/components/timeline/Timeline.svelte';
|
||||
import { AssetAction } from '$lib/constants';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import { authManager } from '$lib/managers/auth-manager.svelte';
|
||||
import type { DayGroup } from '$lib/managers/timeline-manager/day-group.svelte';
|
||||
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
|
||||
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
|
||||
import GeolocationPointPickerModal from '$lib/modals/GeolocationPointPickerModal.svelte';
|
||||
import GeolocationUpdateConfirmModal from '$lib/modals/GeolocationUpdateConfirmModal.svelte';
|
||||
import { assetMultiSelectManager } from '$lib/managers/asset-multi-select-manager.svelte';
|
||||
import type { LatLng } from '$lib/types';
|
||||
import { cancelMultiselect } from '$lib/utils/asset-utils';
|
||||
import { setQueryValue } from '$lib/utils/navigation';
|
||||
import { toTimelineAsset } from '$lib/utils/timeline-util';
|
||||
import { AssetVisibility, getAssetInfo, updateAssets } from '@immich/sdk';
|
||||
@@ -46,7 +45,7 @@
|
||||
|
||||
const confirmed = await modalManager.show(GeolocationUpdateConfirmModal, {
|
||||
point,
|
||||
assetCount: assetMultiSelectManager.selectedAssets.length,
|
||||
assetCount: assetMultiSelectManager.assets.length,
|
||||
});
|
||||
|
||||
if (!confirmed) {
|
||||
@@ -55,14 +54,14 @@
|
||||
|
||||
await updateAssets({
|
||||
assetBulkUpdateDto: {
|
||||
ids: assetMultiSelectManager.selectedAssets.map((asset) => asset.id),
|
||||
ids: assetMultiSelectManager.assets.map((asset) => asset.id),
|
||||
latitude: point.lat,
|
||||
longitude: point.lng,
|
||||
},
|
||||
});
|
||||
|
||||
const updatedAssets = await Promise.all(
|
||||
assetMultiSelectManager.selectedAssets.map(async (asset) => {
|
||||
assetMultiSelectManager.assets.map(async (asset) => {
|
||||
const updatedAsset = await getAssetInfo({ ...authManager.params, id: asset.id });
|
||||
return toTimelineAsset(updatedAsset);
|
||||
}),
|
||||
@@ -70,7 +69,7 @@
|
||||
|
||||
timelineManager.upsertAssets(updatedAssets);
|
||||
|
||||
handleDeselectAll();
|
||||
assetMultiSelectManager.clear();
|
||||
};
|
||||
|
||||
const onKeyDown = (event: KeyboardEvent) => {
|
||||
@@ -78,7 +77,7 @@
|
||||
event.preventDefault();
|
||||
}
|
||||
if (event.key === 'Escape' && assetMultiSelectManager.selectionActive) {
|
||||
cancelMultiselect(assetMultiSelectManager);
|
||||
assetMultiSelectManager.clear();
|
||||
}
|
||||
};
|
||||
const onKeyUp = (event: KeyboardEvent) => {
|
||||
@@ -87,10 +86,6 @@
|
||||
}
|
||||
};
|
||||
|
||||
const handleDeselectAll = () => {
|
||||
cancelMultiselect(assetMultiSelectManager);
|
||||
};
|
||||
|
||||
const handlePickPoint = async () => {
|
||||
const selected = await modalManager.show(GeolocationPointPickerModal, { point });
|
||||
if (!selected) {
|
||||
@@ -101,7 +96,7 @@
|
||||
};
|
||||
const handleEscape = () => {
|
||||
if (assetMultiSelectManager.selectionActive) {
|
||||
assetMultiSelectManager.clearMultiselect();
|
||||
assetMultiSelectManager.clear();
|
||||
return;
|
||||
}
|
||||
};
|
||||
@@ -168,7 +163,7 @@
|
||||
color="secondary"
|
||||
variant="ghost"
|
||||
disabled={!assetMultiSelectManager.selectionActive}
|
||||
onclick={handleDeselectAll}
|
||||
onclick={() => assetMultiSelectManager.clear()}
|
||||
>
|
||||
{$t('unselect_all')}
|
||||
</Button>
|
||||
@@ -176,11 +171,11 @@
|
||||
leadingIcon={mdiMapMarkerMultipleOutline}
|
||||
size="small"
|
||||
color="primary"
|
||||
disabled={assetMultiSelectManager.selectedAssets.length === 0}
|
||||
disabled={assetMultiSelectManager.assets.length === 0}
|
||||
onclick={() => handleUpdate()}
|
||||
>
|
||||
<Text class="hidden sm:inline-block">
|
||||
{$t('apply_count', { values: { count: assetMultiSelectManager.selectedAssets.length } })}
|
||||
{$t('apply_count', { values: { count: assetMultiSelectManager.assets.length } })}
|
||||
</Text>
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user