High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor: asset tag modal (#18867)
Daniel Dietzler97e86e409a62
diff --git a/web/src/lib/components/asset-viewer/detail-panel-tags.svelte b/web/src/lib/components/asset-viewer/detail-panel-tags.svelteindex 8cef6c88fd..aeef6bd06e 100644--- a/web/src/lib/components/asset-viewer/detail-panel-tags.svelte+++ b/web/src/lib/components/asset-viewer/detail-panel-tags.svelte@@ -1,11 +1,11 @@<script lang="ts">import { shortcut } from '$lib/actions/shortcut';import Icon from '$lib/components/elements/icon.svelte';- import TagAssetForm from '$lib/components/forms/tag-asset-form.svelte';- import Portal from '$lib/components/shared-components/portal/portal.svelte';import { AppRoute } from '$lib/constants';import { authManager } from '$lib/managers/auth-manager.svelte';- import { removeTag, tagAssets } from '$lib/utils/asset-utils';+ import { modalManager } from '$lib/managers/modal-manager.svelte';+ import AssetTagModal from '$lib/modals/AssetTagModal.svelte';+ import { removeTag } from '$lib/utils/asset-utils';import { getAssetInfo, type AssetResponseDto } from '@immich/sdk';import { mdiClose, mdiPlus } from '@mdi/js';import { t } from 'svelte-i18n';@@ -19,19 +19,12 @@let tags = $derived(asset.tags || []);- let isOpen = $state(false);+ const handleAddTag = async () => {+ const success = await modalManager.show(AssetTagModal, { assetIds: [asset.id] });- const handleAdd = () => (isOpen = true);-- const handleCancel = () => (isOpen = false);-- const handleTag = async (tagIds: string[]) => {- const ids = await tagAssets({ tagIds, assetIds: [asset.id], showNotification: false });- if (ids) {- isOpen = false;+ if (success) {+ asset = await getAssetInfo({ id: asset.id });}-- asset = await getAssetInfo({ id: asset.id });};const handleRemove = async (tagId: string) => {@@ -42,7 +35,7 @@};</script>-<svelte:document use:shortcut={{ shortcut: { key: 't' }, onShortcut: () => (isOpen = true) }} />+<svelte:document use:shortcut={{ shortcut: { key: 't' }, onShortcut: handleAddTag }} />{#if isOwner && !authManager.key}<section class="px-4 mt-4">@@ -75,16 +68,10 @@type="button"class="rounded-full bg-gray-100 dark:bg-gray-800 text-gray-600 dark:text-gray-300 hover:bg-gray-200 dark:hover:bg-gray-700 hover:text-gray-700 dark:hover:text-gray-200 flex place-items-center place-content-center gap-1 px-2 py-1"title="Add tag"- onclick={handleAdd}+ onclick={handleAddTag}><span class="text-sm px-1 flex place-items-center place-content-center gap-1"><Icon path={mdiPlus} />Add</span></button></section></section>{/if}--{#if isOpen}- <Portal>- <TagAssetForm onTag={(tagsIds) => handleTag(tagsIds)} onCancel={handleCancel} />- </Portal>-{/if}diff --git a/web/src/lib/components/photos-page/actions/tag-action.svelte b/web/src/lib/components/photos-page/actions/tag-action.svelteindex 8915897a74..5bad8ca327 100644--- a/web/src/lib/components/photos-page/actions/tag-action.svelte+++ b/web/src/lib/components/photos-page/actions/tag-action.svelte@@ -1,10 +1,10 @@<script lang="ts">import { shortcut } from '$lib/actions/shortcut';- import TagAssetForm from '$lib/components/forms/tag-asset-form.svelte';- import { tagAssets } from '$lib/utils/asset-utils';- import { mdiTagMultipleOutline, mdiTimerSand } from '@mdi/js';- import { t } from 'svelte-i18n';+ import { modalManager } from '$lib/managers/modal-manager.svelte';+ import AssetTagModal from '$lib/modals/AssetTagModal.svelte';import { IconButton } from '@immich/ui';+ import { mdiTagMultipleOutline } from '@mdi/js';+ import { t } from 'svelte-i18n';import MenuOption from '../../shared-components/context-menu/menu-option.svelte';import { getAssetControlContext } from '../asset-select-control-bar.svelte';@@ -17,45 +17,24 @@const text = $t('tag');const icon = mdiTagMultipleOutline;- let loading = $state(false);- let isOpen = $state(false);-const { clearSelect, getOwnedAssets } = getAssetControlContext();- const handleOpen = () => (isOpen = true);- const handleCancel = () => (isOpen = false);- const handleTag = async (tagIds: string[]) => {+ const handleTagAssets = async () => {const assets = [...getOwnedAssets()];- loading = true;- const ids = await tagAssets({ tagIds, assetIds: assets.map((asset) => asset.id) });- if (ids) {+ const success = await modalManager.show(AssetTagModal, { assetIds: assets.map(({ id }) => id) });++ if (success) {clearSelect();}- loading = false;};</script>-<svelte:document use:shortcut={{ shortcut: { key: 't' }, onShortcut: () => (isOpen = true) }} />+<svelte:document use:shortcut={{ shortcut: { key: 't' }, onShortcut: handleTagAssets }} />{#if menuItem}- <MenuOption {text} {icon} onClick={handleOpen} />+ <MenuOption {text} {icon} onClick={handleTagAssets} />{/if}{#if !menuItem}- {#if loading}- <IconButton- shape="round"- color="secondary"- variant="ghost"- aria-label={$t('loading')}- icon={mdiTimerSand}- onclick={() => {}}- />- {:else}- <IconButton shape="round" color="secondary" variant="ghost" aria-label={text} {icon} onclick={handleOpen} />- {/if}-{/if}--{#if isOpen}- <TagAssetForm onTag={(tagIds) => handleTag(tagIds)} onCancel={handleCancel} />+ <IconButton shape="round" color="secondary" variant="ghost" aria-label={text} {icon} onclick={handleTagAssets} />{/if}diff --git a/web/src/lib/components/forms/tag-asset-form.svelte b/web/src/lib/modals/AssetTagModal.sveltesimilarity index 83%rename from web/src/lib/components/forms/tag-asset-form.svelterename to web/src/lib/modals/AssetTagModal.svelteindex a6e0928ece..2a61f0b945 100644--- a/web/src/lib/components/forms/tag-asset-form.svelte+++ b/web/src/lib/modals/AssetTagModal.svelte@@ -1,19 +1,20 @@<script lang="ts">import Icon from '$lib/components/elements/icon.svelte';+ import { tagAssets } from '$lib/utils/asset-utils';import { getAllTags, upsertTags, type TagResponseDto } from '@immich/sdk';import { Button, Modal, ModalBody, ModalFooter } from '@immich/ui';import { mdiClose, mdiTag } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';import { SvelteSet } from 'svelte/reactivity';- import Combobox, { type ComboBoxOption } from '../shared-components/combobox.svelte';+ import Combobox, { type ComboBoxOption } from '../components/shared-components/combobox.svelte';interface Props {- onTag: (tagIds: string[]) => void;- onCancel: () => void;+ onClose: (success?: true) => void;+ assetIds: string[];}- let { onTag, onCancel }: Props = $props();+ let { onClose, assetIds }: Props = $props();let allTags: TagResponseDto[] = $state([]);let tagMap = $derived(Object.fromEntries(allTags.map((tag) => [tag.id, tag])));@@ -25,7 +26,10 @@allTags = await getAllTags();});- const handleSubmit = () => onTag([...selectedIds]);+ const handleSubmit = async () => {+ await tagAssets({ tagIds: [...selectedIds], assetIds, showNotification: false });+ onClose(true);+ };const handleSelect = async (option?: ComboBoxOption) => {if (!option) {@@ -45,13 +49,13 @@selectedIds.delete(tag);};- const onsubmit = (event: Event) => {+ const onsubmit = async (event: Event) => {event.preventDefault();- handleSubmit();+ await handleSubmit();};</script>-<Modal size="small" title={$t('tag_assets')} icon={mdiTag} onClose={onCancel}>+<Modal size="small" title={$t('tag_assets')} icon={mdiTag} {onClose}><ModalBody><form {onsubmit} autocomplete="off" id="create-tag-form"><div class="my-4 flex flex-col gap-2">@@ -95,7 +99,7 @@<ModalFooter><div class="flex w-full gap-2">- <Button shape="round" fullWidth color="secondary" onclick={onCancel}>{$t('cancel')}</Button>+ <Button shape="round" fullWidth color="secondary" onclick={() => onClose()}>{$t('cancel')}</Button><Button type="submit" shape="round" fullWidth form="create-tag-form" {disabled}>{$t('tag_assets')}</Button></div></ModalFooter>