High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor: more elements (#22095)
Jason Rasmussen75322179fd31
diff --git a/web/src/app.d.ts b/web/src/app.d.tsindex d0d25443c9..e0631e3617 100644--- a/web/src/app.d.ts+++ b/web/src/app.d.ts@@ -36,7 +36,7 @@ type NestedKeys<T, K = keyof T> = K extends keyof T & string: never;declare module 'svelte-i18n' {- import type { InterpolationValues } from '$lib/components/i18n/format-message.svelte';+ import type { InterpolationValues } from '$lib/elements/format-message.svelte';import type { Readable } from 'svelte/store';type Translations = NestedKeys<typeof en>;diff --git a/web/src/lib/components/admin-page/jobs/storage-migration-description.svelte b/web/src/lib/components/admin-page/jobs/storage-migration-description.svelteindex b47df1daae..f7f2669db5 100644--- a/web/src/lib/components/admin-page/jobs/storage-migration-description.svelte+++ b/web/src/lib/components/admin-page/jobs/storage-migration-description.svelte@@ -1,6 +1,6 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';import { AppRoute, OpenSettingQueryParameterValue, QueryParameter } from '$lib/constants';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';import { t } from 'svelte-i18n';</script>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 07a0e3952c..5acd096dd5 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@@ -1,5 +1,4 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';import {notificationController,NotificationType,@@ -10,6 +9,7 @@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 FormatMessage from '$lib/elements/FormatMessage.svelte';import AuthDisableLoginConfirmModal from '$lib/modals/AuthDisableLoginConfirmModal.svelte';import { handleError } from '$lib/utils/handle-error';import { OAuthTokenEndpointAuthMethod, unlinkAllOAuthAccountsAdmin, type SystemConfigDto } from '@immich/sdk';diff --git a/web/src/lib/components/admin-page/settings/backup-settings/backup-settings.svelte b/web/src/lib/components/admin-page/settings/backup-settings/backup-settings.svelteindex 61f4cafe87..469d0b648a 100644--- a/web/src/lib/components/admin-page/settings/backup-settings/backup-settings.svelte+++ b/web/src/lib/components/admin-page/settings/backup-settings/backup-settings.svelte@@ -1,15 +1,15 @@<script lang="ts">+ import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';+ import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';+ 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 FormatMessage from '$lib/elements/FormatMessage.svelte';import type { SystemConfigDto } from '@immich/sdk';import { isEqual } from 'lodash-es';+ import { t } from 'svelte-i18n';import { fade } from 'svelte/transition';import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';- import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';- import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';- import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';- import SettingSelect from '$lib/components/shared-components/settings/setting-select.svelte';- import { t } from 'svelte-i18n';- import FormatMessage from '$lib/components/i18n/format-message.svelte';- import { SettingInputFieldType } from '$lib/constants';interface Props {savedConfig: SystemConfigDto;diff --git a/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte b/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelteindex e9c8b924ca..ff4154f7d1 100644--- a/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte+++ b/web/src/lib/components/admin-page/settings/ffmpeg/ffmpeg-settings.svelte@@ -1,5 +1,4 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';import SettingCheckboxes from '$lib/components/shared-components/settings/setting-checkboxes.svelte';@@ -7,6 +6,7 @@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 FormatMessage from '$lib/elements/FormatMessage.svelte';import Icon from '$lib/elements/Icon.svelte';import {AudioCodec,diff --git a/web/src/lib/components/admin-page/settings/library-settings/library-settings.svelte b/web/src/lib/components/admin-page/settings/library-settings/library-settings.svelteindex 390b167a54..687ad5fd88 100644--- a/web/src/lib/components/admin-page/settings/library-settings/library-settings.svelte+++ b/web/src/lib/components/admin-page/settings/library-settings/library-settings.svelte@@ -1,16 +1,16 @@<script lang="ts">- import type { SystemConfigDto } from '@immich/sdk';- import { isEqual } from 'lodash-es';- import { fade } from 'svelte/transition';- import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';- import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';- import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';- import { t } from 'svelte-i18n';- import FormatMessage from '$lib/components/i18n/format-message.svelte';+ import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';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 FormatMessage from '$lib/elements/FormatMessage.svelte';+ import type { SystemConfigDto } from '@immich/sdk';+ import { isEqual } from 'lodash-es';+ import { t } from 'svelte-i18n';+ import { fade } from 'svelte/transition';+ import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';interface Props {savedConfig: SystemConfigDto;diff --git a/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte b/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelteindex acc920981b..6d9c73ce50 100644--- a/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte+++ b/web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte@@ -1,11 +1,11 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';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 FormatMessage from '$lib/elements/FormatMessage.svelte';import { featureFlags } from '$lib/stores/server-config.store';import type { SystemConfigDto } from '@immich/sdk';import { Button, IconButton } from '@immich/ui';diff --git a/web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte b/web/src/lib/components/admin-page/settings/map-settings/map-settings.svelteindex 7046196c31..59675d3ad6 100644--- a/web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte+++ b/web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte@@ -1,15 +1,15 @@<script lang="ts">- import type { SystemConfigDto } from '@immich/sdk';- import { isEqual } from 'lodash-es';- import { fade } from 'svelte/transition';- import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';import SettingAccordion from '$lib/components/shared-components/settings/setting-accordion.svelte';import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';- import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';- import { t } from 'svelte-i18n';- import FormatMessage from '$lib/components/i18n/format-message.svelte';+ import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';import { SettingInputFieldType } from '$lib/constants';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';+ import type { SystemConfigDto } from '@immich/sdk';+ import { isEqual } from 'lodash-es';+ import { t } from 'svelte-i18n';+ import { fade } from 'svelte/transition';+ import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';interface Props {savedConfig: SystemConfigDto;diff --git a/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte b/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelteindex da7ae082d2..f7b536bd18 100644--- a/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte+++ b/web/src/lib/components/admin-page/settings/storage-template/storage-template-settings.svelte@@ -1,9 +1,10 @@<script lang="ts">- import { createBubbler, preventDefault } from 'svelte/legacy';-- const bubble = createBubbler();import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';+ import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';+ import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';+ import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';import { AppRoute, SettingInputFieldType } from '$lib/constants';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';import { user } from '$lib/stores/user.store';import {getStorageTemplateOptions,@@ -13,16 +14,13 @@import handlebar from 'handlebars';import { isEqual } from 'lodash-es';import * as luxon from 'luxon';+ import type { Snippet } from 'svelte';+ import { t } from 'svelte-i18n';+ import { createBubbler, preventDefault } from 'svelte/legacy';import { fade } from 'svelte/transition';import type { SettingsResetEvent, SettingsSaveEvent } from '../admin-settings';import SupportedDatetimePanel from './supported-datetime-panel.svelte';import SupportedVariablesPanel from './supported-variables-panel.svelte';- import SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte';- import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte';- import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';- import { t } from 'svelte-i18n';- import FormatMessage from '$lib/components/i18n/format-message.svelte';- import type { Snippet } from 'svelte';interface Props {savedConfig: SystemConfigDto;@@ -48,6 +46,7 @@children,}: Props = $props();+ const bubble = createBubbler();let templateOptions: SystemConfigTemplateStorageOptionDto | undefined = $state();let selectedPreset = $state('');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 a02bb9372d..b32cd13696 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@@ -1,8 +1,8 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';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 FormatMessage from '$lib/elements/FormatMessage.svelte';import Icon from '$lib/elements/Icon.svelte';import EmailTemplatePreviewModal from '$lib/modals/EmailTemplatePreviewModal.svelte';import { handleError } from '$lib/utils/handle-error';diff --git a/web/src/lib/components/asset-viewer/detail-panel-star-rating.svelte b/web/src/lib/components/asset-viewer/detail-panel-star-rating.svelteindex d333d73be1..15bf1f21d6 100644--- a/web/src/lib/components/asset-viewer/detail-panel-star-rating.svelte+++ b/web/src/lib/components/asset-viewer/detail-panel-star-rating.svelte@@ -1,5 +1,5 @@<script lang="ts">- import StarRating from '$lib/components/shared-components/star-rating.svelte';+ import StarRating from '$lib/elements/StarRating.svelte';import { authManager } from '$lib/managers/auth-manager.svelte';import { preferences } from '$lib/stores/user.store';import { handlePromiseError } from '$lib/utils';diff --git a/web/src/lib/components/i18n/format-bold-message.svelte b/web/src/lib/components/i18n/format-bold-message.sveltedeleted file mode 100644index ab497add33..0000000000--- a/web/src/lib/components/i18n/format-bold-message.svelte+++ /dev/null@@ -1,20 +0,0 @@-<script lang="ts">- import type { InterpolationValues } from '$lib/components/i18n/format-message';- import FormatMessage from '$lib/components/i18n/format-message.svelte';- import type { Translations } from 'svelte-i18n';-- interface Props {- key: Translations;- values?: InterpolationValues;- }-- let { key, values = {} }: Props = $props();-</script>--<FormatMessage {key} {values}>- {#snippet children({ message, tag })}- {#if tag === 'b'}- <b>{message}</b>- {/if}- {/snippet}-</FormatMessage>diff --git a/web/src/lib/components/onboarding-page/onboarding-backup.svelte b/web/src/lib/components/onboarding-page/onboarding-backup.svelteindex cbcfeb9042..9abc51fc7d 100644--- a/web/src/lib/components/onboarding-page/onboarding-backup.svelte+++ b/web/src/lib/components/onboarding-page/onboarding-backup.svelte@@ -1,5 +1,5 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';import Icon from '$lib/elements/Icon.svelte';import { Stack } from '@immich/ui';import { mdiAlertCircleOutline } from '@mdi/js';diff --git a/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte b/web/src/lib/components/onboarding-page/onboarding-storage-template.svelteindex 06ee9accbb..da05f3d747 100644--- a/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte+++ b/web/src/lib/components/onboarding-page/onboarding-storage-template.svelte@@ -1,7 +1,7 @@<script lang="ts">import AdminSettings from '$lib/components/admin-page/settings/admin-settings.svelte';import StorageTemplateSettings from '$lib/components/admin-page/settings/storage-template/storage-template-settings.svelte';- import FormatMessage from '$lib/components/i18n/format-message.svelte';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';import { featureFlags } from '$lib/stores/server-config.store';import { user } from '$lib/stores/user.store';import { getConfig, type SystemConfigDto } from '@immich/sdk';diff --git a/web/src/lib/components/photos-page/delete-asset-dialog.svelte b/web/src/lib/components/photos-page/delete-asset-dialog.svelteindex c04b5f39d0..d5036dbe9f 100644--- a/web/src/lib/components/photos-page/delete-asset-dialog.svelte+++ b/web/src/lib/components/photos-page/delete-asset-dialog.svelte@@ -1,5 +1,5 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';import { showDeleteModal } from '$lib/stores/preferences.store';import { Checkbox, ConfirmModal, Label } from '@immich/ui';import { mdiDeleteForeverOutline } from '@mdi/js';diff --git a/web/src/lib/components/i18n/format-message.svelte b/web/src/lib/elements/FormatMessage.sveltesimilarity index 98%rename from web/src/lib/components/i18n/format-message.svelterename to web/src/lib/elements/FormatMessage.svelteindex bb8a066c6e..3385ab3b56 100644--- a/web/src/lib/components/i18n/format-message.svelte+++ b/web/src/lib/elements/FormatMessage.svelte@@ -1,13 +1,13 @@<script lang="ts">- import { IntlMessageFormat, type FormatXMLElementFn } from 'intl-messageformat';+ import type { InterpolationValues } from '$lib/elements/format-message';import {TYPE,type MessageFormatElement,type PluralElement,type SelectElement,} from '@formatjs/icu-messageformat-parser';+ import { IntlMessageFormat, type FormatXMLElementFn } from 'intl-messageformat';import { locale as i18nLocale, json, type Translations } from 'svelte-i18n';- import type { InterpolationValues } from '$lib/components/i18n/format-message';type MessagePart = {message: string;diff --git a/web/src/lib/components/shared-components/star-rating.svelte b/web/src/lib/elements/StarRating.sveltesimilarity index 100%rename from web/src/lib/components/shared-components/star-rating.svelterename to web/src/lib/elements/StarRating.sveltediff --git a/web/src/lib/components/i18n/__test__/format-message.spec.ts b/web/src/lib/elements/__test__/format-message.spec.tssimilarity index 95%rename from web/src/lib/components/i18n/__test__/format-message.spec.tsrename to web/src/lib/elements/__test__/format-message.spec.tsindex e7b3cd6ab9..3a5f665281 100644--- a/web/src/lib/components/i18n/__test__/format-message.spec.ts+++ b/web/src/lib/elements/__test__/format-message.spec.ts@@ -1,5 +1,5 @@-import FormatTagB from '$lib/components/i18n/__test__/format-tag-b.svelte';-import FormatMessage from '$lib/components/i18n/format-message.svelte';+import FormatTagB from '$lib/elements/__test__/format-tag-b.svelte';+import FormatMessage from '$lib/elements/FormatMessage.svelte';import '@testing-library/jest-dom';import { render, screen } from '@testing-library/svelte';import { init, locale, register, waitLocale, type Translations } from 'svelte-i18n';diff --git a/web/src/lib/components/i18n/__test__/format-tag-b.svelte b/web/src/lib/elements/__test__/format-tag-b.sveltesimilarity index 87%rename from web/src/lib/components/i18n/__test__/format-tag-b.svelterename to web/src/lib/elements/__test__/format-tag-b.svelteindex 6e8b2412e1..ff11c73c60 100644--- a/web/src/lib/components/i18n/__test__/format-tag-b.svelte+++ b/web/src/lib/elements/__test__/format-tag-b.svelte@@ -1,7 +1,7 @@<script lang="ts">- import type { Translations } from 'svelte-i18n';- import FormatMessage from '../format-message.svelte';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';import type { ComponentProps } from 'svelte';+ import type { Translations } from 'svelte-i18n';interface Props {key: Translations;diff --git a/web/src/lib/components/shared-components/__test__/star-rating.spec.ts b/web/src/lib/elements/__test__/star-rating.spec.tssimilarity index 97%rename from web/src/lib/components/shared-components/__test__/star-rating.spec.tsrename to web/src/lib/elements/__test__/star-rating.spec.tsindex cf33573b77..94d326eddf 100644--- a/web/src/lib/components/shared-components/__test__/star-rating.spec.ts+++ b/web/src/lib/elements/__test__/star-rating.spec.ts@@ -1,4 +1,4 @@-import StarRating from '$lib/components/shared-components/star-rating.svelte';+import StarRating from '$lib/elements/StarRating.svelte';import { render } from '@testing-library/svelte';describe('StarRating component', () => {diff --git a/web/src/lib/components/i18n/format-message.ts b/web/src/lib/elements/format-message.tssimilarity index 100%rename from web/src/lib/components/i18n/format-message.tsrename to web/src/lib/elements/format-message.tsdiff --git a/web/src/lib/modals/AuthDisableLoginConfirmModal.svelte b/web/src/lib/modals/AuthDisableLoginConfirmModal.svelteindex 593845b08c..35d6ae2e83 100644--- a/web/src/lib/modals/AuthDisableLoginConfirmModal.svelte+++ b/web/src/lib/modals/AuthDisableLoginConfirmModal.svelte@@ -1,5 +1,5 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';import { Button, HStack, Modal, ModalBody, ModalFooter } from '@immich/ui';import { mdiCancel } from '@mdi/js';import { t } from 'svelte-i18n';diff --git a/web/src/lib/modals/UserDeleteConfirmModal.svelte b/web/src/lib/modals/UserDeleteConfirmModal.svelteindex bbb045ecb7..74f1796232 100644--- a/web/src/lib/modals/UserDeleteConfirmModal.svelte+++ b/web/src/lib/modals/UserDeleteConfirmModal.svelte@@ -1,5 +1,5 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';import { serverConfig } from '$lib/stores/server-config.store';import { handleError } from '$lib/utils/handle-error';import { deleteUserAdmin, type UserAdminResponseDto, type UserResponseDto } from '@immich/sdk';diff --git a/web/src/lib/modals/UserRestoreConfirmModal.svelte b/web/src/lib/modals/UserRestoreConfirmModal.svelteindex 3ae61b0e3e..03c36e27cd 100644--- a/web/src/lib/modals/UserRestoreConfirmModal.svelte+++ b/web/src/lib/modals/UserRestoreConfirmModal.svelte@@ -1,5 +1,5 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';import { handleError } from '$lib/utils/handle-error';import { restoreUserAdmin, type UserAdminResponseDto, type UserResponseDto } from '@immich/sdk';import { Button, HStack, Modal, ModalBody, ModalFooter } from '@immich/ui';diff --git a/web/src/lib/modals/VersionAnnouncementModal.svelte b/web/src/lib/modals/VersionAnnouncementModal.svelteindex feecb3fd4c..84ede9e9b6 100644--- a/web/src/lib/modals/VersionAnnouncementModal.svelte+++ b/web/src/lib/modals/VersionAnnouncementModal.svelte@@ -1,5 +1,5 @@<script lang="ts">- import FormatMessage from '$lib/components/i18n/format-message.svelte';+ import FormatMessage from '$lib/elements/FormatMessage.svelte';import { Button, Modal, ModalBody, ModalFooter } from '@immich/ui';import { t } from 'svelte-i18n';