diff --git a/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte b/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte index b1f3ff01bb..ebb671d491 100644 --- a/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte +++ b/web/src/lib/components/timeline/actions/TimelineKeyboardActions.svelte @@ -45,10 +45,7 @@ await deleteAssets( force, - (assetIds) => { - timelineManager.removeAssets(assetIds); - eventManager.emit('AssetsDelete', assetIds); - }, + (assetIds) => timelineManager.removeAssets(assetIds), selectedAssets, force ? undefined : (assets) => timelineManager.upsertAssets(assets), ); diff --git a/web/src/lib/stores/websocket.ts b/web/src/lib/stores/websocket.ts index 630d9771f9..e5cc25bcf9 100644 --- a/web/src/lib/stores/websocket.ts +++ b/web/src/lib/stores/websocket.ts @@ -80,6 +80,8 @@ websocket .on('on_new_release', (event) => eventManager.emit('ReleaseEvent', event)) .on('on_session_delete', () => eventManager.emit('SessionDelete')) .on('on_user_delete', (id) => eventManager.emit('UserAdminDeleted', { id })) + .on('on_asset_delete', (asset) => eventManager.emit('AssetsDelete', [asset])) + .on('on_asset_trash', (assets) => eventManager.emit('AssetsDelete', assets)) .on('on_asset_update', (asset) => eventManager.emit('AssetUpdate', asset)) .on('on_person_thumbnail', (id) => eventManager.emit('PersonThumbnailReady', { id })) .on('on_notification', () => notificationManager.refresh()) diff --git a/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte index 55bd648730..aed7570e9c 100644 --- a/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte +++ b/web/src/routes/(user)/utilities/large-files/[[photos=photos]]/[[assetId=id]]/+page.svelte @@ -1,11 +1,12 @@ + +
- {#if assets && data.assets.length > 0} + {#if assets && assets.length > 0} {#each assets as asset (asset.id)} {/each} @@ -75,7 +84,7 @@ cursor={assetCursor} showNavigation={assets.length > 1} {onRandom} - {onAction} + {preAction} onClose={() => { assetViewerManager.showAssetViewer(false); handlePromiseError(navigate({ targetRoute: 'current', assetId: null }));