From 6f5648569a536a5f614f3c485294a0b2bfbf6620 Mon Sep 17 00:00:00 2001
From: martin <74269598+martabal@users.noreply.github.com>
Date: Wed, 14 Feb 2024 15:08:33 +0100
Subject: [PATCH] fix(web): always show asset owner when viewing an asset from
 a shared album (#7104)

fix: always show album owner when viewing a shared album
---
 .../lib/components/asset-viewer/asset-viewer.svelte    |  2 +-
 .../lib/components/asset-viewer/detail-panel.svelte    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelte
index b802b9579f34b..f8e5a1dbba841 100644
--- a/web/src/lib/components/asset-viewer/asset-viewer.svelte
+++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte
@@ -736,7 +736,7 @@
     >
       <DetailPanel
         {asset}
-        albumId={album?.id}
+        currentAlbum={album}
         albums={appearsInAlbums}
         on:close={() => ($isShowDetail = false)}
         on:closeViewer={handleCloseViewer}
diff --git a/web/src/lib/components/asset-viewer/detail-panel.svelte b/web/src/lib/components/asset-viewer/detail-panel.svelte
index 7aa7708b9d060..757bfe39564f8 100644
--- a/web/src/lib/components/asset-viewer/detail-panel.svelte
+++ b/web/src/lib/components/asset-viewer/detail-panel.svelte
@@ -38,7 +38,7 @@
 
   export let asset: AssetResponseDto;
   export let albums: AlbumResponseDto[] = [];
-  export let albumId: string | null = null;
+  export let currentAlbum: AlbumResponseDto | null = null;
 
   let showAssetPath = false;
   let textArea: HTMLTextAreaElement;
@@ -268,8 +268,8 @@
               on:mouseleave={() => ($boundingBoxesArray = [])}
             >
               <a
-                href="{AppRoute.PEOPLE}/{person.id}?{QueryParameter.PREVIOUS_ROUTE}={albumId
-                  ? `${AppRoute.ALBUMS}/${albumId}`
+                href="{AppRoute.PEOPLE}/{person.id}?{QueryParameter.PREVIOUS_ROUTE}={currentAlbum?.id
+                  ? `${AppRoute.ALBUMS}/${currentAlbum?.id}`
                   : AppRoute.PHOTOS}"
                 on:click={() => dispatch('closeViewer')}
               >
@@ -630,8 +630,8 @@
   </div>
 {/if}
 
-{#if asset.owner && !isOwner}
-  <section class="px-6 pt-6 dark:text-immich-dark-fg">
+{#if currentAlbum && currentAlbum.sharedUsers.length > 0 && asset.owner}
+  <section class="px-6 dark:text-immich-dark-fg">
     <p class="text-sm">SHARED BY</p>
     <div class="flex gap-4 pt-4">
       <div>