helpy4/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-11-14 17:36:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: adjust favorite, delete, and archive actions for timeline

Browse source 
- Pass TimelineManager instance to timeline action components
  instead of callbacks
- Move asset update logic (delete, archive, favorite) into
  action components
This commit is contained in:
midzelis 2025-09-29 00:18:56 +00:00
parent e5fce47c0c
commit 98ab224791
12 changed files with 74 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

13
web/src/lib/components/timeline/actions/ArchiveAction.svelte
View file

@ -1,5 +1,6 @@
<script lang="ts">
import { getAssetControlContext } from '$lib/components/timeline/AssetSelectControlBar.svelte';
import type { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
import type { OnArchive } from '$lib/utils/actions';
import { archiveAssets } from '$lib/utils/asset-utils';
import { AssetVisibility } from '@immich/sdk';
@ -12,9 +13,10 @@
onArchive?: OnArchive;
menuItem?: boolean;
unarchive?: boolean;
manager?: TimelineManager;
}
let { onArchive, menuItem = false, unarchive = false }: Props = $props();
let { onArchive, menuItem = false, unarchive = false, manager }: Props = $props();
let text = $derived(unarchive ? $t('unarchive') : $t('to_archive'));
let icon = $derived(unarchive ? mdiArchiveArrowUpOutline : mdiArchiveArrowDownOutline);
@ -24,12 +26,13 @@
const { clearSelect, getOwnedAssets } = getAssetControlContext();
const handleArchive = async () => {
const isArchived = unarchive ? AssetVisibility.Timeline : AssetVisibility.Archive;
const assets = [...getOwnedAssets()].filter((asset) => asset.visibility !== isArchived);
const visibility = unarchive ? AssetVisibility.Timeline : AssetVisibility.Archive;
const assets = [...getOwnedAssets()].filter((asset) => asset.visibility !== visibility);
loading = true;
const ids = await archiveAssets(assets, isArchived as AssetVisibility);
const ids = await archiveAssets(assets, visibility as AssetVisibility);
if (ids) {
onArchive?.(ids, isArchived ? AssetVisibility.Archive : AssetVisibility.Timeline);
manager?.updateAssetOperation(ids, (asset) => ((asset.visibility = visibility), void 0));
onArchive?.(ids, visibility ? AssetVisibility.Archive : AssetVisibility.Timeline);
clearSelect();
}
loading = false;

16
web/src/lib/components/timeline/actions/DeleteAssetsAction.svelte
View file

@ -1,6 +1,8 @@
<script lang="ts">
import DeleteAssetDialog from '$lib/components/photos-page/delete-asset-dialog.svelte';
import { getAssetControlContext } from '$lib/components/timeline/AssetSelectControlBar.svelte';
import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
import { featureFlags } from '$lib/stores/server-config.store';
import { type OnDelete, type OnUndoDelete, deleteAssets } from '$lib/utils/actions';
import { IconButton } from '@immich/ui';
@ -9,13 +11,14 @@
import MenuOption from '../../shared-components/context-menu/menu-option.svelte';
interface Props {
onAssetDelete: OnDelete;
onUndoDelete?: OnUndoDelete | undefined;
onAssetDelete?: OnDelete;
onUndoDelete?: OnUndoDelete;
menuItem?: boolean;
force?: boolean;
manager?: TimelineManager;
}
let { onAssetDelete, onUndoDelete = undefined, menuItem = false, force = !$featureFlags.trash }: Props = $props();
let { onAssetDelete, onUndoDelete, menuItem = false, force = !$featureFlags.trash, manager }: Props = $props();
const { clearSelect, getOwnedAssets } = getAssetControlContext();
@ -36,7 +39,12 @@
const handleDelete = async () => {
loading = true;
const assets = [...getOwnedAssets()];
await deleteAssets(force, onAssetDelete, assets, onUndoDelete);
const undo = (assets: TimelineAsset[]) => {
manager?.addAssets(assets);
onUndoDelete?.(assets);
};
await deleteAssets(force, onAssetDelete, assets, undo);
manager?.removeAssets(assets.map((asset) => asset.id));
clearSelect();
isShowConfirmation = false;
loading = false;

10
web/src/lib/components/timeline/actions/FavoriteAction.svelte
View file

@ -5,6 +5,7 @@
notificationController,
} from '$lib/components/shared-components/notification/notification';
import { getAssetControlContext } from '$lib/components/timeline/AssetSelectControlBar.svelte';
import type { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
import type { OnFavorite } from '$lib/utils/actions';
import { handleError } from '$lib/utils/handle-error';
import { updateAssets } from '@immich/sdk';
@ -16,9 +17,10 @@
onFavorite?: OnFavorite;
menuItem?: boolean;
removeFavorite: boolean;
manager?: TimelineManager;
}
let { onFavorite, menuItem = false, removeFavorite }: Props = $props();
let { onFavorite, menuItem = false, removeFavorite, manager }: Props = $props();
let text = $derived(removeFavorite ? $t('remove_from_favorites') : $t('to_favorite'));
let icon = $derived(removeFavorite ? mdiHeartMinusOutline : mdiHeartOutline);
@ -39,11 +41,7 @@
if (ids.length > 0) {
await updateAssets({ assetBulkUpdateDto: { ids, isFavorite } });
}
for (const asset of assets) {
asset.isFavorite = isFavorite;
}
manager?.updateAssetOperation(ids, (asset) => ((asset.isFavorite = isFavorite), void 0));
onFavorite?.(ids, isFavorite);
notificationController.show({