Skip to content

High performance self-hosted photo and video management solution.

chore(web): minor UX improvements of "view asset owners" feature (#24319)

idubnorid8ca2106416c
diff --git a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.spec.ts b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.spec.ts
index 2c63348f88..bb58704214 100644
--- a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.spec.ts
+++ b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.spec.ts
@@ -692,4 +692,42 @@ describe('TimelineManager', () => {
expect(discoveredAssets.size).toBe(assetCount);
});
});
+
+ describe('showAssetOwners', () => {
+ const LS_KEY = 'album-show-asset-owners';
+
+ beforeEach(() => {
+ // ensure clean state
+ globalThis.localStorage?.removeItem(LS_KEY);
+ });
+
+ it('defaults to false', () => {
+ const timelineManager = new TimelineManager();
+ expect(timelineManager.showAssetOwners).toBe(false);
+ });
+
+ it('setShowAssetOwners updates value', () => {
+ const timelineManager = new TimelineManager();
+ timelineManager.setShowAssetOwners(true);
+ expect(timelineManager.showAssetOwners).toBe(true);
+ timelineManager.setShowAssetOwners(false);
+ expect(timelineManager.showAssetOwners).toBe(false);
+ });
+
+ it('toggleShowAssetOwners flips value', () => {
+ const timelineManager = new TimelineManager();
+ expect(timelineManager.showAssetOwners).toBe(false);
+ timelineManager.toggleShowAssetOwners();
+ expect(timelineManager.showAssetOwners).toBe(true);
+ timelineManager.toggleShowAssetOwners();
+ expect(timelineManager.showAssetOwners).toBe(false);
+ });
+
+ it('persists across instances via localStorage', () => {
+ const a = new TimelineManager();
+ a.setShowAssetOwners(true);
+ const b = new TimelineManager();
+ expect(b.showAssetOwners).toBe(true);
+ });
+ });
});
diff --git a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
index 93b8364930..feba73a0f8 100644
--- a/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
+++ b/web/src/lib/managers/timeline-manager/timeline-manager.svelte.ts
@@ -14,6 +14,7 @@ import {
} from '$lib/managers/timeline-manager/internal/search-support.svelte';
import { WebsocketSupport } from '$lib/managers/timeline-manager/internal/websocket-support.svelte';
import { CancellableTask } from '$lib/utils/cancellable-task';
+import { PersistedLocalStorage } from '$lib/utils/persisted';
import {
setDifference,
toTimelineAsset,
@@ -90,6 +91,19 @@ export class TimelineManager extends VirtualScrollManager {
#options: TimelineManagerOptions = TimelineManager.#INIT_OPTIONS;
#updatingIntersections = false;
#scrollableElement: HTMLElement | undefined = $state();
+ #showAssetOwners = new PersistedLocalStorage<boolean>('album-show-asset-owners', false);
+
+ get showAssetOwners() {
+ return this.#showAssetOwners.current;
+ }
+
+ setShowAssetOwners(value: boolean) {
+ this.#showAssetOwners.current = value;
+ }
+
+ toggleShowAssetOwners() {
+ this.#showAssetOwners.current = !this.#showAssetOwners.current;
+ }
constructor() {
super();
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.svelte
index 02dc55ead2..3f4d3dd39f 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 {
+ mdiAccountEye,
mdiAccountEyeOutline,
mdiArrowLeft,
mdiCogOutline,
@@ -101,7 +102,9 @@
let isCreatingSharedAlbum = $state(false);
let isShowActivity = $state(false);
let albumOrder: AssetOrder | undefined = $state(data.album.order);
- let showAlbumUsers = $state(false);
+
+ let timelineManager = $state<TimelineManager>() as TimelineManager;
+ let showAlbumUsers = $derived(timelineManager?.showAssetOwners ?? false);
const assetInteraction = new AssetInteraction();
const timelineInteraction = new AssetInteraction();
@@ -303,7 +306,6 @@
}
});
- let timelineManager = $state<TimelineManager>() as TimelineManager;
const options = $derived.by(() => {
if (viewMode === AlbumPageViewMode.SELECT_ASSETS) {
return {
@@ -597,17 +599,6 @@
{#snippet trailing()}
<CastButton />
- {#if containsEditors}
- <IconButton
- variant="ghost"
- shape="round"
- color="secondary"
- aria-label={$t('view_asset_owners')}
- icon={mdiAccountEyeOutline}
- onclick={() => (showAlbumUsers = !showAlbumUsers)}
- />
- {/if}
-
{#if isEditor}
<IconButton
variant="ghost"
@@ -668,6 +659,13 @@
color="secondary"
offset={{ x: 175, y: 25 }}
>
+ {#if containsEditors}
+ <MenuOption
+ icon={showAlbumUsers ? mdiAccountEye : mdiAccountEyeOutline}
+ text={$t('view_asset_owners')}
+ onClick={() => timelineManager.toggleShowAssetOwners()}
+ />
+ {/if}
{#if album.assetCount > 0}
<MenuOption
icon={mdiImageOutline}