refactor(web): simplify some stores (#11695)

* refactor(web): simplify some stores

* make writable

web/src/lib/stores/asset-interaction.store.ts

@@ -1,132 +1,70 @@
 import type { AssetResponseDto } from '@immich/sdk';
-import { derived, writable } from 'svelte/store';
+import { derived, readonly, writable } from 'svelte/store';
 
-export interface AssetInteractionStore {
+export type AssetInteractionStore = ReturnType<typeof createAssetInteractionStore>;
-  selectAsset: (asset: AssetResponseDto) => void;
-  selectAssets: (assets: AssetResponseDto[]) => void;
-  removeAssetFromMultiselectGroup: (asset: AssetResponseDto) => void;
-  addGroupToMultiselectGroup: (group: string) => void;
-  removeGroupFromMultiselectGroup: (group: string) => void;
-  setAssetSelectionCandidates: (assets: AssetResponseDto[]) => void;
-  clearAssetSelectionCandidates: () => void;
-  setAssetSelectionStart: (asset: AssetResponseDto | null) => void;
-  clearMultiselect: () => void;
-  isMultiSelectState: {
-    subscribe: (run: (value: boolean) => void, invalidate?: (value?: boolean) => void) => () => void;
-  };
-  selectedAssets: {
-    subscribe: (
-      run: (value: Set<AssetResponseDto>) => void,
-      invalidate?: (value?: Set<AssetResponseDto>) => void,
-    ) => () => void;
-  };
-  selectedGroup: {
-    subscribe: (run: (value: Set<string>) => void, invalidate?: (value?: Set<string>) => void) => () => void;
-  };
-  assetSelectionCandidates: {
-    subscribe: (
-      run: (value: Set<AssetResponseDto>) => void,
-      invalidate?: (value?: Set<AssetResponseDto>) => void,
-    ) => () => void;
-  };
-  assetSelectionStart: {
-    subscribe: (
-      run: (value: AssetResponseDto | null) => void,
-      invalidate?: (value?: AssetResponseDto | null) => void,
-    ) => () => void;
-  };
-}
 
-export function createAssetInteractionStore(): AssetInteractionStore {
+export function createAssetInteractionStore() {
-  let _selectedAssets: Set<AssetResponseDto>;
+  const selectedAssets = writable(new Set<AssetResponseDto>());
-  let _selectedGroup: Set<string>;
+  const selectedGroup = writable(new Set<string>());
-  let _assetSelectionCandidates: Set<AssetResponseDto>;
-  let _assetSelectionStart: AssetResponseDto | null;
-
-  // Selected assets
-  const selectedAssets = writable<Set<AssetResponseDto>>(new Set());
-  // Selected date groups
-  const selectedGroup = writable<Set<string>>(new Set());
-  // If any asset selected
   const isMultiSelectStoreState = derived(selectedAssets, ($selectedAssets) => $selectedAssets.size > 0);
 
   // Candidates for the range selection. This set includes only loaded assets, so it improves highlight
   // performance. From the user's perspective, range is highlighted almost immediately
-  const assetSelectionCandidates = writable<Set<AssetResponseDto>>(new Set());
+  const assetSelectionCandidates = writable(new Set<AssetResponseDto>());
   // The beginning of the selection range
   const assetSelectionStart = writable<AssetResponseDto | null>(null);
 
-  selectedAssets.subscribe((assets) => {
-    _selectedAssets = assets;
-  });
-
-  selectedGroup.subscribe((group) => {
-    _selectedGroup = group;
-  });
-
-  assetSelectionCandidates.subscribe((assets) => {
-    _assetSelectionCandidates = assets;
-  });
-
-  assetSelectionStart.subscribe((asset) => {
-    _assetSelectionStart = asset;
-  });
-
   const selectAsset = (asset: AssetResponseDto) => {
-    _selectedAssets.add(asset);
+    selectedAssets.update(($selectedAssets) => $selectedAssets.add(asset));
-    selectedAssets.set(_selectedAssets);
   };
 
   const selectAssets = (assets: AssetResponseDto[]) => {
+    selectedAssets.update(($selectedAssets) => {
       for (const asset of assets) {
-      _selectedAssets.add(asset);
+        $selectedAssets.add(asset);
       }
-    selectedAssets.set(_selectedAssets);
+      return $selectedAssets;
+    });
   };
 
   const removeAssetFromMultiselectGroup = (asset: AssetResponseDto) => {
-    _selectedAssets.delete(asset);
+    selectedAssets.update(($selectedAssets) => {
-    selectedAssets.set(_selectedAssets);
+      $selectedAssets.delete(asset);
+      return $selectedAssets;
+    });
   };
 
   const addGroupToMultiselectGroup = (group: string) => {
-    _selectedGroup.add(group);
+    selectedGroup.update(($selectedGroup) => $selectedGroup.add(group));
-    selectedGroup.set(_selectedGroup);
   };
 
   const removeGroupFromMultiselectGroup = (group: string) => {
-    _selectedGroup.delete(group);
+    selectedGroup.update(($selectedGroup) => {
-    selectedGroup.set(_selectedGroup);
+      $selectedGroup.delete(group);
+      return $selectedGroup;
+    });
   };
 
   const setAssetSelectionStart = (asset: AssetResponseDto | null) => {
-    _assetSelectionStart = asset;
+    assetSelectionStart.set(asset);
-    assetSelectionStart.set(_assetSelectionStart);
   };
 
   const setAssetSelectionCandidates = (assets: AssetResponseDto[]) => {
-    _assetSelectionCandidates = new Set(assets);
+    assetSelectionCandidates.set(new Set(assets));
-    assetSelectionCandidates.set(_assetSelectionCandidates);
   };
 
   const clearAssetSelectionCandidates = () => {
-    _assetSelectionCandidates.clear();
+    assetSelectionCandidates.set(new Set());
-    assetSelectionCandidates.set(_assetSelectionCandidates);
   };
 
   const clearMultiselect = () => {
     // Multi-selection
-    _selectedAssets.clear();
+    selectedAssets.set(new Set());
-    _selectedGroup.clear();
+    selectedGroup.set(new Set());
 
     // Range selection
-    _assetSelectionCandidates.clear();
+    assetSelectionCandidates.set(new Set());
-    _assetSelectionStart = null;
+    assetSelectionStart.set(null);
-
-    selectedAssets.set(_selectedAssets);
-    selectedGroup.set(_selectedGroup);
-    assetSelectionCandidates.set(_assetSelectionCandidates);
-    assetSelectionStart.set(_assetSelectionStart);
   };
 
   return {
@@ -139,20 +77,10 @@ export function createAssetInteractionStore(): AssetInteractionStore {
     clearAssetSelectionCandidates,
     setAssetSelectionStart,
     clearMultiselect,
-    isMultiSelectState: {
+    isMultiSelectState: readonly(isMultiSelectStoreState),
-      subscribe: isMultiSelectStoreState.subscribe,
+    selectedAssets: readonly(selectedAssets),
-    },
+    selectedGroup: readonly(selectedGroup),
-    selectedAssets: {
+    assetSelectionCandidates: readonly(assetSelectionCandidates),
-      subscribe: selectedAssets.subscribe,
+    assetSelectionStart: readonly(assetSelectionStart),
-    },
-    selectedGroup: {
-      subscribe: selectedGroup.subscribe,
-    },
-    assetSelectionCandidates: {
-      subscribe: assetSelectionCandidates.subscribe,
-    },
-    assetSelectionStart: {
-      subscribe: assetSelectionStart.subscribe,
-    },
   };
 }

web/src/lib/stores/asset-viewing.store.ts

@@ -1,6 +1,6 @@
 import { getKey } from '$lib/utils';
 import { getAssetInfo, type AssetResponseDto } from '@immich/sdk';
-import { writable } from 'svelte/store';
+import { readonly, writable } from 'svelte/store';
 
 function createAssetViewingStore() {
   const viewingAssetStoreState = writable<AssetResponseDto>();
@@ -23,16 +23,9 @@ function createAssetViewingStore() {
   };
 
   return {
-    asset: {
+    asset: readonly(viewingAssetStoreState),
-      subscribe: viewingAssetStoreState.subscribe,
+    preloadAssets: readonly(preloadAssets),
-    },
+    isViewing: viewState,
-    preloadAssets: {
-      subscribe: preloadAssets.subscribe,
-    },
-    isViewing: {
-      subscribe: viewState.subscribe,
-      set: viewState.set,
-    },
     setAsset,
     setAssetId,
     showAssetViewer,

web/src/lib/stores/download.ts

@@ -10,11 +10,7 @@ export interface DownloadProgress {
 export const downloadAssets = writable<Record<string, DownloadProgress>>({});
 
 export const isDownloading = derived(downloadAssets, ($downloadAssets) => {
-  if (Object.keys($downloadAssets).length === 0) {
+  return Object.keys($downloadAssets).length > 0;
-    return false;
-  }
-
-  return true;
 });
 
 const update = (key: string, value: Partial<DownloadProgress> | null) => {

web/src/lib/stores/purchase.store.ts

@@ -1,4 +1,4 @@
-import { writable } from 'svelte/store';
+import { readonly, writable } from 'svelte/store';
 
 function createPurchaseStore() {
   const isPurcharsed = writable(false);
@@ -8,9 +8,7 @@ function createPurchaseStore() {
   }
 
   return {
-    isPurchased: {
+    isPurchased: readonly(isPurcharsed),
-      subscribe: isPurcharsed.subscribe,
-    },
     setPurchaseStatus,
   };
 }

web/src/lib/stores/upload.ts

@@ -1,4 +1,4 @@
-import { derived, get, writable } from 'svelte/store';
+import { derived, writable } from 'svelte/store';
 import { UploadState, type UploadAsset } from '../models/upload-asset';
 
 function createUploadStore() {
@@ -22,23 +22,22 @@ function createUploadStore() {
   );
 
   const addNewUploadAsset = (newAsset: UploadAsset) => {
-    const assets = get(uploadAssets);
+    uploadAssets.update(($assets) => {
-    const duplicate = assets.find((asset) => asset.id === newAsset.id);
+      const duplicate = $assets.find((asset) => asset.id === newAsset.id);
       if (duplicate) {
-      uploadAssets.update((assets) => assets.map((asset) => (asset.id === newAsset.id ? newAsset : asset)));
+        return $assets.map((asset) => (asset.id === newAsset.id ? newAsset : asset));
-    } else {
+      }
+
       totalUploadCounter.update((c) => c + 1);
-      uploadAssets.update((assets) => [
+      $assets.push({
-        ...assets,
-        {
         ...newAsset,
         speed: 0,
         state: UploadState.PENDING,
         progress: 0,
         eta: 0,
-        },
+      });
-      ]);
+      return $assets;
-    }
+    });
   };
 
   const updateProgress = (id: string, loaded: number, total: number) => {