High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor(web): bulk (un)archive actions (#32189)
Mees Frenseld26c0eec10f1
diff --git a/web/src/lib/components/shared-components/gallery-viewer/GalleryViewer.svelte b/web/src/lib/components/shared-components/gallery-viewer/GalleryViewer.svelteindex ca99d35494..edf5811011 100644--- a/web/src/lib/components/shared-components/gallery-viewer/GalleryViewer.svelte+++ b/web/src/lib/components/shared-components/gallery-viewer/GalleryViewer.svelte@@ -17,14 +17,14 @@import { showDeleteModal } from '#lib/stores/preferences.store.ts';import { handlePromiseError } from '#lib/utils.ts';import { deleteAssets } from '#lib/utils/actions.ts';- import { archiveAssets, getNextAsset, getPreviousAsset, navigateToAsset } from '#lib/utils/asset-utils.ts';+ import { getNextAsset, getPreviousAsset, navigateToAsset } from '#lib/utils/asset-utils.ts';import { moveFocus } from '#lib/utils/focus-util.ts';import { handleError } from '#lib/utils/handle-error.ts';import { getJustifiedLayoutFromAssets } from '#lib/utils/layout-utils.ts';import { navigate } from '#lib/utils/navigation.ts';import { isTimelineAsset, toTimelineAsset } from '#lib/utils/timeline-util.ts';import { TUNABLES } from '#lib/utils/tunables.ts';- import { AssetVisibility, type AssetResponseDto } from '@immich/sdk';+ import { type AssetResponseDto } from '@immich/sdk';import { modalManager } from '@immich/ui';import { debounce } from 'lodash-es';import { t } from 'svelte-i18n';@@ -204,17 +204,6 @@assetInteraction.clear();};- const toggleArchive = async () => {- const ids = await archiveAssets(- assetInteraction.assets,- assetInteraction.isAllArchived ? AssetVisibility.Timeline : AssetVisibility.Archive,- );- if (ids) {- assets = assets.filter((asset) => !ids.includes(asset.id));- assetInteraction.clear();- }- };-const focusNextAsset = () => moveFocus((element) => element.dataset.thumbnailFocusContainer !== undefined, 'next');const focusPreviousAsset = () =>moveFocus((element) => element.dataset.thumbnailFocusContainer !== undefined, 'previous');@@ -258,7 +247,6 @@shortcuts.push({ shortcut: { key: 'Delete' }, onShortcut: onDelete },{ shortcut: { key: 'Delete', shift: true }, onShortcut: () => trashOrDelete(true) },- { shortcut: { key: 'a', shift: true }, onShortcut: toggleArchive },);}}diff --git a/web/src/lib/components/timeline/actions/ArchiveAction.svelte b/web/src/lib/components/timeline/actions/ArchiveAction.sveltedeleted file mode 100644index 36c0087301..0000000000--- a/web/src/lib/components/timeline/actions/ArchiveAction.svelte+++ /dev/null@@ -1,54 +0,0 @@-<script lang="ts">- import MenuOption from '#lib/components/shared-components/context-menu/MenuOption.svelte';- import { assetMultiSelectManager } from '#lib/managers/asset-multi-select-manager.svelte.ts';- import type { OnArchive } from '#lib/utils/actions.ts';- import { archiveAssets } from '#lib/utils/asset-utils.ts';- import { AssetVisibility } from '@immich/sdk';- import { IconButton } from '@immich/ui';- import { mdiArchiveArrowDownOutline, mdiArchiveArrowUpOutline, mdiTimerSand } from '@mdi/js';- import { t } from 'svelte-i18n';-- type Props = {- onArchive?: OnArchive;- menuItem?: boolean;- unarchive?: boolean;- };-- let { onArchive, menuItem = false, unarchive = false }: Props = $props();-- let text = $derived(unarchive ? $t('unarchive') : $t('to_archive'));- let icon = $derived(unarchive ? mdiArchiveArrowUpOutline : mdiArchiveArrowDownOutline);-- let loading = $state(false);-- const handleArchive = async () => {- const visibility = unarchive ? AssetVisibility.Timeline : AssetVisibility.Archive;- const assets = assetMultiSelectManager.getOwnedAssets().filter((asset) => asset.visibility !== visibility);- loading = true;- const ids = await archiveAssets(assets, visibility as AssetVisibility);- if (ids) {- onArchive?.(ids, visibility);- assetMultiSelectManager.clear();- }- loading = false;- };-</script>--{#if menuItem}- <MenuOption {text} {icon} onClick={handleArchive} />-{/if}--{#if !menuItem}- {#if loading}- <IconButton- shape="round"- color="secondary"- variant="ghost"- aria-label={$t('loading')}- icon={mdiTimerSand}- onclick={() => {}}- />- {:else}- <IconButton shape="round" color="secondary" variant="ghost" aria-label={text} {icon} onclick={handleArchive} />- {/if}-{/if}diff --git a/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte b/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelteindex 3daaf8cc63..2e1b938b86 100644--- a/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte+++ b/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte@@ -7,7 +7,6 @@} from '#lib/components/timeline/actions/focus-actions.ts';import type { AssetMultiSelectManager } from '#lib/managers/asset-multi-select-manager.svelte.ts';import { assetViewerManager } from '#lib/managers/asset-viewer-manager.svelte.ts';- import { eventManager } from '#lib/managers/event-manager.svelte.ts';import { featureFlagsManager } from '#lib/managers/feature-flags-manager.svelte.ts';import { TimelineManager } from '#lib/managers/timeline-manager/timeline-manager.svelte.ts';import type { TimelineAsset } from '#lib/managers/timeline-manager/types.ts';@@ -21,8 +20,7 @@import { searchStore } from '#lib/stores/search.svelte.ts';import { handlePromiseError } from '#lib/utils.ts';import { deleteAssets } from '#lib/utils/actions.ts';- import { archiveAssets, selectAllAssets } from '#lib/utils/asset-utils.ts';- import { AssetVisibility } from '@immich/sdk';+ import { selectAllAssets } from '#lib/utils/asset-utils.ts';import { isModalOpen, modalManager } from '@immich/ui';type Props = {@@ -64,14 +62,6 @@onEscape?.();};- const toggleArchive = async () => {- const visibility = assetInteraction.isAllArchived ? AssetVisibility.Timeline : AssetVisibility.Archive;- const ids = await archiveAssets(assetInteraction.assets, visibility);- timelineManager.update(ids, (asset) => (asset.visibility = visibility));- eventManager.emit('AssetsArchive', ids);- assetInteraction.clear();- };-const onSelectStart = (e: Event) => {if (!searchStore.isSearchEnabled && assetInteraction.selectionActive && keyboardManager.shift) {e.preventDefault();@@ -135,7 +125,6 @@{ shortcut: { key: 'Delete', shift: true }, onShortcut: () => trashOrDelete(true) },{ shortcut: { key: 'D', ctrl: true }, onShortcut: () => assetInteraction.clear() },{ shortcut: { key: 's' }, onShortcut: () => onStackAssets() },- { shortcut: { key: 'a', shift: true }, onShortcut: toggleArchive },);} else {// conflicting shortcutsdiff --git a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.tsindex 9a761ae29c..522dcfe07f 100644--- a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts+++ b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts@@ -25,7 +25,14 @@ import {type TimelineDateTime,type TimelineYearMonth,} from '#lib/utils/timeline-util.ts';-import { AssetOrder, AssetOrderBy, getAssetInfo, getTimeBuckets, type AssetResponseDto } from '@immich/sdk';+import {+ AssetOrder,+ AssetOrderBy,+ AssetVisibility,+ getAssetInfo,+ getTimeBuckets,+ type AssetResponseDto,+} from '@immich/sdk';import { clamp, isEqual } from 'lodash-es';import { SvelteDate, SvelteSet } from 'svelte/reactivity';import { isMismatched, updateObject } from './internal/utils.svelte';@@ -122,7 +129,14 @@ export class TimelineManager extends VirtualScrollManager {this.upsertAssets([timelineAsset]);}},- AssetsUnarchive: (assets) => this.upsertAssets(assets),+ AssetsArchive: (assetIds) => this.update(assetIds, (asset) => (asset.visibility = AssetVisibility.Archive)),+ AssetsUnarchive: (assets) => {+ if (this.#options.visibility === AssetVisibility.Archive) {+ this.removeAssets(assets.map((asset) => asset.id));+ } else {+ this.upsertAssets(assets);+ }+ },AlbumRemoveAssets: ({ assetIds, albumIds }) => {if (this.#options.albumId && albumIds.includes(this.#options.albumId)) {this.removeAssets(assetIds);diff --git a/web/src/lib/services/asset.service.ts b/web/src/lib/services/asset.service.tsindex df25f90602..1f18eedf39 100644--- a/web/src/lib/services/asset.service.ts+++ b/web/src/lib/services/asset.service.ts@@ -3,6 +3,7 @@ import { assetMultiSelectManager } from '#lib/managers/asset-multi-select-manageimport { assetViewerManager } from '#lib/managers/asset-viewer-manager.svelte.ts';import { authManager } from '#lib/managers/auth-manager.svelte.ts';import { eventManager } from '#lib/managers/event-manager.svelte.ts';+import type { TimelineAsset } from '#lib/managers/timeline-manager/types.ts';import AssetAddToAlbumModal from '#lib/modals/AssetAddToAlbumModal.svelte';import AssetTagModal from '#lib/modals/AssetTagModal.svelte';import ProfileImageCropperModal from '#lib/modals/ProfileImageCropperModal.svelte';@@ -25,6 +26,7 @@ import {getAssetInfo,runAssetJobs,updateAsset,+ updateAssets,type AlbumResponseDto,type AssetJobsDto,type AssetResponseDto,@@ -33,6 +35,8 @@ import { modalManager, toastManager, type ActionItem } from '@immich/ui';import {mdiAccountCircleOutline,mdiAlertOutline,+ mdiArchiveArrowDownOutline,+ mdiArchiveArrowUpOutline,mdiCogRefreshOutline,mdiCompare,mdiContentCopy,@@ -78,6 +82,19 @@ export const getAssetBulkActions = ($t: MessageFormatter, album?: AlbumResponseDonAction: () => modalManager.show(AssetAddToAlbumModal, { assetIds }),};+ const Archive: ActionItem = {+ title: $t('to_archive'),+ icon: mdiArchiveArrowDownOutline,+ shortcuts: [{ key: 'a', shift: true }],+ $if: () => assetMultiSelectManager.isAllUserOwned && !assetMultiSelectManager.isAllArchived,+ onAction: async () => {+ const assets = ownedAssets.filter((asset) => asset.visibility !== AssetVisibility.Archive);+ if (await handleSetVisibility(assets, AssetVisibility.Archive)) {+ assetMultiSelectManager.clear();+ }+ },+ };+const CreateSharedLink: ActionItem = {title: $t('share'),icon: mdiShareVariantOutline,@@ -104,6 +121,18 @@ export const getAssetBulkActions = ($t: MessageFormatter, album?: AlbumResponseDshortcuts: { key: 't' },};+ const Unarchive: ActionItem = {+ title: $t('unarchive'),+ icon: mdiArchiveArrowUpOutline,+ shortcuts: [{ key: 'a', shift: true }],+ $if: () => assetMultiSelectManager.isAllUserOwned && assetMultiSelectManager.isAllArchived,+ onAction: async () => {+ if (await handleSetVisibility(ownedAssets, AssetVisibility.Timeline)) {+ assetMultiSelectManager.clear();+ }+ },+ };+const RefreshFacesJob: ActionItem = {title: $t('refresh_faces'),icon: mdiHeadSyncOutline,@@ -131,9 +160,11 @@ export const getAssetBulkActions = ($t: MessageFormatter, album?: AlbumResponseDreturn {AddToAlbum,+ Archive,CreateSharedLink,RemoveFromAlbum,Tag,+ Unarchive,RefreshFacesJob,RefreshMetadataJob,RegenerateThumbnailJob,@@ -500,6 +531,60 @@ export const handleTagAssets = async (assetIds: string[], tagIds: string[]) => {}};+const handleSetVisibility = async (assets: TimelineAsset[], visibility: AssetVisibility) => {+ const $t = await getFormatter();+ const ids = assets.map((asset) => asset.id);++ try {+ await updateAssets({ assetBulkUpdateDto: { ids, visibility } });++ if (visibility === AssetVisibility.Archive) {+ toastManager.primary({+ description: $t('archived_count', { values: { count: assets.length } }),+ button: (close) => ({+ label: $t('undo'),+ onclick: () => {+ close();+ void undoArchiveAssets(assets);+ },+ }),+ });+ eventManager.emit('AssetsArchive', ids);+ } else {+ // Timeline+ toastManager.primary($t('unarchived_count', { values: { count: assets.length } }));+ eventManager.emit('AssetsUnarchive', assets);+ }+ } catch (error) {+ handleError(+ error,+ $t('errors.unable_to_archive_unarchive', { values: { archived: visibility === AssetVisibility.Archive } }),+ );+ return false;+ }++ return true;+};++const undoArchiveAssets = async (assets: TimelineAsset[]) => {+ const $t = await getFormatter();+ try {+ const ids = assets.map((a) => a.id);+ await updateAssets({+ assetBulkUpdateDto: { ids, visibility: AssetVisibility.Timeline },+ });++ for (const asset of assets) {+ asset.visibility = AssetVisibility.Timeline;+ }+ toastManager.success($t('unarchived_count', { values: { count: assets.length } }));+ eventManager.emit('AssetsUnarchive', assets);+ eventManager.emit('AssetsUndoArchive', assets);+ } catch (error) {+ handleError(error, $t('errors.unable_to_archive_unarchive', { values: { archived: false } }));+ }+};+const handleBulkRemoveAssetsFromAlbum = async (assetIds: string[], album: AlbumResponseDto) => {const $t = await getFormatter();diff --git a/web/src/lib/utils/asset-utils.ts b/web/src/lib/utils/asset-utils.tsindex f39bd251b1..a1e33d72d7 100644--- a/web/src/lib/utils/asset-utils.ts+++ b/web/src/lib/utils/asset-utils.ts@@ -337,32 +337,6 @@ const undoArchiveAssets = async (assets: TimelineAsset[]) => {}};-export const archiveAssets = async (assets: TimelineAsset[], visibility: AssetVisibility) => {- const ids = assets.map(({ id }) => id);- const $t = get(t);-- try {- if (ids.length > 0) {- await updateAssets({- assetBulkUpdateDto: { ids, visibility },- });- }-- if (visibility === AssetVisibility.Archive) {- showUndoArchiveToast($t('archived_count', { values: { count: ids.length } }), assets);- } else {- toastManager.primary($t('unarchived_count', { values: { count: ids.length } }));- }- } catch (error) {- handleError(- error,- $t('errors.unable_to_archive_unarchive', { values: { archived: visibility === AssetVisibility.Archive } }),- );- }-- return ids;-};-export const delay = async (ms: number) => {return new Promise((resolve) => setTimeout(resolve, ms));};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.svelteindex e8fbe6a4bf..39aa29586e 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@@ -11,7 +11,6 @@import MenuOption from '#lib/components/shared-components/context-menu/MenuOption.svelte';import ControlAppBar from '#lib/components/shared-components/ControlAppBar.svelte';import UserAvatar from '#lib/components/shared-components/UserAvatar.svelte';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import ChangeDate from '#lib/components/timeline/actions/ChangeDateAction.svelte';import ChangeDescription from '#lib/components/timeline/actions/ChangeDescriptionAction.svelte';import ChangeLocation from '#lib/components/timeline/actions/ChangeLocationAction.svelte';@@ -415,11 +414,8 @@<ChangeDate menuItem /><ChangeDescription menuItem /><ChangeLocation menuItem />- <ArchiveAction- menuItem- unarchive={assetMultiSelectManager.isAllArchived}- onArchive={(ids, visibility) => timelineManager.update(ids, (asset) => (asset.visibility = visibility))}- />+ <ActionMenuItem action={Actions.Archive} />+ <ActionMenuItem action={Actions.Unarchive} /><SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} />{/if}{#if assetMultiSelectManager.assets.length === 1}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.svelteindex 13ee966408..f8276e5e80 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@@ -2,7 +2,6 @@import UserPageLayout from '#lib/components/layouts/UserPageLayout.svelte';import ButtonContextMenu from '#lib/components/shared-components/context-menu/ButtonContextMenu.svelte';import EmptyPlaceholder from '#lib/components/shared-components/EmptyPlaceholder.svelte';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import DeleteAssets from '#lib/components/timeline/actions/DeleteAssetsAction.svelte';import DownloadAction from '#lib/components/timeline/actions/DownloadAction.svelte';import FavoriteAction from '#lib/components/timeline/actions/FavoriteAction.svelte';@@ -63,10 +62,7 @@<AssetSelectControlBar>{const Actions = $derived(getAssetBulkActions($t))}<CommandPaletteDefaultProvider name={$t('assets')} actions={Object.values(Actions)} />- <ArchiveAction- unarchive- onArchive={(ids, visibility) => timelineManager.update(ids, (asset) => (asset.visibility = visibility))}- />+ <ActionButton action={Actions.Unarchive} /><ActionButton action={Actions.CreateSharedLink} /><SelectAllAssets {timelineManager} assetInteraction={assetMultiSelectManager} /><ActionButton action={Actions.AddToAlbum} />diff --git a/web/src/routes/(user)/favorites/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/favorites/[[photos=photos]]/[[assetId=id]]/+page.svelteindex 1e9131d100..cf07c1c172 100644--- a/web/src/routes/(user)/favorites/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/favorites/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -3,7 +3,6 @@import UserPageLayout from '#lib/components/layouts/UserPageLayout.svelte';import ButtonContextMenu from '#lib/components/shared-components/context-menu/ButtonContextMenu.svelte';import EmptyPlaceholder from '#lib/components/shared-components/EmptyPlaceholder.svelte';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import ChangeDate from '#lib/components/timeline/actions/ChangeDateAction.svelte';import ChangeDescription from '#lib/components/timeline/actions/ChangeDescriptionAction.svelte';import ChangeLocation from '#lib/components/timeline/actions/ChangeLocationAction.svelte';@@ -75,11 +74,8 @@<ChangeDate menuItem /><ChangeDescription menuItem /><ChangeLocation menuItem />- <ArchiveAction- menuItem- unarchive={assetMultiSelectManager.isAllArchived}- onArchive={(ids, visibility) => timelineManager.update(ids, (asset) => (asset.visibility = visibility))}- />+ <ActionMenuItem action={Actions.Archive} />+ <ActionMenuItem action={Actions.Unarchive} /><ActionMenuItem action={Actions.Tag} /><SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} /><DeleteAssetsdiff --git a/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/folders/[[photos=photos]]/[[assetId=id]]/+page.svelteindex cca60de7cd..64d981333b 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@@ -9,7 +9,6 @@import TreeItems from '#lib/components/shared-components/tree/TreeItems.svelte';import Sidebar from '#lib/components/sidebar/Sidebar.svelte';import AssetSelectControlBar from '#lib/components/timeline/AssetSelectControlBar.svelte';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import ChangeDate from '#lib/components/timeline/actions/ChangeDateAction.svelte';import ChangeDescription from '#lib/components/timeline/actions/ChangeDescriptionAction.svelte';import ChangeLocation from '#lib/components/timeline/actions/ChangeLocationAction.svelte';@@ -111,7 +110,7 @@</Sidebar>{/snippet}- <OnEvents onAssetsDelete={refreshAll} />+ <OnEvents onAssetsDelete={refreshAll} onAssetsArchive={triggerAssetUpdate} onAssetsUnarchive={triggerAssetUpdate} /><TreeBreadcrumbs node={data.tree} icon={mdiFolderHome} title={$t('folders')} getLink={getLinkForPath} />@@ -168,7 +167,8 @@<ChangeDate menuItem /><ChangeDescription menuItem /><ChangeLocation menuItem />- <ArchiveAction menuItem unarchive={assetMultiSelectManager.isAllArchived} onArchive={triggerAssetUpdate} />+ <ActionMenuItem action={Actions.Archive} />+ <ActionMenuItem action={Actions.Unarchive} /><SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} /><ActionMenuItem action={Actions.Tag} /><DeleteAssets menuItem onAssetDelete={triggerAssetUpdate} onUndoDelete={triggerAssetUpdate} />diff --git a/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelte b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelteindex 18de77a56a..df26d7e160 100644--- a/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelte+++ b/web/src/routes/(user)/map/[[photos=photos]]/[[assetId=id]]/MapTimelinePanel.svelte@@ -2,7 +2,6 @@import ActionMenuItem from '#lib/components/ActionMenuItem.svelte';import ButtonContextMenu from '#lib/components/shared-components/context-menu/ButtonContextMenu.svelte';import type { SelectionBBox } from '#lib/components/shared-components/map/types.ts';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import ChangeDate from '#lib/components/timeline/actions/ChangeDateAction.svelte';import ChangeDescription from '#lib/components/timeline/actions/ChangeDescriptionAction.svelte';import ChangeLocation from '#lib/components/timeline/actions/ChangeLocationAction.svelte';@@ -146,11 +145,8 @@<ChangeDate menuItem /><ChangeDescription menuItem /><ChangeLocation menuItem />- <ArchiveAction- menuItem- unarchive={assetMultiSelectManager.isAllArchived}- onArchive={(ids, visibility) => timelineManager.update(ids, (asset) => (asset.visibility = visibility))}- />+ <ActionMenuItem action={Actions.Archive} />+ <ActionMenuItem action={Actions.Unarchive} /><ActionMenuItem action={Actions.Tag} /><DeleteAssetsmenuItemdiff --git a/web/src/routes/(user)/memories/[id]/[[photos=photos]]/[[assetId=id]]/MemoryViewer.svelte b/web/src/routes/(user)/memories/[id]/[[photos=photos]]/[[assetId=id]]/MemoryViewer.svelteindex 4ad087232e..e6916e4cd7 100644--- a/web/src/routes/(user)/memories/[id]/[[photos=photos]]/[[assetId=id]]/MemoryViewer.svelte+++ b/web/src/routes/(user)/memories/[id]/[[photos=photos]]/[[assetId=id]]/MemoryViewer.svelte@@ -4,10 +4,10 @@import { shortcuts } from '#lib/actions/shortcut.ts';import ActionMenuItem from '#lib/components/ActionMenuItem.svelte';import BirthdayConfetti from '#lib/components/memories/BirthdayConfetti.svelte';+ import OnEvents from '#lib/components/OnEvents.svelte';import ButtonContextMenu from '#lib/components/shared-components/context-menu/ButtonContextMenu.svelte';import MenuOption from '#lib/components/shared-components/context-menu/MenuOption.svelte';import GalleryViewer from '#lib/components/shared-components/gallery-viewer/GalleryViewer.svelte';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import ChangeDate from '#lib/components/timeline/actions/ChangeDateAction.svelte';import ChangeDescription from '#lib/components/timeline/actions/ChangeDescriptionAction.svelte';import ChangeLocation from '#lib/components/timeline/actions/ChangeLocationAction.svelte';@@ -274,6 +274,8 @@]}/>+<OnEvents onAssetsArchive={handleHideAssets} />+{#if assetMultiSelectManager.selectionActive}<div class="dark sticky top-0 z-1"><AssetSelectControlBar>@@ -299,7 +301,7 @@<ChangeDate menuItem /><ChangeDescription menuItem /><ChangeLocation menuItem />- <ArchiveAction menuItem unarchive={assetMultiSelectManager.isAllArchived} onArchive={handleHideAssets} />+ <ActionMenuItem action={Actions.Archive} /><ActionMenuItem action={Actions.Tag} /><DeleteAssets menuItem onAssetDelete={handleHideAssets} /></ButtonContextMenu>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.svelteindex a32fdf4779..4b82c65dcd 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@@ -8,7 +8,6 @@import ButtonContextMenu from '#lib/components/shared-components/context-menu/ButtonContextMenu.svelte';import MenuOption from '#lib/components/shared-components/context-menu/MenuOption.svelte';import ControlAppBar from '#lib/components/shared-components/ControlAppBar.svelte';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import ChangeDate from '#lib/components/timeline/actions/ChangeDateAction.svelte';import ChangeDescription from '#lib/components/timeline/actions/ChangeDescriptionAction.svelte';import ChangeLocation from '#lib/components/timeline/actions/ChangeLocationAction.svelte';@@ -500,14 +499,8 @@<ChangeDate menuItem /><ChangeDescription menuItem /><ChangeLocation menuItem />- <ArchiveAction- menuItem- unarchive={assetMultiSelectManager.isAllArchived}- onArchive={(ids, visibility) =>- timelineManager.update(ids, (asset) => {- asset.visibility = visibility;- })}- />+ <ActionMenuItem action={Actions.Archive} />+ <ActionMenuItem action={Actions.Unarchive} /><ActionMenuItem action={Actions.Tag} /><SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} /><DeleteAssetsdiff --git a/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelteindex 03274b668b..654cd12fb7 100644--- a/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte@@ -3,7 +3,6 @@import UserPageLayout from '#lib/components/layouts/UserPageLayout.svelte';import ButtonContextMenu from '#lib/components/shared-components/context-menu/ButtonContextMenu.svelte';import EmptyPlaceholder from '#lib/components/shared-components/EmptyPlaceholder.svelte';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import ChangeDate from '#lib/components/timeline/actions/ChangeDateAction.svelte';import ChangeDescription from '#lib/components/timeline/actions/ChangeDescriptionAction.svelte';import ChangeLocation from '#lib/components/timeline/actions/ChangeLocationAction.svelte';@@ -143,10 +142,8 @@<ChangeDate menuItem /><ChangeDescription menuItem /><ChangeLocation menuItem />- <ArchiveAction- menuItem- onArchive={(ids, visibility) => timelineManager.update(ids, (asset) => (asset.visibility = visibility))}- />+ <ActionMenuItem action={Actions.Archive} />+ <ActionMenuItem action={Actions.Unarchive} /><ActionMenuItem action={Actions.Tag} /><DeleteAssetsmenuItemdiff --git a/web/src/routes/(user)/recently-added/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/recently-added/[[photos=photos]]/[[assetId=id]]/+page.svelteindex 825bcf4bbb..cafa4c6f83 100644--- a/web/src/routes/(user)/recently-added/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/recently-added/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -3,7 +3,6 @@import UserPageLayout from '#lib/components/layouts/UserPageLayout.svelte';import ButtonContextMenu from '#lib/components/shared-components/context-menu/ButtonContextMenu.svelte';import EmptyPlaceholder from '#lib/components/shared-components/EmptyPlaceholder.svelte';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import ChangeDate from '#lib/components/timeline/actions/ChangeDateAction.svelte';import ChangeDescription from '#lib/components/timeline/actions/ChangeDescriptionAction.svelte';import ChangeLocation from '#lib/components/timeline/actions/ChangeLocationAction.svelte';@@ -127,10 +126,8 @@<ChangeDate menuItem /><ChangeDescription menuItem /><ChangeLocation menuItem />- <ArchiveAction- menuItem- onArchive={(ids, visibility) => timelineManager.update(ids, (asset) => (asset.visibility = visibility))}- />+ <ActionMenuItem action={Actions.Archive} />+ <ActionMenuItem action={Actions.Unarchive} /><ActionMenuItem action={Actions.Tag} /><DeleteAssetsmenuItemdiff --git a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelteindex 89badbe3b4..0bcde57b3c 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@@ -7,7 +7,6 @@import ControlAppBar from '#lib/components/shared-components/ControlAppBar.svelte';import GalleryViewer from '#lib/components/shared-components/gallery-viewer/GalleryViewer.svelte';import SearchBar from '#lib/components/shared-components/search-bar/SearchBar.svelte';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import ChangeDate from '#lib/components/timeline/actions/ChangeDateAction.svelte';import ChangeDescription from '#lib/components/timeline/actions/ChangeDescriptionAction.svelte';import ChangeLocation from '#lib/components/timeline/actions/ChangeLocationAction.svelte';@@ -19,7 +18,7 @@import { QueryParameter } from '#lib/constants.ts';import { assetMultiSelectManager } from '#lib/managers/asset-multi-select-manager.svelte.ts';import { searchManager } from '#lib/managers/search-manager.svelte.ts';- import type { Viewport } from '#lib/managers/timeline-manager/types.ts';+ import type { TimelineAsset, Viewport } from '#lib/managers/timeline-manager/types.ts';import { Route } from '#lib/route.ts';import { getAssetBulkActions } from '#lib/services/asset.service.ts';import { lang, locale } from '#lib/stores/preferences.store.ts';@@ -239,6 +238,21 @@}};+ const onAssetsArchive = (assetIds: string[]) => {+ if (!terms.visibility || terms.visibility === AssetVisibility.Timeline) {+ const assetIdSet = new Set(assetIds);+ searchResultAssets = searchResultAssets.filter((asset) => !assetIdSet.has(asset.id));+ }+ };++ // TODO: add back in opposite case+ const onAssetsUnarchive = (assets: TimelineAsset[]) => {+ if (terms.visibility === AssetVisibility.Archive) {+ const assetIdSet = new Set(assets.map((asset) => asset.id));+ searchResultAssets = searchResultAssets.filter((asset) => !assetIdSet.has(asset.id));+ }+ };+function getObjectKeys<T extends object>(obj: T): (keyof T)[] {return Object.keys(obj) as (keyof T)[];}@@ -254,7 +268,7 @@</script><svelte:window bind:scrollY />-<OnEvents {onAlbumAddAssets} />+<OnEvents {onAlbumAddAssets} {onAssetsArchive} {onAssetsUnarchive} />{#if searchTermKeys.length > 0}<section id="search-chips" class="mx-auto mt-24 w-full max-w-7xl px-4 sm:px-8 lg:px-12">@@ -377,7 +391,8 @@<ChangeDate menuItem /><ChangeDescription menuItem /><ChangeLocation menuItem />- <ArchiveAction menuItem unarchive={assetMultiSelectManager.isAllArchived} />+ <ActionMenuItem action={Actions.Archive} />+ <ActionMenuItem action={Actions.Unarchive} /><SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} /><ActionMenuItem action={Actions.Tag} />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.svelteindex f329853a25..422968461a 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@@ -10,7 +10,6 @@import Sidebar from '#lib/components/sidebar/Sidebar.svelte';import AssetSelectControlBar from '#lib/components/timeline/AssetSelectControlBar.svelte';import Timeline from '#lib/components/timeline/Timeline.svelte';- import ArchiveAction from '#lib/components/timeline/actions/ArchiveAction.svelte';import ChangeDate from '#lib/components/timeline/actions/ChangeDateAction.svelte';import ChangeDescription from '#lib/components/timeline/actions/ChangeDescriptionAction.svelte';import ChangeLocation from '#lib/components/timeline/actions/ChangeLocationAction.svelte';@@ -134,10 +133,8 @@<ChangeDate menuItem /><ChangeDescription menuItem /><ChangeLocation menuItem />- <ArchiveAction- menuItem- onArchive={(ids, visibility) => timelineManager.update(ids, (asset) => (asset.visibility = visibility))}- />+ <ActionMenuItem action={Actions.Archive} />+ <ActionMenuItem action={Actions.Unarchive} /><ActionMenuItem action={Actions.Tag} /><DeleteAssetsmenuItem