fix: hide on archived and trashed assets

immich-app · Aug 29, 2024 · 4539ade · 4539ade
1 parent 15131c2
commit 4539ade
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
@@ -115,7 +115,7 @@ services:
     volumes:
       - ${UPLOAD_LOCATION}/postgres:/var/lib/postgresql/data
     ports:
-      - 5432:5432
+      - 5433:5432
     healthcheck:
       test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
       interval: 5m

diff --git a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
@@ -159,11 +159,13 @@
             onClick={() => openFileUploadDialog({ multiple: false, assetId: asset.id })}
             text={$t('replace_with_upload')}
           />
-          <MenuOption
-            icon={mdiImageSearch}
-            onClick={() => goto(`${AppRoute.PHOTOS}?at=${asset.id}`)}
-            text={$t('view_in_timeline')}
-          />
+          {#if !asset.isArchived && !asset.isTrashed}
+            <MenuOption
+              icon={mdiImageSearch}
+              onClick={() => goto(`${AppRoute.PHOTOS}?at=${asset.id}`)}
+              text={$t('view_in_timeline')}
+            />
+          {/if}
           <hr />
           <MenuOption
             icon={mdiDatabaseRefreshOutline}

diff --git a/web/src/lib/components/memory-page/memory-viewer.svelte b/web/src/lib/components/memory-page/memory-viewer.svelte
@@ -29,7 +29,6 @@
     mdiChevronUp,
     mdiDotsVertical,
     mdiImageSearch,
-    mdiOpenInNew,
     mdiPause,
     mdiPlay,
     mdiPlus,
@@ -310,7 +309,7 @@
               class:opacity-100={!galleryInView}
             >
               <CircleIconButton
-                href={`${AppRoute.PHOTOS}?at=${currentAsset.id}`}
+                href="${AppRoute.PHOTOS}?at=${currentAsset.id}"
                 icon={mdiImageSearch}
                 title={$t('view_in_timeline')}
                 color="light"

diff --git a/web/src/lib/stores/assets.store.ts b/web/src/lib/stores/assets.store.ts
@@ -375,6 +375,7 @@ export class AssetStore {
     this.buckets = timebuckets.map(
       (bucket) => new AssetBucket({ store: this, bucketDate: bucket.timeBucket, bucketCount: bucket.count }),
     );
+    // this.extensiveStuff();
     this.initializedSignal();
     this.initialized = true;
   }
@@ -850,22 +851,25 @@ export class AssetStore {
 
   private emit(recalculate: boolean) {
     if (recalculate) {
-      this.assets = this.buckets.flatMap(({ assets }) => assets);
+      this.extensiveStuff();
+    }
+    this.store$.set(this);
+  }
 
-      const assetToBucket: Record<string, AssetLookup> = {};
-      for (let index = 0; index < this.buckets.length; index++) {
-        const bucket = this.buckets[index];
-        if (bucket.assets.length > 0) {
-          bucket.bucketCount = bucket.assets.length;
-        }
-        for (let index_ = 0; index_ < bucket.assets.length; index_++) {
-          const asset = bucket.assets[index_];
-          assetToBucket[asset.id] = { bucket, bucketIndex: index, assetIndex: index_ };
-        }
+  private extensiveStuff() {
+    this.assets = this.buckets.flatMap(({ assets }) => assets);
+    const assetToBucket: Record<string, AssetLookup> = {};
+    for (let index = 0; index < this.buckets.length; index++) {
+      const bucket = this.buckets[index];
+      if (bucket.assets.length > 0) {
+        bucket.bucketCount = bucket.assets.length;
+      }
+      for (let index_ = 0; index_ < bucket.assets.length; index_++) {
+        const asset = bucket.assets[index_];
+        assetToBucket[asset.id] = { bucket, bucketIndex: index, assetIndex: index_ };
       }
-      this.assetToBucket = assetToBucket;
     }
-    this.store$.set(this);
+    this.assetToBucket = assetToBucket;
   }
 }