High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
chore: migrate to UI modal manager (#20116)
Daniel Dietzlerf27bdf7523db
diff --git a/web/src/lib/components/admin-page/jobs/jobs-panel.svelte b/web/src/lib/components/admin-page/jobs/jobs-panel.svelteindex 73dfb30908..463bcb3d20 100644--- a/web/src/lib/components/admin-page/jobs/jobs-panel.svelte+++ b/web/src/lib/components/admin-page/jobs/jobs-panel.svelte@@ -3,11 +3,11 @@notificationController,NotificationType,} from '$lib/components/shared-components/notification/notification';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { featureFlags } from '$lib/stores/server-config.store';import { getJobName } from '$lib/utils';import { handleError } from '$lib/utils/handle-error';import { JobCommand, JobName, sendJobCommand, type AllJobStatusResponseDto, type JobCommandDto } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import {mdiContentDuplicate,mdiFaceRecognition,diff --git a/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte b/web/src/lib/components/admin-page/settings/auth/auth-settings.svelteindex a1926b4020..ce6dc26171 100644--- a/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte+++ b/web/src/lib/components/admin-page/settings/auth/auth-settings.svelte@@ -6,9 +6,9 @@import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';import { SettingInputFieldType } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import AuthDisableLoginConfirmModal from '$lib/modals/AuthDisableLoginConfirmModal.svelte';import { OAuthTokenEndpointAuthMethod, type SystemConfigDto } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { isEqual } from 'lodash-es';import { t } from 'svelte-i18n';import { fade } from 'svelte/transition';diff --git a/web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte b/web/src/lib/components/admin-page/settings/template-settings/template-settings.svelteindex 872b4b9833..a337aab2ae 100644--- a/web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte+++ b/web/src/lib/components/admin-page/settings/template-settings/template-settings.svelte@@ -4,11 +4,10 @@import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';import SettingTextarea from '$lib/components/shared-components/settings/setting-textarea.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import EmailTemplatePreviewModal from '$lib/modals/EmailTemplatePreviewModal.svelte';import { handleError } from '$lib/utils/handle-error';import { type SystemConfigDto, type SystemConfigTemplateEmailsDto, getNotificationTemplateAdmin } from '@immich/sdk';- import { Button } from '@immich/ui';+ import { Button, modalManager } from '@immich/ui';import { mdiEyeOutline } from '@mdi/js';import { t } from 'svelte-i18n';import { fade } from 'svelte/transition';diff --git a/web/src/lib/components/album-page/album-map.svelte b/web/src/lib/components/album-page/album-map.svelteindex fbb831a38b..7d7060ac0a 100644--- a/web/src/lib/components/album-page/album-map.svelte+++ b/web/src/lib/components/album-page/album-map.svelte@@ -1,9 +1,8 @@<script lang="ts">- import { modalManager } from '$lib/managers/modal-manager.svelte';import MapModal from '$lib/modals/MapModal.svelte';import { assetViewingStore } from '$lib/stores/asset-viewing.store';import { getAlbumInfo, type AlbumResponseDto, type MapMarkerResponseDto } from '@immich/sdk';- import { IconButton } from '@immich/ui';+ import { IconButton, modalManager } from '@immich/ui';import { mdiMapOutline } from '@mdi/js';import { onDestroy, onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/album-page/albums-list.svelte b/web/src/lib/components/album-page/albums-list.svelteindex f3d14ddb27..29031bee2e 100644--- a/web/src/lib/components/album-page/albums-list.svelte+++ b/web/src/lib/components/album-page/albums-list.svelte@@ -9,7 +9,6 @@notificationController,} from '$lib/components/shared-components/notification/notification';import { AppRoute } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import AlbumEditModal from '$lib/modals/AlbumEditModal.svelte';import AlbumShareModal from '$lib/modals/AlbumShareModal.svelte';import QrCodeModal from '$lib/modals/QrCodeModal.svelte';@@ -38,6 +37,7 @@import { handleError } from '$lib/utils/handle-error';import { normalizeSearchString } from '$lib/utils/string-utils';import { addUsersToAlbum, deleteAlbum, isHttpError, type AlbumResponseDto, type AlbumUserAddDto } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { mdiDeleteOutline, mdiFolderDownloadOutline, mdiRenameOutline, mdiShareVariantOutline } from '@mdi/js';import { groupBy } from 'lodash-es';import { onMount, type Snippet } from 'svelte';diff --git a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelteindex 8fe765ab2d..dca0b7918e 100644--- a/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte+++ b/web/src/lib/components/asset-viewer/actions/add-to-album-action.svelte@@ -3,11 +3,11 @@import type { OnAction } from '$lib/components/asset-viewer/actions/action';import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';import { AssetAction } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import AlbumPickerModal from '$lib/modals/AlbumPickerModal.svelte';import { addAssetsToAlbum } from '$lib/utils/asset-utils';import { toTimelineAsset } from '$lib/utils/timeline-util';import type { AssetResponseDto } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { mdiImageAlbum, mdiShareVariantOutline } from '@mdi/js';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/asset-viewer/actions/keep-this-delete-others.svelte b/web/src/lib/components/asset-viewer/actions/keep-this-delete-others.svelteindex be5e8f7827..dfb8d8910c 100644--- a/web/src/lib/components/asset-viewer/actions/keep-this-delete-others.svelte+++ b/web/src/lib/components/asset-viewer/actions/keep-this-delete-others.svelte@@ -1,11 +1,10 @@<script lang="ts">import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';-import { AssetAction } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { keepThisDeleteOthers } from '$lib/utils/asset-utils';import { toTimelineAsset } from '$lib/utils/timeline-util';import type { AssetResponseDto, StackResponseDto } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { mdiPinOutline } from '@mdi/js';import { t } from 'svelte-i18n';import type { OnAction } from './action';diff --git a/web/src/lib/components/asset-viewer/actions/set-profile-picture-action.svelte b/web/src/lib/components/asset-viewer/actions/set-profile-picture-action.svelteindex 6887ae8ebb..0d7735d4f1 100644--- a/web/src/lib/components/asset-viewer/actions/set-profile-picture-action.svelte+++ b/web/src/lib/components/asset-viewer/actions/set-profile-picture-action.svelte@@ -1,8 +1,8 @@<script lang="ts">import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import ProfileImageCropperModal from '$lib/modals/ProfileImageCropperModal.svelte';import type { AssetResponseDto } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { mdiAccountCircleOutline } from '@mdi/js';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte b/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelteindex 14126bb8c7..44c1687be6 100644--- a/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte+++ b/web/src/lib/components/asset-viewer/actions/set-visibility-action.svelte@@ -1,11 +1,10 @@<script lang="ts">import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';-import { AssetAction } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import type { TimelineAsset } from '$lib/managers/timeline-manager/types';import { handleError } from '$lib/utils/handle-error';import { AssetVisibility, updateAssets } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { mdiLockOpenVariantOutline, mdiLockOutline } from '@mdi/js';import { t } from 'svelte-i18n';import type { OnAction, PreAction } from './action';diff --git a/web/src/lib/components/asset-viewer/actions/share-action.svelte b/web/src/lib/components/asset-viewer/actions/share-action.svelteindex 5ab60fcb4c..25b3520d09 100644--- a/web/src/lib/components/asset-viewer/actions/share-action.svelte+++ b/web/src/lib/components/asset-viewer/actions/share-action.svelte@@ -1,10 +1,9 @@<script lang="ts">- import { modalManager } from '$lib/managers/modal-manager.svelte';import QrCodeModal from '$lib/modals/QrCodeModal.svelte';import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';import { makeSharedLinkUrl } from '$lib/utils';import type { AssetResponseDto } from '@immich/sdk';- import { IconButton } from '@immich/ui';+ import { IconButton, modalManager } from '@immich/ui';import { mdiShareVariantOutline } from '@mdi/js';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/asset-viewer/detail-panel-tags.svelte b/web/src/lib/components/asset-viewer/detail-panel-tags.svelteindex a6a080d52b..007e20b7c6 100644--- a/web/src/lib/components/asset-viewer/detail-panel-tags.svelte+++ b/web/src/lib/components/asset-viewer/detail-panel-tags.svelte@@ -3,10 +3,10 @@import Icon from '$lib/components/elements/icon.svelte';import { AppRoute } from '$lib/constants';import { authManager } from '$lib/managers/auth-manager.svelte';- 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 { modalManager } from '@immich/ui';import { mdiClose, mdiPlus } from '@mdi/js';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte b/web/src/lib/components/asset-viewer/face-editor/face-editor.svelteindex 0336e0a74d..0067088150 100644--- a/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte+++ b/web/src/lib/components/asset-viewer/face-editor/face-editor.svelte@@ -1,13 +1,12 @@<script lang="ts">import ImageThumbnail from '$lib/components/assets/thumbnail/image-thumbnail.svelte';import { notificationController } from '$lib/components/shared-components/notification/notification';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { assetViewingStore } from '$lib/stores/asset-viewing.store';import { isFaceEditMode } from '$lib/stores/face-edit.svelte';import { getPeopleThumbnailUrl } from '$lib/utils';import { handleError } from '$lib/utils/handle-error';import { createFace, getAllPeople, type PersonResponseDto } from '@immich/sdk';- import { Button, Input } from '@immich/ui';+ import { Button, Input, modalManager } from '@immich/ui';import { Canvas, InteractiveFabricObject, Rect } from 'fabric';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/asset-viewer/slideshow-bar.svelte b/web/src/lib/components/asset-viewer/slideshow-bar.svelteindex a52bcbf707..c2b2a63586 100644--- a/web/src/lib/components/asset-viewer/slideshow-bar.svelte+++ b/web/src/lib/components/asset-viewer/slideshow-bar.svelte@@ -2,10 +2,9 @@import { shortcuts } from '$lib/actions/shortcut';import ProgressBar from '$lib/components/shared-components/progress-bar/progress-bar.svelte';import { ProgressBarStatus } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import SlideshowSettingsModal from '$lib/modals/SlideshowSettingsModal.svelte';import { SlideshowNavigation, slideshowStore } from '$lib/stores/slideshow.store';- import { IconButton } from '@immich/ui';+ import { IconButton, modalManager } from '@immich/ui';import { mdiChevronLeft, mdiChevronRight, mdiClose, mdiCog, mdiFullscreen, mdiPause, mdiPlay } from '@mdi/js';import { onDestroy, onMount } from 'svelte';import { swipe } from 'svelte-gestures';diff --git a/web/src/lib/components/faces-page/merge-face-selector.svelte b/web/src/lib/components/faces-page/merge-face-selector.svelteindex 7eed929386..9102f9cc5a 100644--- a/web/src/lib/components/faces-page/merge-face-selector.svelte+++ b/web/src/lib/components/faces-page/merge-face-selector.svelte@@ -3,10 +3,9 @@import { page } from '$app/state';import Icon from '$lib/components/elements/icon.svelte';import { ActionQueryParameterValue, AppRoute, QueryParameter } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { handleError } from '$lib/utils/handle-error';import { getAllPeople, getPerson, mergePerson, type PersonResponseDto } from '@immich/sdk';- import { Button, IconButton } from '@immich/ui';+ import { Button, IconButton, modalManager } from '@immich/ui';import { mdiCallMerge, mdiMerge, mdiSwapHorizontal } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/faces-page/person-side-panel.svelte b/web/src/lib/components/faces-page/person-side-panel.svelteindex 154927194e..ccde32a652 100644--- a/web/src/lib/components/faces-page/person-side-panel.svelte+++ b/web/src/lib/components/faces-page/person-side-panel.svelte@@ -2,7 +2,6 @@import Icon from '$lib/components/elements/icon.svelte';import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';import { timeBeforeShowLoadingSpinner } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { assetViewingStore } from '$lib/stores/asset-viewing.store';import { photoViewerImgElement } from '$lib/stores/assets-store.svelte';import { boundingBoxesArray } from '$lib/stores/people.store';@@ -20,7 +19,7 @@type AssetFaceResponseDto,type PersonResponseDto,} from '@immich/sdk';- import { IconButton } from '@immich/ui';+ import { IconButton, modalManager } from '@immich/ui';import { mdiAccountOff, mdiArrowLeftThin, mdiPencil, mdiRestart, mdiTrashCan } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/forms/library-import-paths-form.svelte b/web/src/lib/components/forms/library-import-paths-form.svelteindex f83057bf67..96aee9e413 100644--- a/web/src/lib/components/forms/library-import-paths-form.svelte+++ b/web/src/lib/components/forms/library-import-paths-form.svelte@@ -1,10 +1,9 @@<script lang="ts">import Icon from '$lib/components/elements/icon.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import LibraryImportPathModal from '$lib/modals/LibraryImportPathModal.svelte';import type { ValidateLibraryImportPathResponseDto } from '@immich/sdk';import { validate, type LibraryResponseDto } from '@immich/sdk';- import { Button, IconButton } from '@immich/ui';+ import { Button, IconButton, modalManager } from '@immich/ui';import { mdiAlertOutline, mdiCheckCircleOutline, mdiPencilOutline, mdiRefresh } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/forms/library-scan-settings-form.svelte b/web/src/lib/components/forms/library-scan-settings-form.svelteindex 639771f8a9..2425c9f539 100644--- a/web/src/lib/components/forms/library-scan-settings-form.svelte+++ b/web/src/lib/components/forms/library-scan-settings-form.svelte@@ -1,8 +1,7 @@<script lang="ts">- import { modalManager } from '$lib/managers/modal-manager.svelte';import LibraryExclusionPatternModal from '$lib/modals/LibraryExclusionPatternModal.svelte';import { type LibraryResponseDto } from '@immich/sdk';- import { Button, IconButton } from '@immich/ui';+ import { Button, IconButton, modalManager } from '@immich/ui';import { mdiPencilOutline } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/photos-page/actions/add-to-album.svelte b/web/src/lib/components/photos-page/actions/add-to-album.svelteindex c00fd2e1c9..5ec2e879c9 100644--- a/web/src/lib/components/photos-page/actions/add-to-album.svelte+++ b/web/src/lib/components/photos-page/actions/add-to-album.svelte@@ -1,9 +1,9 @@<script lang="ts">import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import AlbumPickerModal from '$lib/modals/AlbumPickerModal.svelte';import type { OnAddToAlbum } from '$lib/utils/actions';import { addAssetsToAlbum } from '$lib/utils/asset-utils';+ import { modalManager } from '@immich/ui';import { mdiImageAlbum, mdiShareVariantOutline } from '@mdi/js';import { t } from 'svelte-i18n';import { getAssetControlContext } from '../asset-select-control-bar.svelte';diff --git a/web/src/lib/components/photos-page/actions/change-description-action.svelte b/web/src/lib/components/photos-page/actions/change-description-action.svelteindex 740bed78ef..c919efb2a9 100644--- a/web/src/lib/components/photos-page/actions/change-description-action.svelte+++ b/web/src/lib/components/photos-page/actions/change-description-action.svelte@@ -1,10 +1,10 @@<script lang="ts">- import { modalManager } from '$lib/managers/modal-manager.svelte';- import AssetUpdateDecriptionConfirmModal from '$lib/modals/AssetUpdateDecriptionConfirmModal.svelte';+ import AssetUpdateDescriptionConfirmModal from '$lib/modals/AssetUpdateDescriptionConfirmModal.svelte';import { user } from '$lib/stores/user.store';import { getSelectedAssets } from '$lib/utils/asset-utils';import { handleError } from '$lib/utils/handle-error';import { updateAssets } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { mdiText } from '@mdi/js';import { t } from 'svelte-i18n';import MenuOption from '../../shared-components/context-menu/menu-option.svelte';@@ -18,7 +18,7 @@const { clearSelect, getOwnedAssets } = getAssetControlContext();const handleUpdateDescription = async () => {- const description = await modalManager.show(AssetUpdateDecriptionConfirmModal);+ const description = await modalManager.show(AssetUpdateDescriptionConfirmModal);if (description) {const ids = getSelectedAssets(getOwnedAssets(), $user);diff --git a/web/src/lib/components/photos-page/actions/create-shared-link.svelte b/web/src/lib/components/photos-page/actions/create-shared-link.svelteindex 95e0277cb0..e49cce24e3 100644--- a/web/src/lib/components/photos-page/actions/create-shared-link.svelte+++ b/web/src/lib/components/photos-page/actions/create-shared-link.svelte@@ -1,12 +1,11 @@<script lang="ts">import { getAssetControlContext } from '$lib/components/photos-page/asset-select-control-bar.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import QrCodeModal from '$lib/modals/QrCodeModal.svelte';import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';import { makeSharedLinkUrl } from '$lib/utils';+ import { IconButton, modalManager } from '@immich/ui';import { mdiShareVariantOutline } from '@mdi/js';import { t } from 'svelte-i18n';- import { IconButton } from '@immich/ui';const { getAssets } = getAssetControlContext();diff --git a/web/src/lib/components/photos-page/actions/remove-from-album.svelte b/web/src/lib/components/photos-page/actions/remove-from-album.svelteindex 747cc1d01c..0ee8584a55 100644--- a/web/src/lib/components/photos-page/actions/remove-from-album.svelte+++ b/web/src/lib/components/photos-page/actions/remove-from-album.svelte@@ -3,9 +3,8 @@NotificationType,notificationController,} from '$lib/components/shared-components/notification/notification';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { getAlbumInfo, removeAssetFromAlbum, type AlbumResponseDto } from '@immich/sdk';- import { IconButton } from '@immich/ui';+ import { IconButton, modalManager } from '@immich/ui';import { mdiDeleteOutline, mdiImageRemoveOutline } from '@mdi/js';import { t } from 'svelte-i18n';import MenuOption from '../../shared-components/context-menu/menu-option.svelte';diff --git a/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte b/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelteindex 53dba07bbc..6c97e348a9 100644--- a/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte+++ b/web/src/lib/components/photos-page/actions/remove-from-shared-link.svelte@@ -1,13 +1,12 @@<script lang="ts">import { authManager } from '$lib/managers/auth-manager.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { handleError } from '$lib/utils/handle-error';import { removeSharedLinkAssets, type SharedLinkResponseDto } from '@immich/sdk';+ import { IconButton, modalManager } from '@immich/ui';import { mdiDeleteOutline } from '@mdi/js';import { t } from 'svelte-i18n';import { NotificationType, notificationController } from '../../shared-components/notification/notification';import { getAssetControlContext } from '../asset-select-control-bar.svelte';- import { IconButton } from '@immich/ui';interface Props {sharedLink: SharedLinkResponseDto;diff --git a/web/src/lib/components/photos-page/actions/set-visibility-action.svelte b/web/src/lib/components/photos-page/actions/set-visibility-action.svelteindex 04598ca79d..5ac183fd18 100644--- a/web/src/lib/components/photos-page/actions/set-visibility-action.svelte+++ b/web/src/lib/components/photos-page/actions/set-visibility-action.svelte@@ -1,12 +1,10 @@<script lang="ts">import { getAssetControlContext } from '$lib/components/photos-page/asset-select-control-bar.svelte';import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';-import type { OnSetVisibility } from '$lib/utils/actions';import { handleError } from '$lib/utils/handle-error';import { AssetVisibility, updateAssets } from '@immich/sdk';- import { Button } from '@immich/ui';+ import { Button, modalManager } from '@immich/ui';import { mdiLockOpenVariantOutline, mdiLockOutline } from '@mdi/js';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/photos-page/actions/tag-action.svelte b/web/src/lib/components/photos-page/actions/tag-action.svelteindex 5bad8ca327..a5079cc028 100644--- a/web/src/lib/components/photos-page/actions/tag-action.svelte+++ b/web/src/lib/components/photos-page/actions/tag-action.svelte@@ -1,8 +1,7 @@<script lang="ts">import { shortcut } from '$lib/actions/shortcut';- import { modalManager } from '$lib/managers/modal-manager.svelte';import AssetTagModal from '$lib/modals/AssetTagModal.svelte';- import { IconButton } from '@immich/ui';+ import { IconButton, modalManager } from '@immich/ui';import { mdiTagMultipleOutline } from '@mdi/js';import { t } from 'svelte-i18n';import MenuOption from '../../shared-components/context-menu/menu-option.svelte';diff --git a/web/src/lib/components/photos-page/asset-grid.svelte b/web/src/lib/components/photos-page/asset-grid.svelteindex 182b24f3eb..5ffb1e0bdf 100644--- a/web/src/lib/components/photos-page/asset-grid.svelte+++ b/web/src/lib/components/photos-page/asset-grid.svelte@@ -13,7 +13,6 @@import Scrubber from '$lib/components/shared-components/scrubber/scrubber.svelte';import { AppRoute, AssetAction } from '$lib/constants';import { authManager } from '$lib/managers/auth-manager.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import type { MonthGroup } from '$lib/managers/timeline-manager/month-group.svelte';import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';import type { TimelineAsset } from '$lib/managers/timeline-manager/types';@@ -37,6 +36,7 @@type TimelinePlainYearMonth,} from '$lib/utils/timeline-util';import { AssetVisibility, getAssetInfo, type AlbumResponseDto, type PersonResponseDto } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { DateTime } from 'luxon';import { onMount, type Snippet } from 'svelte';import type { UpdatePayload } from 'vite';@@ -729,7 +729,7 @@}isShortcutModalOpen = true;- await modalManager.show(ShortcutsModal);+ await modalManager.show(ShortcutsModal, {});isShortcutModalOpen = false;};diff --git a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelteindex 09998ed060..6e0c547b90 100644--- a/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte+++ b/web/src/lib/components/shared-components/gallery-viewer/gallery-viewer.svelte@@ -4,7 +4,6 @@import type { Action } from '$lib/components/asset-viewer/actions/action';import Thumbnail from '$lib/components/assets/thumbnail/thumbnail.svelte';import { AppRoute, AssetAction } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import type { TimelineAsset, Viewport } from '$lib/managers/timeline-manager/types';import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';import type { AssetInteraction } from '$lib/stores/asset-interaction.svelte';@@ -20,6 +19,7 @@import { navigate } from '$lib/utils/navigation';import { isTimelineAsset, toTimelineAsset } from '$lib/utils/timeline-util';import { AssetVisibility, type AssetResponseDto } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { debounce } from 'lodash-es';import { t } from 'svelte-i18n';import AssetViewer from '../../asset-viewer/asset-viewer.svelte';diff --git a/web/src/lib/components/shared-components/map/map.svelte b/web/src/lib/components/shared-components/map/map.svelteindex d5b531dfc7..8e3a37cbf0 100644--- a/web/src/lib/components/shared-components/map/map.svelte+++ b/web/src/lib/components/shared-components/map/map.svelte@@ -10,13 +10,13 @@import { afterNavigate } from '$app/navigation';import Icon from '$lib/components/elements/icon.svelte';import { Theme } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { themeManager } from '$lib/managers/theme-manager.svelte';import MapSettingsModal from '$lib/modals/MapSettingsModal.svelte';import { mapSettings } from '$lib/stores/preferences.store';import { serverConfig } from '$lib/stores/server-config.store';import { getAssetThumbnailUrl, handlePromiseError } from '$lib/utils';import { getMapMarkers, type MapMarkerResponseDto } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import mapboxRtlUrl from '@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js?url';import { mdiCog, mdiMap, mdiMapMarker } from '@mdi/js';import type { Feature, GeoJsonProperties, Geometry, Point } from 'geojson';diff --git a/web/src/lib/components/shared-components/modal-header.svelte b/web/src/lib/components/shared-components/modal-header.sveltedeleted file mode 100644index 57dbba87e0..0000000000--- a/web/src/lib/components/shared-components/modal-header.svelte+++ /dev/null@@ -1,49 +0,0 @@-<script lang="ts">- import Icon from '$lib/components/elements/icon.svelte';- import ImmichLogo from '$lib/components/shared-components/immich-logo.svelte';- import { IconButton } from '@immich/ui';- import { mdiClose } from '@mdi/js';- import { t } from 'svelte-i18n';-- interface Props {- /**- * Unique identifier for the header text.- */- id: string;- title: string;- onClose: () => void;- /**- * If true, the logo will be displayed next to the modal title.- */- showLogo?: boolean;- /**- * Optional icon to display next to the modal title, if `showLogo` is false.- */- icon?: string;- }-- let { id, title, onClose, showLogo = false, icon = undefined }: Props = $props();-</script>--<div class="flex place-items-center justify-between px-5 pb-3">- <div class="flex gap-2 place-items-center">- {#if showLogo}- <ImmichLogo noText={true} class="h-[40px]" />- {:else if icon}- <Icon path={icon} size={24} ariaHidden={true} class="text-immich-primary dark:text-immich-dark-primary" />- {/if}- <h1 {id}>- {title}- </h1>- </div>-- <IconButton- shape="round"- color="secondary"- variant="ghost"- onclick={onClose}- icon={mdiClose}- size="medium"- aria-label={$t('close')}- />-</div>diff --git a/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelte b/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelteindex b079ecb241..b1746932b1 100644--- a/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelte+++ b/web/src/lib/components/shared-components/navigation-bar/account-info-panel.svelte@@ -3,13 +3,12 @@import { focusTrap } from '$lib/actions/focus-trap';import Icon from '$lib/components/elements/icon.svelte';import { AppRoute } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import AvatarEditModal from '$lib/modals/AvatarEditModal.svelte';import HelpAndFeedbackModal from '$lib/modals/HelpAndFeedbackModal.svelte';import { user } from '$lib/stores/user.store';import { userInteraction } from '$lib/stores/user.svelte';import { getAboutInfo, type ServerAboutResponseDto } from '@immich/sdk';- import { Button, IconButton } from '@immich/ui';+ import { Button, IconButton, modalManager } from '@immich/ui';import { mdiCog, mdiLogout, mdiPencil, mdiWrench } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/shared-components/search-bar/search-bar.svelte b/web/src/lib/components/shared-components/search-bar/search-bar.svelteindex 9f36431f19..4c807e7652 100644--- a/web/src/lib/components/shared-components/search-bar/search-bar.svelte+++ b/web/src/lib/components/shared-components/search-bar/search-bar.svelte@@ -3,14 +3,13 @@import { focusOutside } from '$lib/actions/focus-outside';import { shortcuts } from '$lib/actions/shortcut';import { AppRoute } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import SearchFilterModal from '$lib/modals/SearchFilterModal.svelte';import { searchStore } from '$lib/stores/search.svelte';import { handlePromiseError } from '$lib/utils';import { generateId } from '$lib/utils/generate-id';import { getMetadataSearchQuery } from '$lib/utils/metadata-search';import type { MetadataSearchDto, SmartSearchDto } from '@immich/sdk';- import { IconButton } from '@immich/ui';+ import { IconButton, modalManager } from '@immich/ui';import { mdiClose, mdiMagnify, mdiTune } from '@mdi/js';import { onDestroy, tick } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/shared-components/side-bar/purchase-info.svelte b/web/src/lib/components/shared-components/side-bar/purchase-info.svelteindex 627292ea1b..f21cc7de4d 100644--- a/web/src/lib/components/shared-components/side-bar/purchase-info.svelte+++ b/web/src/lib/components/shared-components/side-bar/purchase-info.svelte@@ -5,7 +5,6 @@import Portal from '$lib/components/shared-components/portal/portal.svelte';import SupporterBadge from '$lib/components/shared-components/side-bar/supporter-badge.svelte';import { AppRoute } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import PurchaseModal from '$lib/modals/PurchaseModal.svelte';import { purchaseStore } from '$lib/stores/purchase.store';import { preferences } from '$lib/stores/user.store';@@ -13,11 +12,11 @@import { handleError } from '$lib/utils/handle-error';import { getButtonVisibility } from '$lib/utils/purchase-utils';import { updateMyPreferences } from '@immich/sdk';- import { Button, IconButton } from '@immich/ui';+ import { Button, IconButton, modalManager } from '@immich/ui';import { mdiClose, mdiInformationOutline } from '@mdi/js';import { t } from 'svelte-i18n';- import { fade } from 'svelte/transition';import { SvelteDate } from 'svelte/reactivity';+ import { fade } from 'svelte/transition';let showMessage = $state(false);let hoverMessage = $state(false);diff --git a/web/src/lib/components/shared-components/side-bar/server-status.svelte b/web/src/lib/components/shared-components/side-bar/server-status.svelteindex 0a9f3d9d8c..3c3da8eb5f 100644--- a/web/src/lib/components/shared-components/side-bar/server-status.svelte+++ b/web/src/lib/components/shared-components/side-bar/server-status.svelte@@ -1,6 +1,5 @@<script lang="ts">import Icon from '$lib/components/elements/icon.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import ServerAboutModal from '$lib/modals/ServerAboutModal.svelte';import { userInteraction } from '$lib/stores/user.svelte';import { websocketStore } from '$lib/stores/websocket';@@ -11,6 +10,7 @@type ServerAboutResponseDto,type ServerVersionHistoryResponseDto,} from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { mdiAlert } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/user-settings-page/device-list.svelte b/web/src/lib/components/user-settings-page/device-list.svelteindex a56f4cc316..4635913c24 100644--- a/web/src/lib/components/user-settings-page/device-list.svelte+++ b/web/src/lib/components/user-settings-page/device-list.svelte@@ -1,7 +1,6 @@<script lang="ts">- import { modalManager } from '$lib/managers/modal-manager.svelte';import { deleteAllSessions, deleteSession, getSessions, type SessionResponseDto } from '@immich/sdk';- import { Button } from '@immich/ui';+ import { Button, modalManager } from '@immich/ui';import { t } from 'svelte-i18n';import { handleError } from '../../utils/handle-error';import { notificationController, NotificationType } from '../shared-components/notification/notification';diff --git a/web/src/lib/components/user-settings-page/partner-settings.svelte b/web/src/lib/components/user-settings-page/partner-settings.svelteindex 6a221a1b3b..586cdf4afa 100644--- a/web/src/lib/components/user-settings-page/partner-settings.svelte+++ b/web/src/lib/components/user-settings-page/partner-settings.svelte@@ -1,7 +1,6 @@<script lang="ts">import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import PartnerSelectionModal from '$lib/modals/PartnerSelectionModal.svelte';import {createPartner,@@ -12,7 +11,7 @@type PartnerResponseDto,type UserResponseDto,} from '@immich/sdk';- import { Button, IconButton } from '@immich/ui';+ import { Button, IconButton, modalManager } from '@immich/ui';import { mdiCheck, mdiClose } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/components/user-settings-page/user-api-key-list.svelte b/web/src/lib/components/user-settings-page/user-api-key-list.svelteindex 5958015c0f..a5281cb430 100644--- a/web/src/lib/components/user-settings-page/user-api-key-list.svelte+++ b/web/src/lib/components/user-settings-page/user-api-key-list.svelte@@ -1,11 +1,10 @@<script lang="ts">import { dateFormats } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import ApiKeyModal from '$lib/modals/ApiKeyModal.svelte';import ApiKeySecretModal from '$lib/modals/ApiKeySecretModal.svelte';import { locale } from '$lib/stores/preferences.store';import { createApiKey, deleteApiKey, getApiKeys, updateApiKey, type ApiKeyResponseDto } from '@immich/sdk';- import { Button, IconButton } from '@immich/ui';+ import { Button, IconButton, modalManager } from '@immich/ui';import { mdiPencilOutline, mdiTrashCanOutline } from '@mdi/js';import { t } from 'svelte-i18n';import { fade } from 'svelte/transition';diff --git a/web/src/lib/components/user-settings-page/user-purchase-settings.svelte b/web/src/lib/components/user-settings-page/user-purchase-settings.svelteindex 2690559d89..69825dcfda 100644--- a/web/src/lib/components/user-settings-page/user-purchase-settings.svelte+++ b/web/src/lib/components/user-settings-page/user-purchase-settings.svelte@@ -5,7 +5,6 @@import PurchaseContent from '$lib/components/shared-components/purchasing/purchase-content.svelte';import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';import { dateFormats } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { locale } from '$lib/stores/preferences.store';import { purchaseStore } from '$lib/stores/purchase.store';import { preferences, user } from '$lib/stores/user.store';@@ -20,7 +19,7 @@isHttpError,type LicenseResponseDto,} from '@immich/sdk';- import { Button } from '@immich/ui';+ import { Button, modalManager } from '@immich/ui';import { mdiKey } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/managers/modal-manager.svelte.ts b/web/src/lib/managers/modal-manager.svelte.tsdeleted file mode 100644index 5b3babc84d..0000000000--- a/web/src/lib/managers/modal-manager.svelte.ts+++ /dev/null@@ -1,53 +0,0 @@-import { ConfirmModal } from '@immich/ui';-import { mount, unmount, type Component, type ComponentProps } from 'svelte';--type OnCloseData<T> = T extends { onClose: (data?: infer R) => void }- ? R | undefined- : T extends { onClose: (data: infer R) => void }- ? R- : never;-type ExtendsEmptyObject<T> = keyof T extends never ? never : T;-type StripValueIfOptional<T> = T extends undefined ? undefined : T;--// if the modal does not expect any props, makes the props param optional but also allows passing `{}` and `undefined`-type OptionalParamIfEmpty<T> = ExtendsEmptyObject<T> extends never ? [] | [Record<string, never> | undefined] : [T];--class ModalManager {- show<T extends object>(Component: Component<T>, ...props: OptionalParamIfEmpty<Omit<T, 'onClose'>>) {- return this.open(Component, ...props).onClose;- }-- open<T extends object, K = OnCloseData<T>>(- Component: Component<T>,- ...props: OptionalParamIfEmpty<Omit<T, 'onClose'>>- ) {- let modal: object = {};- let onClose: (...args: [StripValueIfOptional<K>]) => Promise<void>;-- const deferred = new Promise<StripValueIfOptional<K>>((resolve) => {- onClose = async (...args: [StripValueIfOptional<K>]) => {- await unmount(modal);- setTimeout(() => resolve(args?.[0]), 0);- };-- modal = mount(Component, {- target: document.body,- props: {- ...((props?.[0] ?? {}) as T),- onClose,- },- });- });-- return {- onClose: deferred,- close: (...args: [StripValueIfOptional<K>]) => onClose(args[0]),- };- }-- showDialog(options: Omit<ComponentProps<typeof ConfirmModal>, 'onClose'>) {- return this.show(ConfirmModal, options);- }-}--export const modalManager = new ModalManager();diff --git a/web/src/lib/modals/AlbumOptionsModal.svelte b/web/src/lib/modals/AlbumOptionsModal.svelteindex f9c9cab204..e56fe784a6 100644--- a/web/src/lib/modals/AlbumOptionsModal.svelte+++ b/web/src/lib/modals/AlbumOptionsModal.svelte@@ -4,7 +4,6 @@import MenuOption from '$lib/components/shared-components/context-menu/menu-option.svelte';import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { handleError } from '$lib/utils/handle-error';import {AlbumUserRole,@@ -15,7 +14,7 @@type AlbumResponseDto,type UserResponseDto,} from '@immich/sdk';- import { Modal, ModalBody } from '@immich/ui';+ import { Modal, ModalBody, modalManager } from '@immich/ui';import { mdiArrowDownThin, mdiArrowUpThin, mdiDotsVertical, mdiPlus } from '@mdi/js';import { findKey } from 'lodash-es';import { t } from 'svelte-i18n';diff --git a/web/src/lib/modals/AlbumUsersModal.svelte b/web/src/lib/modals/AlbumUsersModal.svelteindex 4f1b8aa94d..32c8cd28cf 100644--- a/web/src/lib/modals/AlbumUsersModal.svelte+++ b/web/src/lib/modals/AlbumUsersModal.svelte@@ -6,7 +6,6 @@notificationController,} from '$lib/components/shared-components/notification/notification';import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { handleError } from '$lib/utils/handle-error';import {AlbumUserRole,@@ -16,7 +15,7 @@type AlbumResponseDto,type UserResponseDto,} from '@immich/sdk';- import { Modal, ModalBody } from '@immich/ui';+ import { Modal, ModalBody, modalManager } from '@immich/ui';import { mdiDotsVertical } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte b/web/src/lib/modals/AssetUpdateDescriptionConfirmModal.sveltesimilarity index 100%rename from web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelterename to web/src/lib/modals/AssetUpdateDescriptionConfirmModal.sveltediff --git a/web/src/lib/utils/album-utils.ts b/web/src/lib/utils/album-utils.tsindex 1a4097b78d..0cb8b7fc04 100644--- a/web/src/lib/utils/album-utils.ts+++ b/web/src/lib/utils/album-utils.ts@@ -1,6 +1,5 @@import { goto } from '$app/navigation';import { AppRoute } from '$lib/constants';-import { modalManager } from '$lib/managers/modal-manager.svelte';import {AlbumFilter,AlbumGroupBy,@@ -13,6 +12,7 @@ import {import { handleError } from '$lib/utils/handle-error';import type { AlbumResponseDto } from '@immich/sdk';import * as sdk from '@immich/sdk';+import { modalManager } from '@immich/ui';import { orderBy } from 'lodash-es';import { t } from 'svelte-i18n';import { get } from 'svelte/store';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 aa535a30ee..5b644f251a 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@@ -34,7 +34,6 @@import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';import { AlbumPageViewMode, AppRoute } from '$lib/constants';import { activityManager } from '$lib/managers/activity-manager.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';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';@@ -70,7 +69,7 @@updateAlbumInfo,type AlbumUserAddDto,} from '@immich/sdk';- import { Button, IconButton } from '@immich/ui';+ import { Button, IconButton, modalManager } from '@immich/ui';import {mdiArrowLeft,mdiCogOutline,diff --git a/web/src/routes/(user)/people/+page.svelte b/web/src/routes/(user)/people/+page.svelteindex 014614094e..0f2284ce34 100644--- a/web/src/routes/(user)/people/+page.svelte+++ b/web/src/routes/(user)/people/+page.svelte@@ -15,7 +15,6 @@NotificationType,} from '$lib/components/shared-components/notification/notification';import { ActionQueryParameterValue, AppRoute, QueryParameter, SessionStorageKey } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import PersonEditBirthDateModal from '$lib/modals/PersonEditBirthDateModal.svelte';import PersonMergeSuggestionModal from '$lib/modals/PersonMergeSuggestionModal.svelte';import { locale } from '$lib/stores/preferences.store';@@ -24,7 +23,7 @@import { handleError } from '$lib/utils/handle-error';import { clearQueryParam } from '$lib/utils/navigation';import { getAllPeople, getPerson, searchPerson, updatePerson, type PersonResponseDto } from '@immich/sdk';- import { Button } from '@immich/ui';+ import { Button, modalManager } from '@immich/ui';import { mdiAccountOff, mdiEyeOutline } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelteindex a4a0050de6..807819b585 100644--- a/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/people/[personId]/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -31,7 +31,6 @@notificationController,} from '$lib/components/shared-components/notification/notification';import { AppRoute, PersonPageViewMode, QueryParameter, SessionStorageKey } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';import type { TimelineAsset } from '$lib/managers/timeline-manager/types';import PersonEditBirthDateModal from '$lib/modals/PersonEditBirthDateModal.svelte';@@ -51,6 +50,7 @@updatePerson,type PersonResponseDto,} from '@immich/sdk';+ import { modalManager } from '@immich/ui';import {mdiAccountBoxOutline,mdiAccountMultipleCheckOutline,diff --git a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelteindex 7062966b71..2f732646ec 100644--- a/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte+++ b/web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte@@ -9,10 +9,10 @@} from '$lib/components/shared-components/notification/notification';import SharedLinkCard from '$lib/components/sharedlinks-page/shared-link-card.svelte';import { AppRoute } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import SharedLinkCreateModal from '$lib/modals/SharedLinkCreateModal.svelte';import { handleError } from '$lib/utils/handle-error';import { getAllSharedLinks, removeSharedLink, SharedLinkType, type SharedLinkResponseDto } from '@immich/sdk';+ import { modalManager } from '@immich/ui';import { onMount } from 'svelte';import { t } from 'svelte-i18n';import type { PageData } from './$types';diff --git a/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelteindex 503ea72d54..32e910e4a9 100644--- a/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/tags/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -8,14 +8,13 @@import TreeItems from '$lib/components/shared-components/tree/tree-items.svelte';import Sidebar from '$lib/components/sidebar/sidebar.svelte';import { AppRoute, AssetAction, QueryParameter } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';import TagCreateModal from '$lib/modals/TagCreateModal.svelte';import TagEditModal from '$lib/modals/TagEditModal.svelte';import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';import { joinPaths, TreeNode } from '$lib/utils/tree-utils';import { deleteTag, getAllTags, type TagResponseDto } from '@immich/sdk';- import { Button, HStack, Text } from '@immich/ui';+ import { Button, HStack, modalManager, Text } from '@immich/ui';import { mdiPencil, mdiPlus, mdiTag, mdiTagMultiple, mdiTrashCanOutline } from '@mdi/js';import { onDestroy } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelteindex bae1786891..2989a78a13 100644--- a/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/trash/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -9,18 +9,17 @@import AssetSelectControlBar from '$lib/components/photos-page/asset-select-control-bar.svelte';import EmptyPlaceholder from '$lib/components/shared-components/empty-placeholder.svelte';import {- NotificationType,notificationController,+ NotificationType,} from '$lib/components/shared-components/notification/notification';import { AppRoute } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';import { AssetInteraction } from '$lib/stores/asset-interaction.svelte';import { featureFlags, serverConfig } from '$lib/stores/server-config.store';import { handlePromiseError } from '$lib/utils';import { handleError } from '$lib/utils/handle-error';import { emptyTrash, restoreTrash } from '@immich/sdk';- import { Button, HStack, Text } from '@immich/ui';+ import { Button, HStack, modalManager, Text } from '@immich/ui';import { mdiDeleteForeverOutline, mdiHistory } from '@mdi/js';import { onDestroy } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/routes/(user)/user-settings/+page.svelte b/web/src/routes/(user)/user-settings/+page.svelteindex fb3af28823..43c214fd07 100644--- a/web/src/routes/(user)/user-settings/+page.svelte+++ b/web/src/routes/(user)/user-settings/+page.svelte@@ -1,9 +1,8 @@<script lang="ts">import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';import UserSettingsList from '$lib/components/user-settings-page/user-settings-list.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';- import { Container, IconButton } from '@immich/ui';+ import { Container, IconButton, modalManager } from '@immich/ui';import { mdiKeyboard } from '@mdi/js';import { t } from 'svelte-i18n';import type { PageData } from './$types';diff --git a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelteindex f15a20f6d3..67354d894d 100644--- a/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte+++ b/web/src/routes/(user)/utilities/duplicates/[[photos=photos]]/[[assetId=id]]/+page.svelte@@ -1,11 +1,10 @@<script lang="ts">import UserPageLayout from '$lib/components/layouts/user-page-layout.svelte';import {- NotificationType,notificationController,+ NotificationType,} from '$lib/components/shared-components/notification/notification';import DuplicatesCompareControl from '$lib/components/utilities-page/duplicates/duplicates-compare-control.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import DuplicatesInformationModal from '$lib/modals/DuplicatesInformationModal.svelte';import ShortcutsModal from '$lib/modals/ShortcutsModal.svelte';import { locale } from '$lib/stores/preferences.store';@@ -15,7 +14,7 @@import { handleError } from '$lib/utils/handle-error';import type { AssetResponseDto } from '@immich/sdk';import { deleteAssets, deleteDuplicates, updateAssets } from '@immich/sdk';- import { Button, HStack, IconButton, Text } from '@immich/ui';+ import { Button, HStack, IconButton, modalManager, Text } from '@immich/ui';import { mdiCheckOutline, mdiInformationOutline, mdiKeyboard, mdiTrashCanOutline } from '@mdi/js';import { t } from 'svelte-i18n';import type { PageData } from './$types';diff --git a/web/src/routes/+layout.svelte b/web/src/routes/+layout.svelteindex 6e1c193276..71958d9d9f 100644--- a/web/src/routes/+layout.svelte+++ b/web/src/routes/+layout.svelte@@ -9,7 +9,6 @@import NotificationList from '$lib/components/shared-components/notification/notification-list.svelte';import UploadPanel from '$lib/components/shared-components/upload-panel.svelte';import { eventManager } from '$lib/managers/event-manager.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import VersionAnnouncementModal from '$lib/modals/VersionAnnouncementModal.svelte';import { serverConfig } from '$lib/stores/server-config.store';import { user } from '$lib/stores/user.store';@@ -22,7 +21,7 @@import { copyToClipboard } from '$lib/utils';import { isAssetViewerRoute } from '$lib/utils/navigation';import type { ServerVersionResponseDto } from '@immich/sdk';- import { setTranslations } from '@immich/ui';+ import { modalManager, setTranslations } from '@immich/ui';import { onMount, type Snippet } from 'svelte';import { t } from 'svelte-i18n';import { run } from 'svelte/legacy';diff --git a/web/src/routes/admin/jobs-status/+page.svelte b/web/src/routes/admin/jobs-status/+page.svelteindex 9985fd949d..d1bd4e41d0 100644--- a/web/src/routes/admin/jobs-status/+page.svelte+++ b/web/src/routes/admin/jobs-status/+page.svelte@@ -2,11 +2,10 @@import JobsPanel from '$lib/components/admin-page/jobs/jobs-panel.svelte';import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';import { AppRoute } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import JobCreateModal from '$lib/modals/JobCreateModal.svelte';import { asyncTimeout } from '$lib/utils';import { getAllJobsStatus, type AllJobStatusResponseDto } from '@immich/sdk';- import { Button, HStack, Text } from '@immich/ui';+ import { Button, HStack, modalManager, Text } from '@immich/ui';import { mdiCog, mdiPlus } from '@mdi/js';import { onDestroy, onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/routes/admin/library-management/+page.svelte b/web/src/routes/admin/library-management/+page.svelteindex 3d8792749c..d16fc4bc7c 100644--- a/web/src/routes/admin/library-management/+page.svelte+++ b/web/src/routes/admin/library-management/+page.svelte@@ -10,7 +10,6 @@notificationController,NotificationType,} from '$lib/components/shared-components/notification/notification';- import { modalManager } from '$lib/managers/modal-manager.svelte';import LibraryImportPathModal from '$lib/modals/LibraryImportPathModal.svelte';import LibraryRenameModal from '$lib/modals/LibraryRenameModal.svelte';import LibraryUserPickerModal from '$lib/modals/LibraryUserPickerModal.svelte';@@ -32,7 +31,7 @@type LibraryStatsResponseDto,type UserResponseDto,} from '@immich/sdk';- import { Button, Text } from '@immich/ui';+ import { Button, modalManager, Text } from '@immich/ui';import { mdiDotsVertical, mdiPlusBoxOutline, mdiSync } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';diff --git a/web/src/routes/admin/users/+page.svelte b/web/src/routes/admin/users/+page.svelteindex 3ebc67dabf..4ed91147da 100644--- a/web/src/routes/admin/users/+page.svelte+++ b/web/src/routes/admin/users/+page.svelte@@ -7,7 +7,6 @@notificationController,} from '$lib/components/shared-components/notification/notification';import { AppRoute } from '$lib/constants';- import { modalManager } from '$lib/managers/modal-manager.svelte';import UserCreateModal from '$lib/modals/UserCreateModal.svelte';import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte';import UserRestoreConfirmModal from '$lib/modals/UserRestoreConfirmModal.svelte';@@ -17,7 +16,7 @@import { websocketEvents } from '$lib/stores/websocket';import { getByteUnitString } from '$lib/utils/byte-units';import { UserStatus, searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk';- import { Button, HStack, IconButton, Text } from '@immich/ui';+ import { Button, HStack, IconButton, Text, modalManager } from '@immich/ui';import { mdiDeleteRestore, mdiEyeOutline, mdiInfinity, mdiPlusBoxOutline, mdiTrashCanOutline } from '@mdi/js';import { DateTime } from 'luxon';import { onMount } from 'svelte';diff --git a/web/src/routes/admin/users/[id]/+page.svelte b/web/src/routes/admin/users/[id]/+page.svelteindex 79e76e5d0f..960b006d4b 100644--- a/web/src/routes/admin/users/[id]/+page.svelte+++ b/web/src/routes/admin/users/[id]/+page.svelte@@ -1,12 +1,12 @@<script lang="ts">import StatsCard from '$lib/components/admin-page/server-stats/stats-card.svelte';+ import FeatureSetting from '$lib/components/admin-page/user/feature-setting.svelte';import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';import {notificationController,NotificationType,} from '$lib/components/shared-components/notification/notification';import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';- import { modalManager } from '$lib/managers/modal-manager.svelte';import PasswordResetSuccessModal from '$lib/modals/PasswordResetSuccessModal.svelte';import UserDeleteConfirmModal from '$lib/modals/UserDeleteConfirmModal.svelte';import UserEditModal from '$lib/modals/UserEditModal.svelte';@@ -29,6 +29,7 @@Heading,HStack,Icon,+ modalManager,Stack,Text,} from '@immich/ui';@@ -48,7 +49,6 @@} from '@mdi/js';import { t } from 'svelte-i18n';import type { PageData } from './$types';- import FeatureSetting from '$lib/components/admin-page/user/feature-setting.svelte';interface Props {data: PageData;