- cleanup

Author: xCJPECKOVERx

web/src/lib/components/photos-page/asset-grid.svelte

@@ -26,12 +26,7 @@
   import { searchStore } from '$lib/stores/search.svelte';
   import { featureFlags } from '$lib/stores/server-config.store';
   import { handlePromiseError } from '$lib/utils';
-  import {
-    deleteAssets,
-    refreshStackedAssetInTimeline,
-    updateStackedAssetInTimeline,
-    updateUnstackedAssetInTimeline,
-  } from '$lib/utils/actions';
+  import { deleteAssets } from '$lib/utils/actions';
   import { archiveAssets, cancelMultiselect, selectAllAssets, stackAssets } from '$lib/utils/asset-utils';
   import { navigate } from '$lib/utils/navigation';
   import {
@@ -421,7 +416,7 @@
   const onStackAssets = async () => {
     const result = await stackAssets(assetInteraction.selectedAssets);
 
-    timelineManager.stackAssets(result);//updateStackedAssetInTimeline(timelineManager, result);
+    timelineManager.stackAssets(result); //updateStackedAssetInTimeline(timelineManager, result);
 
     onEscape();
   };
@@ -525,18 +520,18 @@
       }
 
       case AssetAction.UNSTACK: {
-        timelineManager.unstackAssets(action.assets);//updateUnstackedAssetInTimeline(timelineManager, action.assets);
+        timelineManager.unstackAssets(action.assets);
         break;
       }
       case AssetAction.REMOVE_ASSET_FROM_STACK: {
         timelineManager.addAssets([toTimelineAsset(action.asset)]);
         if (action.stack) {
-          timelineManager.refreshStack(action.stack)//refreshStackedAssetInTimeline(timelineManager, action.stack);
+          timelineManager.refreshStack(action.stack);
         }
         break;
       }
       case AssetAction.SET_STACK_PRIMARY_ASSET: {
-        timelineManager.refreshStack(action.stack, true);//refreshStackedAssetInTimeline(timelineManager, action.stack, true);
+        timelineManager.refreshStack(action.stack, true);
         break;
       }
     }

web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts

@@ -546,6 +546,13 @@ export class TimelineManager {
     return this.#options.order ?? AssetOrder.Desc;
   }
 
+  /**
+   * Update the asset stack state in the asset store based on the provided stack response.
+   * This function updates the stack information so that the icon is shown for the primary asset
+   * and removes any assets from the timeline that are marked for deletion.
+   *
+   * @param {StackResponse} stackResponse - The stack response containing the stack and assets to delete.
+   */
   stackAssets({ stack, toDeleteIds }: StackResponse) {
     if (stack) {
       this.updateAssetOperation([stack.primaryAssetId], (asset) => {
@@ -560,6 +567,14 @@ export class TimelineManager {
     }
   }
 
+  /**
+   * Update the timeline manager to reflect the unstacked state of assets.
+   * This function updates the stack property of each asset to undefined, effectively unstacking them.
+   * It also adds the unstacked assets back to the timeline manager.
+   *
+   * @param timelineManager - The timeline manager to update.
+   * @param assets - The array of asset response DTOs to update in the timeline manager.
+   */
   unstackAssets(assets: TimelineAsset[]) {
     this.updateAssetOperation(
       assets.map(({ id }) => id),

web/src/lib/utils/actions.ts

@@ -1,9 +1,7 @@
 import { notificationController, NotificationType } from '$lib/components/shared-components/notification/notification';
-import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
 import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
 import type { StackResponse } from '$lib/utils/asset-utils';
-import { toTimelineAsset } from '$lib/utils/timeline-util';
-import { AssetVisibility, deleteAssets as deleteBulk, restoreAssets, type StackResponseDto } from '@immich/sdk';
+import { AssetVisibility, deleteAssets as deleteBulk, restoreAssets } from '@immich/sdk';
 import { t } from 'svelte-i18n';
 import { get } from 'svelte/store';
 import { handleError } from './handle-error';
@@ -58,69 +56,3 @@ const undoDeleteAssets = async (onUndoDelete: OnUndoDelete, assets: TimelineAsse
     handleError(error, $t('errors.unable_to_restore_assets'));
   }
 };
-
-/**
- * Update the asset stack state in the asset store based on the provided stack response.
- * This function updates the stack information so that the icon is shown for the primary asset
- * and removes any assets from the timeline that are marked for deletion.
- *
- * @param {TimelineManager} timelineManager - The timeline manager to update.
- * @param {StackResponse} stackResponse - The stack response containing the stack and assets to delete.
- */
-export function updateStackedAssetInTimeline(timelineManager: TimelineManager, { stack, toDeleteIds }: StackResponse) {
-  if (stack != undefined) {
-    timelineManager.updateAssetOperation([stack.primaryAssetId], (asset) => {
-      asset.stack = {
-        id: stack.id,
-        primaryAssetId: stack.primaryAssetId,
-        assetCount: stack.assets.length,
-      };
-      return { remove: false };
-    });
-
-    timelineManager.removeAssets(toDeleteIds);
-  }
-}
-
-/**
- * Update the timeline manager to reflect the unstacked state of assets.
- * This function updates the stack property of each asset to undefined, effectively unstacking them.
- * It also adds the unstacked assets back to the timeline manager.
- *
- * @param timelineManager - The timeline manager to update.
- * @param assets - The array of asset response DTOs to update in the timeline manager.
- */
-export function updateUnstackedAssetInTimeline(timelineManager: TimelineManager, assets: TimelineAsset[]) {
-  timelineManager.updateAssetOperation(
-    assets.map((asset) => asset.id),
-    (asset) => {
-      asset.stack = null;
-      return { remove: false };
-    },
-  );
-
-  timelineManager.addAssets(assets);
-}
-
-export function refreshStackedAssetInTimeline(
-  timelineManager: TimelineManager,
-  stack: StackResponseDto,
-  addPrimaryAsset: boolean = false,
-) {
-  if (stack != undefined) {
-    if (addPrimaryAsset) {
-      timelineManager.addAssets(
-        stack.assets.filter((a) => a.id === stack.primaryAssetId).map((a) => toTimelineAsset(a)),
-      );
-    }
-    timelineManager.updateAssetOperation([stack.primaryAssetId], (asset) => {
-      asset.stack = {
-        id: stack.id,
-        primaryAssetId: stack.primaryAssetId,
-        assetCount: stack.assets.length,
-      };
-      return { remove: false };
-    });
-    timelineManager.removeAssets(stack.assets.filter((a) => a.id !== stack.primaryAssetId).map(({ id }) => id));
-  }
-}