High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
feat(web): Shared album owner labels (#21171)
Chris Peckover922282b2b47c
diff --git a/web/src/lib/components/assets/thumbnail/thumbnail.svelte b/web/src/lib/components/assets/thumbnail/thumbnail.svelteindex 0645541241..38d734fc22 100644--- a/web/src/lib/components/assets/thumbnail/thumbnail.svelte+++ b/web/src/lib/components/assets/thumbnail/thumbnail.svelte@@ -4,7 +4,7 @@import { getAssetOriginalUrl, getAssetPlaybackUrl, getAssetThumbnailUrl } from '$lib/utils';import { timeToSeconds } from '$lib/utils/date-time';import { getAltText } from '$lib/utils/thumbnail-util';- import { AssetMediaSize, AssetVisibility } from '@immich/sdk';+ import { AssetMediaSize, AssetVisibility, type UserResponseDto } from '@immich/sdk';import {mdiArchiveArrowDownOutline,mdiCameraBurst,@@ -46,6 +46,7 @@imageClass?: ClassValue;brokenAssetClass?: ClassValue;dimmed?: boolean;+ albumUsers?: UserResponseDto[];onClick?: (asset: TimelineAsset) => void;onSelect?: (asset: TimelineAsset) => void;onMouseEvent?: (event: { isMouseOver: boolean; selectedGroupIndex: number }) => void;@@ -64,6 +65,7 @@readonly = false,showArchiveIcon = false,showStackedIcon = true,+ albumUsers = [],onClick = undefined,onSelect = undefined,onMouseEvent = undefined,@@ -85,6 +87,8 @@let width = $derived(thumbnailSize || thumbnailWidth || 235);let height = $derived(thumbnailSize || thumbnailHeight || 235);+ let assetOwner = $derived(albumUsers?.find((user) => user.id === asset.ownerId) ?? null);+const onIconClickedHandler = (e?: MouseEvent) => {e?.stopPropagation();e?.preventDefault();@@ -268,6 +272,14 @@</div>{/if}+ {#if !!assetOwner}+ <div class="absolute bottom-1 end-2 max-w-[50%]">+ <p class="text-xs font-medium text-white drop-shadow-lg max-w-[100%] truncate">+ {assetOwner.name}+ </p>+ </div>+ {/if}+{#if !authManager.isSharedLink && showArchiveIcon && asset.visibility === AssetVisibility.Archive}<div class={['absolute start-2', asset.isFavorite ? 'bottom-10' : 'bottom-2']}><Icon data-icon-archive icon={mdiArchiveArrowDownOutline} size="24" class="text-white" />diff --git a/web/src/lib/components/timeline/Timeline.svelte b/web/src/lib/components/timeline/Timeline.svelteindex d2873eca70..ba9cf37bff 100644--- a/web/src/lib/components/timeline/Timeline.svelte+++ b/web/src/lib/components/timeline/Timeline.svelte@@ -23,7 +23,7 @@import { mobileDevice } from '$lib/stores/mobile-device.svelte';import { isAssetViewerRoute, navigate } from '$lib/utils/navigation';import { getTimes, type ScrubberListener } from '$lib/utils/timeline-util';- import { type AlbumResponseDto, type PersonResponseDto } from '@immich/sdk';+ import { type AlbumResponseDto, type PersonResponseDto, type UserResponseDto } from '@immich/sdk';import { DateTime } from 'luxon';import { onDestroy, onMount, type Snippet } from 'svelte';import type { UpdatePayload } from 'vite';@@ -49,6 +49,7 @@showArchiveIcon?: boolean;isShared?: boolean;album?: AlbumResponseDto | null;+ albumUsers?: UserResponseDto[];person?: PersonResponseDto | null;isShowDeleteConfirmation?: boolean;onSelect?: (asset: TimelineAsset) => void;@@ -81,6 +82,7 @@showArchiveIcon = false,isShared = false,album = null,+ albumUsers = [],person = null,isShowDeleteConfirmation = $bindable(false),onSelect = () => {},@@ -702,6 +704,7 @@showStackedIcon={withStacked}{showArchiveIcon}{asset}+ {albumUsers}{groupIndex}onClick={(asset) => {if (typeof onThumbnailClick === 'function') {diff --git a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelteindex b99260eee4..74b0f1d6b3 100644--- a/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/albums/[albumId=id]/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -66,6 +66,7 @@} from '@immich/sdk';import { Button, Icon, IconButton, modalManager, toastManager } from '@immich/ui';import {+ mdiAccountEyeOutline,mdiArrowLeft,mdiCogOutline,mdiDeleteOutline,@@ -100,6 +101,7 @@let isCreatingSharedAlbum = $state(false);let isShowActivity = $state(false);let albumOrder: AssetOrder | undefined = $state(data.album.order);+ let showAlbumUsers = $state(false);const assetInteraction = new AssetInteraction();const timelineInteraction = new AssetInteraction();@@ -290,6 +292,11 @@let album = $derived(data.album);let albumId = $derived(album.id);+ const containsEditors = $derived(album?.shared && album.albumUsers.some(({ role }) => role === AlbumUserRole.Editor));+ const albumUsers = $derived(+ showAlbumUsers && containsEditors ? [album.owner, ...album.albumUsers.map(({ user }) => user)] : [],+ );+$effect(() => {if (!album.isActivityEnabled && activityManager.commentCount === 0) {isShowActivity = false;@@ -418,6 +425,7 @@<TimelineenableRouting={viewMode === AlbumPageViewMode.SELECT_ASSETS ? false : true}{album}+ {albumUsers}bind:timelineManager{options}assetInteraction={currentAssetIntersection}@@ -597,6 +605,17 @@{#snippet trailing()}<CastButton />+ {#if containsEditors}+ <IconButton+ variant="ghost"+ shape="round"+ color="secondary"+ aria-label="view asset owners"+ icon={mdiAccountEyeOutline}+ onclick={() => (showAlbumUsers = !showAlbumUsers)}+ />+ {/if}+{#if isEditor}<IconButtonvariant="ghost"