From bdf19ce3316cca170ab6d85855b140202ffb62a4 Mon Sep 17 00:00:00 2001
From: Alex <alex.tran1502@gmail.com>
Date: Tue, 20 May 2025 10:53:34 -0500
Subject: [PATCH] fix: TimelineAsset visibility (#18395)

* fix: TimelineAsset visibility

* fix enum values
---
 mobile/lib/entities/asset.entity.dart         |  10 +++++-----
 mobile/lib/utils/openapi_patching.dart        |   1 -
 .../openapi/lib/model/asset_response_dto.dart | Bin 16546 -> 13454 bytes
 open-api/immich-openapi-specs.json            |  12 +++++-------
 open-api/typescript-sdk/src/fetch-client.ts   |   8 +-------
 server/src/dtos/asset-response.dto.ts         |   1 +
 .../actions/set-visibility-action.svelte      |   4 ++--
 .../asset-viewer/asset-viewer-nav-bar.svelte  |   4 ++--
 .../actions/set-visibility-action.svelte      |   6 +++---
 web/src/lib/utils/timeline-util.ts            |   5 +++--
 web/src/routes/auth/pin-prompt/+page.svelte   |   2 +-
 web/src/test-data/factories/asset-factory.ts  |  10 ++--------
 12 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/mobile/lib/entities/asset.entity.dart b/mobile/lib/entities/asset.entity.dart
index 9119d96a6..d8d2bd23c 100644
--- a/mobile/lib/entities/asset.entity.dart
+++ b/mobile/lib/entities/asset.entity.dart
@@ -554,15 +554,15 @@ class Asset {
 }""";
   }
 
-  static getVisibility(AssetResponseDtoVisibilityEnum visibility) {
+  static getVisibility(AssetVisibility visibility) {
     switch (visibility) {
-      case AssetResponseDtoVisibilityEnum.timeline:
+      case AssetVisibility.timeline:
         return AssetVisibilityEnum.timeline;
-      case AssetResponseDtoVisibilityEnum.archive:
+      case AssetVisibility.archive:
         return AssetVisibilityEnum.archive;
-      case AssetResponseDtoVisibilityEnum.hidden:
+      case AssetVisibility.hidden:
         return AssetVisibilityEnum.hidden;
-      case AssetResponseDtoVisibilityEnum.locked:
+      case AssetVisibility.locked:
         return AssetVisibilityEnum.locked;
     }
   }
diff --git a/mobile/lib/utils/openapi_patching.dart b/mobile/lib/utils/openapi_patching.dart
index 1ffe05c78..7c7d9bab8 100644
--- a/mobile/lib/utils/openapi_patching.dart
+++ b/mobile/lib/utils/openapi_patching.dart
@@ -29,7 +29,6 @@ dynamic upgradeDto(dynamic value, String targetType) {
     case 'UserResponseDto':
       if (value is Map) {
         addDefault(value, 'profileChangedAt', DateTime.now().toIso8601String());
-        addDefault(value, 'visibility', AssetVisibility.timeline);
       }
       break;
     case 'AssetResponseDto':
diff --git a/mobile/openapi/lib/model/asset_response_dto.dart b/mobile/openapi/lib/model/asset_response_dto.dart
index 74af8bd1eb3b1579f927027e04c93c94b8a99e28..3d85b779ccf05ef4927976fdbf559f9408dac633 100644
GIT binary patch
delta 44
qcmZ3~$k>;;;XE%_SY~l%Qf5wON#$fNVVTV=d<ybNVw-Js^VtDyA`fo>

delta 2670
zcmb7G&59dG5XPr~U_%^mOiUnUVj?YQXT8_m?5-EQkWE4e@!E$7#q`dUR?W7$MR$*c
zFlO-G<TAM@<Ou?Phg|atd5N5INmcjgXC!5%=pZ!H)%Ek$S6}HT`P-X2zyG=O@%QM4
zMmv1!%?s(|l~mGC&UHR0|M~EfcYp7|r}x&Hluz3C-aX#?@x2o6+%M`^;Z*}*e}5k?
zwDUrHDLjGzjblLa3}fm0;QI(eYeq7|3_2sBa_lB_FQsfeoH>VnZD7tVdD-%P>5_13
z_o#7R#k(Y*xz5n4iPYB+j=}UOmUJ=n00&oSIZjV%q2QUfGt2Vr{m+YV=cqvj)sZ(}
zIip*<aC{OShC`~$%d|>X*t9Q42*;b#w#~}8NofPr+;};_LP@=)BQ|I2HJ<u1%TRBZ
zPqdvnDHh67CcUBFY*kgXWiM4LzLC^Lf?g;EL*s~93L}0Fq>dfwFdMp^#a<VyL=3E`
z0Tp`WD6uaVudd!a=}<BN72@siFhwms#p2`dP{QMkAG(V@zCA|y%cBQh6E$wPx||I0
z(hBW*#tzW7c9RTKlVNMhU<w*bEbktCbhkcEC!osY;7R$%-h=n+C*@yzqvcmGlAnv$
zjRue3EFv}4Xh@ZCj*u4~QlWv+=M=g?zhxNI6uD!yeyoDp1#ha^Xoo05)BMJAx{yt@
z7#z@KWWo!$66p<_Z*rNe5s@Xxf~NFD>W!WJU$A*}U(QNAJw0A4GR3k2E@eQX6Y0H;
zLjBj>N>n2Btr}^H6$uU?2H{~equR{|>}ep7BVFwT&<XQErf!FgLzlz`pjZZpC-EDK
z3+g?Ms~LZrE7b*(OmA}%Zt5?K_4+WxByBugAw&vf;PNy@=X&I1!o$Q&r285)y<x8w
zeQq^o34CeBI6~V7Nui5+?4D3=L-5M^h7@9OCj4_P2SbGe)E={QYmJRn_N^J~q^P06
zt7Hic%5(yKf@1<>u7_NneRlyVy}Cwf1mU!><U%vJTtQl#fw5Hgz>F{m3}eFfxkF19
z7HRqmN$}*3*AaO(io6Yn^Igd=cwV__HQuby=Co=>Ysw2IL>pdR8KYQ_V}nUPxxKG<
z!(;)-q6e)owGWR&tELB}Oti4memtGOrByAcL-UPxSao(odP$|ny#L}S`YD=IZEkMs
zX?kJVRkK=Z+xiLSg<f$}ZMALPMDw|q40|G1{%}?(p-dn@ob_N4OgJMjJW~<Q>~+p0
z4HRuPpX(b<1dV@SBCSYM<G3BdBkoyT-{r5#XXOujI|bA084*dLC*9wmzDrU?BT+2_
XW?Hp(ZztT6htm({YJ1e6UDWs&Z?&gO

diff --git a/open-api/immich-openapi-specs.json b/open-api/immich-openapi-specs.json
index 8d21c3ef9..2a8555f82 100644
--- a/open-api/immich-openapi-specs.json
+++ b/open-api/immich-openapi-specs.json
@@ -9289,13 +9289,11 @@
             "type": "string"
           },
           "visibility": {
-            "enum": [
-              "archive",
-              "timeline",
-              "hidden",
-              "locked"
-            ],
-            "type": "string"
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/AssetVisibility"
+              }
+            ]
           }
         },
         "required": [
diff --git a/open-api/typescript-sdk/src/fetch-client.ts b/open-api/typescript-sdk/src/fetch-client.ts
index 5358cdfec..c27c9bc19 100644
--- a/open-api/typescript-sdk/src/fetch-client.ts
+++ b/open-api/typescript-sdk/src/fetch-client.ts
@@ -329,7 +329,7 @@ export type AssetResponseDto = {
     "type": AssetTypeEnum;
     unassignedFaces?: AssetFaceWithoutPersonResponseDto[];
     updatedAt: string;
-    visibility: Visibility;
+    visibility: AssetVisibility;
 };
 export type AlbumResponseDto = {
     albumName: string;
@@ -3675,12 +3675,6 @@ export enum AssetTypeEnum {
     Audio = "AUDIO",
     Other = "OTHER"
 }
-export enum Visibility {
-    Archive = "archive",
-    Timeline = "timeline",
-    Hidden = "hidden",
-    Locked = "locked"
-}
 export enum AssetOrder {
     Asc = "asc",
     Desc = "desc"
diff --git a/server/src/dtos/asset-response.dto.ts b/server/src/dtos/asset-response.dto.ts
index 4c1f2571e..9bbfb450b 100644
--- a/server/src/dtos/asset-response.dto.ts
+++ b/server/src/dtos/asset-response.dto.ts
@@ -44,6 +44,7 @@ export class AssetResponseDto extends SanitizedAssetResponseDto {
   isArchived!: boolean;
   isTrashed!: boolean;
   isOffline!: boolean;
+  @ApiProperty({ enum: AssetVisibility, enumName: 'AssetVisibility' })
   visibility!: AssetVisibility;
   exifInfo?: ExifResponseDto;
   tags?: TagResponseDto[];
diff --git a/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte b/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte
index 91db84b17..dff470f45 100644
--- a/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte
+++ b/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte
@@ -6,7 +6,7 @@
   import type { TimelineAsset } from '$lib/stores/assets-store.svelte';
   import { handleError } from '$lib/utils/handle-error';
   import { AssetVisibility, updateAssets } from '@immich/sdk';
-  import { mdiEyeOffOutline, mdiFolderMoveOutline } from '@mdi/js';
+  import { mdiLockOpenVariantOutline, mdiLockOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
   import type { OnAction, PreAction } from './action';
 
@@ -57,5 +57,5 @@
 <MenuOption
   onClick={() => toggleLockedVisibility()}
   text={isLocked ? $t('move_off_locked_folder') : $t('add_to_locked_folder')}
-  icon={isLocked ? mdiFolderMoveOutline : mdiEyeOffOutline}
+  icon={isLocked ? mdiLockOpenVariantOutline : mdiLockOutline}
 />
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
index 70600e620..19705f05b 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer-nav-bar.svelte
@@ -29,7 +29,7 @@
   import {
     AssetJobName,
     AssetTypeEnum,
-    Visibility,
+    AssetVisibility,
     type AlbumResponseDto,
     type AssetResponseDto,
     type PersonResponseDto,
@@ -94,7 +94,7 @@
   const sharedLink = getSharedLink();
   let isOwner = $derived($user && asset.ownerId === $user?.id);
   let showDownloadButton = $derived(sharedLink ? sharedLink.allowDownload : !asset.isOffline);
-  let isLocked = $derived(asset.visibility === Visibility.Locked);
+  let isLocked = $derived(asset.visibility === AssetVisibility.Locked);
 
   // $: showEditorButton =
   //   isOwner &&
diff --git a/web/src/lib/components/photos-page/actions/set-visibility-action.svelte b/web/src/lib/components/photos-page/actions/set-visibility-action.svelte
index c11ba114c..407a92fad 100644
--- a/web/src/lib/components/photos-page/actions/set-visibility-action.svelte
+++ b/web/src/lib/components/photos-page/actions/set-visibility-action.svelte
@@ -7,7 +7,7 @@
   import { handleError } from '$lib/utils/handle-error';
   import { AssetVisibility, updateAssets } from '@immich/sdk';
   import { Button } from '@immich/ui';
-  import { mdiEyeOffOutline, mdiFolderMoveOutline } from '@mdi/js';
+  import { mdiLockOpenVariantOutline, mdiLockOutline } from '@mdi/js';
   import { t } from 'svelte-i18n';
 
   interface Props {
@@ -56,11 +56,11 @@
   <MenuOption
     onClick={setLockedVisibility}
     text={unlock ? $t('move_off_locked_folder') : $t('add_to_locked_folder')}
-    icon={unlock ? mdiFolderMoveOutline : mdiEyeOffOutline}
+    icon={unlock ? mdiLockOpenVariantOutline : mdiLockOutline}
   />
 {:else}
   <Button
-    leadingIcon={unlock ? mdiFolderMoveOutline : mdiEyeOffOutline}
+    leadingIcon={unlock ? mdiLockOpenVariantOutline : mdiLockOutline}
     disabled={loading}
     size="medium"
     color="secondary"
diff --git a/web/src/lib/utils/timeline-util.ts b/web/src/lib/utils/timeline-util.ts
index 66436940d..fca68a6ae 100644
--- a/web/src/lib/utils/timeline-util.ts
+++ b/web/src/lib/utils/timeline-util.ts
@@ -2,7 +2,7 @@ import type { TimelineAsset } from '$lib/stores/assets-store.svelte';
 import { locale } from '$lib/stores/preferences.store';
 import { getAssetRatio } from '$lib/utils/asset-utils';
 
-import { AssetTypeEnum, AssetVisibility, type AssetResponseDto } from '@immich/sdk';
+import { AssetTypeEnum, type AssetResponseDto } from '@immich/sdk';
 
 import { memoize } from 'lodash-es';
 import { DateTime, type LocaleOptions } from 'luxon';
@@ -72,6 +72,7 @@ export const toTimelineAsset = (unknownAsset: AssetResponseDto | TimelineAsset):
   const city = assetResponse.exifInfo?.city;
   const country = assetResponse.exifInfo?.country;
   const people = assetResponse.people?.map((person) => person.name) || [];
+
   return {
     id: assetResponse.id,
     ownerId: assetResponse.ownerId,
@@ -79,7 +80,7 @@ export const toTimelineAsset = (unknownAsset: AssetResponseDto | TimelineAsset):
     thumbhash: assetResponse.thumbhash,
     localDateTime: assetResponse.localDateTime,
     isFavorite: assetResponse.isFavorite,
-    visibility: assetResponse.isArchived ? AssetVisibility.Archive : AssetVisibility.Timeline,
+    visibility: assetResponse.visibility,
     isTrashed: assetResponse.isTrashed,
     isVideo: assetResponse.type == AssetTypeEnum.Video,
     isImage: assetResponse.type == AssetTypeEnum.Image,
diff --git a/web/src/routes/auth/pin-prompt/+page.svelte b/web/src/routes/auth/pin-prompt/+page.svelte
index 6c541aaef..f3edc87e3 100644
--- a/web/src/routes/auth/pin-prompt/+page.svelte
+++ b/web/src/routes/auth/pin-prompt/+page.svelte
@@ -65,7 +65,7 @@
           onFilled={handleUnlockSession}
         />
 
-        <Button type="button" color="secondary" onclick={() => goto(AppRoute.PHOTOS)}>Back</Button>
+        <Button type="button" color="secondary" onclick={() => goto(AppRoute.PHOTOS)}>{$t('cancel')}</Button>
       </div>
     </div>
   {:else}
diff --git a/web/src/test-data/factories/asset-factory.ts b/web/src/test-data/factories/asset-factory.ts
index e36bec6c4..f68c3a1a1 100644
--- a/web/src/test-data/factories/asset-factory.ts
+++ b/web/src/test-data/factories/asset-factory.ts
@@ -1,12 +1,6 @@
 import type { TimelineAsset } from '$lib/stores/assets-store.svelte';
 import { faker } from '@faker-js/faker';
-import {
-  AssetTypeEnum,
-  AssetVisibility,
-  Visibility,
-  type AssetResponseDto,
-  type TimeBucketAssetResponseDto,
-} from '@immich/sdk';
+import { AssetTypeEnum, AssetVisibility, type AssetResponseDto, type TimeBucketAssetResponseDto } from '@immich/sdk';
 import { Sync } from 'factory.ts';
 
 export const assetFactory = Sync.makeFactory<AssetResponseDto>({
@@ -31,7 +25,7 @@ export const assetFactory = Sync.makeFactory<AssetResponseDto>({
   checksum: Sync.each(() => faker.string.alphanumeric(28)),
   isOffline: Sync.each(() => faker.datatype.boolean()),
   hasMetadata: Sync.each(() => faker.datatype.boolean()),
-  visibility: Visibility.Timeline,
+  visibility: AssetVisibility.Timeline,
 });
 
 export const timelineAssetFactory = Sync.makeFactory<TimelineAsset>({