High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor: asset navbar (#25476)
Jason Rasmussenaf51a11b1bb7
diff --git a/web/src/lib/components/asset-viewer/actions/edit-action.svelte b/web/src/lib/components/asset-viewer/actions/edit-action.sveltedeleted file mode 100644index 2a630f1697..0000000000--- a/web/src/lib/components/asset-viewer/actions/edit-action.svelte+++ /dev/null@@ -1,20 +0,0 @@-<script lang="ts">- import { IconButton } from '@immich/ui';- import { mdiTune } from '@mdi/js';- import { t } from 'svelte-i18n';-- interface Props {- onAction: () => void;- }-- let { onAction }: Props = $props();-</script>--<IconButton- color="secondary"- shape="round"- variant="ghost"- icon={mdiTune}- aria-label={$t('editor')}- onclick={() => onAction()}-/>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.svelteindex 93d1a4acd1..bd20d6efeb 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@@ -7,7 +7,6 @@import AddToStackAction from '$lib/components/asset-viewer/actions/add-to-stack-action.svelte';import ArchiveAction from '$lib/components/asset-viewer/actions/archive-action.svelte';import DeleteAction from '$lib/components/asset-viewer/actions/delete-action.svelte';- import EditAction from '$lib/components/asset-viewer/actions/edit-action.svelte';import KeepThisDeleteOthersAction from '$lib/components/asset-viewer/actions/keep-this-delete-others.svelte';import RatingAction from '$lib/components/asset-viewer/actions/rating-action.svelte';import RemoveAssetFromStack from '$lib/components/asset-viewer/actions/remove-asset-from-stack.svelte';@@ -20,7 +19,6 @@import UnstackAction from '$lib/components/asset-viewer/actions/unstack-action.svelte';import ButtonContextMenu from '$lib/components/shared-components/context-menu/button-context-menu.svelte';import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';- import { ProjectionType } from '$lib/constants';import { featureFlagsManager } from '$lib/managers/feature-flags-manager.svelte';import { Route } from '$lib/route';import { getGlobalActions } from '$lib/services/app.service';@@ -67,7 +65,6 @@onAction: OnAction;onUndoDelete?: OnUndoDelete;onPlaySlideshow: () => void;- onEdit: () => void;onClose?: () => void;playOriginalVideo: boolean;setPlayOriginalVideo: (value: boolean) => void;@@ -86,26 +83,42 @@onUndoDelete = undefined,onPlaySlideshow,onClose,- onEdit,playOriginalVideo = false,setPlayOriginalVideo,}: Props = $props();- let isOwner = $derived($user && asset.ownerId === $user?.id);- let isLocked = $derived(asset.visibility === AssetVisibility.Locked);- let smartSearchEnabled = $derived(featureFlagsManager.value.smartSearch);-- const Close: ActionItem = {- title: $t('go_back'),- type: $t('assets'),- icon: mdiArrowLeft,- $if: () => !!onClose,- onAction: () => onClose?.(),- shortcuts: [{ key: 'Escape' }],- };+ const isOwner = $derived($user && asset.ownerId === $user?.id);+ const isLocked = $derived(asset.visibility === AssetVisibility.Locked);+ const isImage = $derived(asset.type === AssetTypeEnum.Image);+ const smartSearchEnabled = $derived(featureFlagsManager.value.smartSearch);const { Cast } = $derived(getGlobalActions($t));+ const { Close, ZoomIn, ZoomOut } = $derived({+ Close: {+ title: $t('go_back'),+ type: $t('assets'),+ icon: mdiArrowLeft,+ $if: () => !!onClose,+ onAction: () => onClose?.(),+ shortcuts: [{ key: 'Escape' }],+ },++ ZoomIn: {+ title: $t('zoom_image'),+ icon: mdiMagnifyPlusOutline,+ $if: () => isImage && $photoZoomState && $photoZoomState.currentZoom <= 1,+ onAction: () => onZoomImage(),+ },++ ZoomOut: {+ title: $t('zoom_image'),+ icon: mdiMagnifyMinusOutline,+ $if: () => $photoZoomState && $photoZoomState.currentZoom > 1,+ onAction: () => onZoomImage(),+ },+ } satisfies Record<string, ActionItem>);+const {Share,Download,@@ -117,22 +130,13 @@PlayMotionPhoto,StopMotionPhoto,Info,+ Edit,RefreshFacesJob,RefreshMetadataJob,RegenerateThumbnailJob,TranscodeVideoJob,} = $derived(getAssetActions($t, asset));const sharedLink = getSharedLink();-- const editorDisabled = $derived(- !isOwner ||- asset.type !== AssetTypeEnum.Image ||- asset.livePhotoVideoId ||- (asset.exifInfo?.projectionType === ProjectionType.EQUIRECTANGULAR &&- asset.originalPath.toLowerCase().endsWith('.insp')) ||- asset.originalPath.toLowerCase().endsWith('.gif') ||- asset.originalPath.toLowerCase().endsWith('.svg'),- );</script><CommandPaletteDefaultProvider@@ -150,6 +154,7 @@PlayMotionPhoto,StopMotionPhoto,Info,+ Edit,RefreshFacesJob,RefreshMetadataJob,RegenerateThumbnailJob,@@ -170,18 +175,9 @@<ActionButton action={Offline} /><ActionButton action={PlayMotionPhoto} /><ActionButton action={StopMotionPhoto} />+ <ActionButton action={ZoomIn} />+ <ActionButton action={ZoomOut} />- {#if asset.type === AssetTypeEnum.Image}- <IconButton- class="hidden sm:flex"- color="secondary"- variant="ghost"- shape="round"- icon={$photoZoomState && $photoZoomState.currentZoom > 1 ? mdiMagnifyMinusOutline : mdiMagnifyPlusOutline}- aria-label={$t('zoom_image')}- onclick={onZoomImage}- />- {/if}{#if canCopyImageToClipboard() && asset.type === AssetTypeEnum.Image && $photoViewerImgElement}<IconButtoncolor="secondary"@@ -202,9 +198,7 @@<RatingAction {asset} {onAction} />{/if}- {#if !editorDisabled}- <EditAction onAction={onEdit} />- {/if}+ <ActionButton action={Edit} />{#if isOwner}<DeleteAction {asset} {onAction} {preAction} {onUndoDelete} />diff --git a/web/src/lib/components/asset-viewer/asset-viewer.svelte b/web/src/lib/components/asset-viewer/asset-viewer.svelteindex e76ac19470..9661fb3aed 100644--- a/web/src/lib/components/asset-viewer/asset-viewer.svelte+++ b/web/src/lib/components/asset-viewer/asset-viewer.svelte@@ -106,7 +106,6 @@let appearsInAlbums: AlbumResponseDto[] = $state([]);let sharedLink = getSharedLink();let previewStackedAsset: AssetResponseDto | undefined = $state();- let isShowEditor = $state(false);let fullscreenElement = $state<Element>();let unsubscribes: (() => void)[] = [];let stack: StackResponseDto | null = $state(null);@@ -202,7 +201,7 @@onAssetChange?.(refreshedAsset);assetViewingStore.setAsset(refreshedAsset);}- isShowEditor = false;+ assetViewerManager.closeEditor();};const tracker = new InvocationTracker();@@ -249,13 +248,6 @@}, $t('error_while_navigating'));};- const showEditor = () => {- if (assetViewerManager.isShowActivityPanel) {- assetViewerManager.isShowActivityPanel = false;- }- isShowEditor = !isShowEditor;- };-/*** Slide show mode*/@@ -412,7 +404,7 @@) {return 'ImagePanaramaViewer';}- if (isShowEditor && editManager.selectedTool?.type === EditToolType.Transform) {+ if (assetViewerManager.isShowEditor && editManager.selectedTool?.type === EditToolType.Transform) {return 'CropArea';}return 'PhotoViewer';@@ -429,7 +421,7 @@$slideshowState === SlideshowState.None &&asset.type === AssetTypeEnum.Image &&!(asset.exifInfo?.projectionType === 'EQUIRECTANGULAR') &&- !isShowEditor &&+ !assetViewerManager.isShowEditor &&ocrManager.hasOcrData,);</script>@@ -445,7 +437,7 @@bind:this={assetViewerHtmlElement}><!-- Top navigation bar -->- {#if $slideshowState === SlideshowState.None && !isShowEditor}+ {#if $slideshowState === SlideshowState.None && !assetViewerManager.isShowEditor}<div class="col-span-4 col-start-1 row-span-1 row-start-1 transition-transform"><AssetViewerNavBar{asset}@@ -458,7 +450,6 @@preAction={handlePreAction}onAction={handleAction}{onUndoDelete}- onEdit={showEditor}onPlaySlideshow={() => ($slideshowState = SlideshowState.PlaySlideshow)}onClose={onClose ? () => onClose(asset) : undefined}{playOriginalVideo}@@ -480,7 +471,7 @@</div>{/if}- {#if $slideshowState === SlideshowState.None && showNavigation && !isShowEditor && previousAsset}+ {#if $slideshowState === SlideshowState.None && showNavigation && !assetViewerManager.isShowEditor && previousAsset}<div class="my-auto col-span-1 col-start-1 row-span-full row-start-1 justify-self-start"><PreviousAssetAction onPreviousAsset={() => navigateAsset('previous')} /></div>@@ -571,13 +562,13 @@{/if}</div>- {#if $slideshowState === SlideshowState.None && showNavigation && !isShowEditor && nextAsset}+ {#if $slideshowState === SlideshowState.None && showNavigation && !assetViewerManager.isShowEditor && nextAsset}<div class="my-auto col-span-1 col-start-4 row-span-full row-start-1 justify-self-end"><NextAssetAction onNextAsset={() => navigateAsset('next')} /></div>{/if}- {#if asset.hasMetadata && $slideshowState === SlideshowState.None && assetViewerManager.isShowDetailPanel && !isShowEditor}+ {#if asset.hasMetadata && $slideshowState === SlideshowState.None && assetViewerManager.isShowDetailPanel && !assetViewerManager.isShowEditor}<divtransition:fly={{ duration: 150 }}id="detail-panel"@@ -588,7 +579,7 @@</div>{/if}- {#if isShowEditor}+ {#if assetViewerManager.isShowEditor}<divtransition:fly={{ duration: 150 }}id="editor-panel"diff --git a/web/src/lib/managers/asset-viewer-manager.svelte.ts b/web/src/lib/managers/asset-viewer-manager.svelte.tsindex 7b482faa76..593d464006 100644--- a/web/src/lib/managers/asset-viewer-manager.svelte.ts+++ b/web/src/lib/managers/asset-viewer-manager.svelte.ts@@ -5,6 +5,7 @@ const isShowDetailPanel = new PersistedLocalStorage<boolean>('asset-viewer-stateexport class AssetViewerManager {isShowActivityPanel = $state(false);isPlayingMotionPhoto = $state(false);+ isShowEditor = $state(false);get isShowDetailPanel() {return isShowDetailPanel.current;@@ -31,6 +32,15 @@ export class AssetViewerManager {closeDetailPanel() {this.isShowDetailPanel = false;}++ openEditor() {+ this.closeActivityPanel();+ this.isShowEditor = true;+ }++ closeEditor() {+ this.isShowEditor = false;+ }}export const assetViewerManager = new AssetViewerManager();diff --git a/web/src/lib/services/asset.service.ts b/web/src/lib/services/asset.service.tsindex d768e5590b..a02cbca7cc 100644--- a/web/src/lib/services/asset.service.ts+++ b/web/src/lib/services/asset.service.ts@@ -1,3 +1,4 @@+import { ProjectionType } from '$lib/constants';import { assetViewerManager } from '$lib/managers/asset-viewer-manager.svelte';import { authManager } from '$lib/managers/auth-manager.svelte';import { eventManager } from '$lib/managers/event-manager.svelte';@@ -37,6 +38,7 @@ import {mdiMotionPauseOutline,mdiMotionPlayOutline,mdiShareVariantOutline,+ mdiTune,} from '@mdi/js';import type { MessageFormatter } from 'svelte-i18n';import { get } from 'svelte/store';@@ -132,6 +134,21 @@ export const getAssetActions = ($t: MessageFormatter, asset: AssetResponseDto) =shortcuts: [{ key: 'i' }],};+ const Edit: ActionItem = {+ title: $t('editor'),+ icon: mdiTune,+ $if: () =>+ !sharedLink &&+ isOwner &&+ asset.type === AssetTypeEnum.Image &&+ !asset.livePhotoVideoId &&+ asset.exifInfo?.projectionType !== ProjectionType.EQUIRECTANGULAR &&+ !asset.originalPath.toLowerCase().endsWith('.insp') &&+ !asset.originalPath.toLowerCase().endsWith('.gif') &&+ !asset.originalPath.toLowerCase().endsWith('.svg'),+ onAction: () => assetViewerManager.openEditor(),+ };+const RefreshFacesJob: ActionItem = {title: getAssetJobName($t, AssetJobName.RefreshFaces),icon: mdiHeadSyncOutline,@@ -168,6 +185,7 @@ export const getAssetActions = ($t: MessageFormatter, asset: AssetResponseDto) =Unfavorite,PlayMotionPhoto,StopMotionPhoto,+ Edit,RefreshFacesJob,RefreshMetadataJob,RegenerateThumbnailJob,