High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(web): shared album avatars opening modal (#26719)
Mees Frensel24189702da78
diff --git a/web/src/lib/modals/AlbumOptionsModal.svelte b/web/src/lib/modals/AlbumOptionsModal.svelteindex cc832453fc..93c95bbeaf 100644--- a/web/src/lib/modals/AlbumOptionsModal.svelte+++ b/web/src/lib/modals/AlbumOptionsModal.svelte@@ -24,10 +24,11 @@type Props = {album: AlbumResponseDto;+ readOnly?: boolean;onClose: () => void;};- let { album, onClose }: Props = $props();+ let { album, readOnly = false, onClose }: Props = $props();const handleRoleSelect = async (user: UserResponseDto, role: AlbumUserRole | 'none') => {if (role === 'none') {@@ -72,14 +73,14 @@onAlbumUpdate={(newAlbum) => (album = newAlbum)}/>-<Modal title={$t('options')} {onClose} size="small">+<Modal title={readOnly ? $t('album') : $t('options')} {onClose} size="small"><ModalBody><Stack gap={6}><div><Text size="medium" fontWeight="semi-bold">{$t('settings')}</Text><div class="mt-2 grid gap-y-3 ps-2">{#if album.order}- <Field label={$t('display_order')}>+ <Field label={$t('display_order')} disabled={readOnly}><Selectvalue={album.order}options={[@@ -90,7 +91,7 @@/></Field>{/if}- <Field label={$t('comments_and_likes')} description={$t('let_others_respond')}>+ <Field label={$t('comments_and_likes')} description={$t('let_others_respond')} disabled={readOnly}><Switchchecked={album.isActivityEnabled}onCheckedChange={(checked) => handleUpdateAlbum(album, { isActivityEnabled: checked })}@@ -102,7 +103,9 @@<div><HStack fullWidth class="mb-2 justify-between"><Text size="medium" fontWeight="semi-bold">{$t('people')}</Text>- <HeaderActionButton action={AddUsers} />+ {#if !readOnly}+ <HeaderActionButton action={AddUsers} />+ {/if}</HStack><div class="ps-2">{#each album.albumUsers as { user, role } (user.id)}@@ -113,7 +116,7 @@</div><Text size="small">{user.name}</Text></div>- <Field class="w-32" disabled={role === AlbumUserRole.Owner}>+ <Field class="w-32" disabled={readOnly || role === AlbumUserRole.Owner}><Selectvalue={role}options={[@@ -129,20 +132,22 @@{/each}</div></div>- <div class="mb-4">- <HStack class="mb-2 justify-between">- <Text size="medium" fontWeight="semi-bold">{$t('shared_links')}</Text>- <HeaderActionButton action={CreateSharedLink} />- </HStack>+ {#if !readOnly}+ <div class="mb-4">+ <HStack class="mb-2 justify-between">+ <Text size="medium" fontWeight="semi-bold">{$t('shared_links')}</Text>+ <HeaderActionButton action={CreateSharedLink} />+ </HStack>- <div class="ps-2">- <Stack gap={4}>- {#each sharedLinks as sharedLink (sharedLink.id)}- <AlbumSharedLink {album} {sharedLink} />- {/each}- </Stack>+ <div class="ps-2">+ <Stack gap={4}>+ {#each sharedLinks as sharedLink (sharedLink.id)}+ <AlbumSharedLink {album} {sharedLink} />+ {/each}+ </Stack>+ </div></div>- </div>+ {/if}</Stack></ModalBody></Modal>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 4112cd4f27..6258df34aa 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@@ -37,7 +37,6 @@import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';import type { TimelineAsset } from '$lib/managers/timeline-manager/types';import AlbumOptionsModal from '$lib/modals/AlbumOptionsModal.svelte';- import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';import { Route } from '$lib/route';import {getAlbumActions,@@ -66,6 +65,7 @@mdiArrowLeft,mdiCogOutline,mdiDeleteOutline,+ mdiDotsHorizontal,mdiDotsVertical,mdiDownload,mdiImageOutline,@@ -373,38 +373,41 @@<!-- ALBUM SHARING -->{#if album.albumUsers.length > 1 || (album.hasSharedLink && isOwned)}<div class="my-3 flex gap-x-1">- <!-- link -->- {#if album.hasSharedLink && isOwned}- <IconButton- aria-label={$t('create_link_to_share')}- color="secondary"- size="medium"- shape="round"- icon={mdiLink}- onclick={() => modalManager.show(SharedLinkCreateModal, { albumId: album.id })}- />- {/if}-- <!-- users with write access (collaborators) -->- {#each album.albumUsers.filter(({ role }) => role === AlbumUserRole.Editor || role === AlbumUserRole.Owner) as { user } (user.id)}- <button type="button" onclick={() => modalManager.show(AlbumOptionsModal, { album })}>+ <button+ class="flex gap-x-1"+ type="button"+ onclick={() => modalManager.show(AlbumOptionsModal, { album, readOnly: !isOwned })}+ >+ <!-- owner & users with write access (collaborators) -->+ {#each album.albumUsers.filter(({ role }) => role === AlbumUserRole.Editor || role === AlbumUserRole.Owner) as { user } (user.id)}<UserAvatar {user} size="md" />- </button>- {/each}-- <!-- display ellipsis if there are readonly users too -->- {#if albumHasViewers}- <IconButton- shape="round"- aria-label={$t('view_all_users')}- color="secondary"- size="medium"- icon={mdiDotsVertical}- onclick={() => modalManager.show(AlbumOptionsModal, { album })}- />+ {/each}++ <!-- display ellipsis if there are readonly users too -->+ {#if albumHasViewers}+ <IconButton+ shape="round"+ aria-label={$t('view_all_users')}+ color="secondary"+ size="medium"+ icon={mdiDotsHorizontal}+ />+ {/if}++ {#if album.hasSharedLink && isOwned}+ <IconButton+ aria-label={$t('shared_link_manage_links')}+ color="secondary"+ size="medium"+ shape="round"+ icon={mdiLink}+ />+ {/if}+ </button>++ {#if isOwned}+ <ActionButton action={Share} />{/if}-- <ActionButton action={Share} /></div>{/if}<AlbumDescription