Skip to content

High performance self-hosted photo and video management solution.

fix(web): show relevant navbar options for partner assets (#24832)

Yarosafe925a55e8c
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 faa81a6e92..319d382706 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
@@ -27,7 +27,7 @@
import { photoViewerImgElement } from '$lib/stores/assets-store.svelte';
import { user } from '$lib/stores/user.store';
import { photoZoomState } from '$lib/stores/zoom-image.store';
- import { getAssetJobName, withoutIcons } from '$lib/utils';
+ import { getAssetJobName, getSharedLink, withoutIcons } from '$lib/utils';
import type { OnUndoDelete } from '$lib/utils/actions';
import { canCopyImageToClipboard } from '$lib/utils/asset-utils';
import { toTimelineAsset } from '$lib/utils/timeline-util';
@@ -114,6 +114,7 @@
const { Share, Download, SharedLinkDownload, Offline, Favorite, Unfavorite, PlayMotionPhoto, StopMotionPhoto, Info } =
$derived(getAssetActions($t, asset));
+ const sharedLink = getSharedLink();
// TODO: Enable when edits are ready for release
// let showEditorButton = $derived(
@@ -185,7 +186,9 @@
{#if isOwner}
<DeleteAction {asset} {onAction} {preAction} {onUndoDelete} />
+ {/if}
+ {#if !sharedLink}
<ButtonContextMenu direction="left" align="top-right" color="secondary" title={$t('more')} icon={mdiDotsVertical}>
{#if showSlideshow && !isLocked}
<MenuOption icon={mdiPresentationPlay} text={$t('slideshow')} onClick={onPlaySlideshow} />
@@ -214,17 +217,19 @@
{/if}
{/if}
{/if}
- {#if album}
- <SetAlbumCoverAction {asset} {album} />
- {/if}
- {#if person}
- <SetFeaturedPhotoAction {asset} {person} {onAction} />
- {/if}
- {#if asset.type === AssetTypeEnum.Image && !isLocked}
- <SetProfilePictureAction {asset} />
- {/if}
+ {/if}
+ {#if album}
+ <SetAlbumCoverAction {asset} {album} />
+ {/if}
+ {#if person}
+ <SetFeaturedPhotoAction {asset} {person} {onAction} />
+ {/if}
+ {#if asset.type === AssetTypeEnum.Image && !isLocked}
+ <SetProfilePictureAction {asset} />
+ {/if}
- {#if !isLocked}
+ {#if !isLocked}
+ {#if isOwner}
<ArchiveAction {asset} {onAction} {preAction} />
<MenuOption
icon={mdiUpload}
@@ -238,28 +243,29 @@
text={$t('view_in_timeline')}
/>
{/if}
- {#if !asset.isArchived && !asset.isTrashed && smartSearchEnabled}
- <MenuOption
- icon={mdiCompare}
- onClick={() =>
- goto(resolve(`${AppRoute.SEARCH}?query={"queryAssetId":"${stack?.primaryAssetId ?? asset.id}"}`))}
- text={$t('view_similar_photos')}
- />
- {/if}
{/if}
-
- {#if !asset.isTrashed}
- <SetVisibilityAction asset={toTimelineAsset(asset)} {onAction} {preAction} />
- {/if}
-
- {#if asset.type === AssetTypeEnum.Video}
+ {#if !asset.isArchived && !asset.isTrashed && smartSearchEnabled}
<MenuOption
- icon={mdiVideoOutline}
- onClick={() => setPlayOriginalVideo(!playOriginalVideo)}
- text={playOriginalVideo ? $t('play_transcoded_video') : $t('play_original_video')}
+ icon={mdiCompare}
+ onClick={() =>
+ goto(resolve(`${AppRoute.SEARCH}?query={"queryAssetId":"${stack?.primaryAssetId ?? asset.id}"}`))}
+ text={$t('view_similar_photos')}
/>
{/if}
+ {/if}
+ {#if !asset.isTrashed && isOwner}
+ <SetVisibilityAction asset={toTimelineAsset(asset)} {onAction} {preAction} />
+ {/if}
+
+ {#if asset.type === AssetTypeEnum.Video}
+ <MenuOption
+ icon={mdiVideoOutline}
+ onClick={() => setPlayOriginalVideo(!playOriginalVideo)}
+ text={playOriginalVideo ? $t('play_transcoded_video') : $t('play_original_video')}
+ />
+ {/if}
+ {#if isOwner}
<hr />
<MenuOption
icon={mdiHeadSyncOutline}
diff --git a/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte
index c0d05bdfcb..65adfcbe9e 100644
--- a/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/photos/[[assetId=id]]/+page.svelte
@@ -59,6 +59,9 @@
return assetInteraction.isAllUserOwned && (isLivePhoto || isLivePhotoCandidate);
});
+
+ const isAllUserOwned = $derived($user && selectedAssets.every((asset) => asset.ownerId === $user.id));
+
const handleEscape = () => {
if ($showAssetViewer) {
return;
@@ -130,45 +133,51 @@
<AddToAlbum />
<AddToAlbum shared />
</ButtonContextMenu>
- <FavoriteAction
- removeFavorite={assetInteraction.isAllFavorite}
- onFavorite={(ids, isFavorite) => timelineManager.update(ids, (asset) => (asset.isFavorite = isFavorite))}
- ></FavoriteAction>
- <ButtonContextMenu icon={mdiDotsVertical} title={$t('menu')}>
- <DownloadAction menuItem />
- {#if assetInteraction.selectedAssets.length > 1 || isAssetStackSelected}
- <StackAction
- unstack={isAssetStackSelected}
- onStack={(result) => updateStackedAssetInTimeline(timelineManager, result)}
- onUnstack={(assets) => updateUnstackedAssetInTimeline(timelineManager, assets)}
+
+ {#if isAllUserOwned}
+ <FavoriteAction
+ removeFavorite={assetInteraction.isAllFavorite}
+ onFavorite={(ids, isFavorite) => timelineManager.update(ids, (asset) => (asset.isFavorite = isFavorite))}
+ />
+
+ <ButtonContextMenu icon={mdiDotsVertical} title={$t('menu')}>
+ <DownloadAction menuItem />
+ {#if assetInteraction.selectedAssets.length > 1 || isAssetStackSelected}
+ <StackAction
+ unstack={isAssetStackSelected}
+ onStack={(result) => updateStackedAssetInTimeline(timelineManager, result)}
+ onUnstack={(assets) => updateUnstackedAssetInTimeline(timelineManager, assets)}
+ />
+ {/if}
+ {#if isLinkActionAvailable}
+ <LinkLivePhotoAction
+ menuItem
+ unlink={assetInteraction.selectedAssets.length === 1}
+ onLink={handleLink}
+ onUnlink={handleUnlink}
+ />
+ {/if}
+ <ChangeDate menuItem />
+ <ChangeDescription menuItem />
+ <ChangeLocation menuItem />
+ <ArchiveAction
+ menuItem
+ onArchive={(ids, visibility) => timelineManager.update(ids, (asset) => (asset.visibility = visibility))}
/>
- {/if}
- {#if isLinkActionAvailable}
- <LinkLivePhotoAction
+ {#if $preferences.tags.enabled}
+ <TagAction menuItem />
+ {/if}
+ <DeleteAssets
menuItem
- unlink={assetInteraction.selectedAssets.length === 1}
- onLink={handleLink}
- onUnlink={handleUnlink}
+ onAssetDelete={(assetIds) => timelineManager.removeAssets(assetIds)}
+ onUndoDelete={(assets) => timelineManager.upsertAssets(assets)}
/>
- {/if}
- <ChangeDate menuItem />
- <ChangeDescription menuItem />
- <ChangeLocation menuItem />
- <ArchiveAction
- menuItem
- onArchive={(ids, visibility) => timelineManager.update(ids, (asset) => (asset.visibility = visibility))}
- />
- {#if $preferences.tags.enabled}
- <TagAction menuItem />
- {/if}
- <DeleteAssets
- menuItem
- onAssetDelete={(assetIds) => timelineManager.removeAssets(assetIds)}
- onUndoDelete={(assets) => timelineManager.upsertAssets(assets)}
- />
- <SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} />
- <hr />
- <AssetJobActions />
- </ButtonContextMenu>
+ <SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} />
+ <hr />
+ <AssetJobActions />
+ </ButtonContextMenu>
+ {:else}
+ <DownloadAction />
+ {/if}
</AssetSelectControlBar>
{/if}
diff --git a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
index 0cc30c2c0a..3a91858b85 100644
--- a/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
+++ b/web/src/routes/(user)/search/[[photos=photos]]/[[assetId=id]]/+page.svelte
@@ -26,7 +26,7 @@
import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';
import { assetViewingStore } from '$lib/stores/asset-viewing.store';
import { lang, locale } from '$lib/stores/preferences.store';
- import { preferences } from '$lib/stores/user.store';
+ import { preferences, user } from '$lib/stores/user.store';
import { handlePromiseError } from '$lib/utils';
import { cancelMultiselect } from '$lib/utils/asset-utils';
import { parseUtcDate } from '$lib/utils/date-time';
@@ -71,6 +71,10 @@
let smartSearchEnabled = $derived(featureFlagsManager.value.smartSearch);
let terms = $derived(searchQuery ? JSON.parse(searchQuery) : {});
+ const isAllUserOwned = $derived(
+ $user && assetInteraction.selectedAssets.every((asset) => asset.ownerId === $user.id),
+ );
+
$effect(() => {
// we want this to *only* be reactive on `terms`
// eslint-disable-next-line @typescript-eslint/no-unused-expressions
@@ -258,64 +262,6 @@
<svelte:window bind:scrollY />
<svelte:document use:shortcut={{ shortcut: { key: 'Escape' }, onShortcut: onEscape }} />
-<section>
- {#if assetInteraction.selectionActive}
- <div class="fixed top-0 start-0 w-full">
- <AssetSelectControlBar
- assets={assetInteraction.selectedAssets}
- clearSelect={() => cancelMultiselect(assetInteraction)}
- >
- <CreateSharedLink />
- <IconButton
- shape="round"
- color="secondary"
- variant="ghost"
- aria-label={$t('select_all')}
- icon={mdiSelectAll}
- onclick={handleSelectAll}
- />
- <ButtonContextMenu icon={mdiPlus} title={$t('add_to')}>
- <AddToAlbum {onAddToAlbum} />
- <AddToAlbum shared {onAddToAlbum} />
- </ButtonContextMenu>
- <FavoriteAction
- removeFavorite={assetInteraction.isAllFavorite}
- onFavorite={(assetIds, isFavorite) => {
- for (const assetId of assetIds) {
- const asset = searchResultAssets.find((searchAsset) => searchAsset.id === assetId);
- if (asset) {
- asset.isFavorite = isFavorite;
- }
- }
- }}
- />
-
- <ButtonContextMenu icon={mdiDotsVertical} title={$t('menu')}>
- <DownloadAction menuItem />
- <ChangeDate menuItem />
- <ChangeLocation menuItem />
- <ArchiveAction menuItem unarchive={assetInteraction.isAllArchived} />
- {#if $preferences.tags.enabled && assetInteraction.isAllUserOwned}
- <TagAction menuItem />
- {/if}
- <DeleteAssets menuItem {onAssetDelete} onUndoDelete={onSearchQueryUpdate} />
- <hr />
- <AssetJobActions />
- </ButtonContextMenu>
- </AssetSelectControlBar>
- </div>
- {:else}
- <div class="fixed top-0 start-0 w-full">
- <ControlAppBar onClose={() => goto(previousRoute)} backIcon={mdiArrowLeft}>
- <div class="absolute bg-light"></div>
- <div class="w-full flex-1 ps-4">
- <SearchBar grayTheme={false} value={terms?.query ?? ''} searchQuery={terms} />
- </div>
- </ControlAppBar>
- </div>
- {/if}
-</section>
-
{#if terms}
<section
id="search-chips"
@@ -419,34 +365,38 @@
<AddToAlbum {onAddToAlbum} />
<AddToAlbum shared {onAddToAlbum} />
</ButtonContextMenu>
- <FavoriteAction
- removeFavorite={assetInteraction.isAllFavorite}
- onFavorite={(ids, isFavorite) => {
- for (const id of ids) {
- const asset = searchResultAssets.find((asset) => asset.id === id);
- if (asset) {
- asset.isFavorite = isFavorite;
+ {#if isAllUserOwned}
+ <FavoriteAction
+ removeFavorite={assetInteraction.isAllFavorite}
+ onFavorite={(ids, isFavorite) => {
+ for (const id of ids) {
+ const asset = searchResultAssets.find((asset) => asset.id === id);
+ if (asset) {
+ asset.isFavorite = isFavorite;
+ }
}
- }
- }}
- />
-
- <ButtonContextMenu icon={mdiDotsVertical} title={$t('menu')}>
- <DownloadAction menuItem />
- <ChangeDate menuItem />
- <ChangeDescription menuItem />
- <ChangeLocation menuItem />
- <ArchiveAction menuItem unarchive={assetInteraction.isAllArchived} />
- {#if assetInteraction.isAllUserOwned}
- <SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} />
- {/if}
- {#if $preferences.tags.enabled && assetInteraction.isAllUserOwned}
- <TagAction menuItem />
- {/if}
- <DeleteAssets menuItem {onAssetDelete} onUndoDelete={onSearchQueryUpdate} />
- <hr />
- <AssetJobActions />
- </ButtonContextMenu>
+ }}
+ />
+
+ <ButtonContextMenu icon={mdiDotsVertical} title={$t('menu')}>
+ <DownloadAction menuItem />
+ <ChangeDate menuItem />
+ <ChangeDescription menuItem />
+ <ChangeLocation menuItem />
+ <ArchiveAction menuItem unarchive={assetInteraction.isAllArchived} />
+ {#if assetInteraction.isAllUserOwned}
+ <SetVisibilityAction menuItem onVisibilitySet={handleSetVisibility} />
+ {/if}
+ {#if $preferences.tags.enabled && assetInteraction.isAllUserOwned}
+ <TagAction menuItem />
+ {/if}
+ <DeleteAssets menuItem {onAssetDelete} onUndoDelete={onSearchQueryUpdate} />
+ <hr />
+ <AssetJobActions />
+ </ButtonContextMenu>
+ {:else}
+ <DownloadAction />
+ {/if}
</AssetSelectControlBar>
</div>
{:else}