From 6ffd8e679e44489d5e8f1e3a0ff9717c959197e5 Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Tue, 16 Sep 2025 16:09:09 -0400 Subject: [PATCH] refactor: use immich/ui PasswordInput (#22099) refactor: password-input --- pnpm-lock.yaml | 12 ++--- web/package.json | 2 +- .../settings/auth/auth-settings.svelte | 2 +- .../settings/job-settings/job-settings.svelte | 10 ++-- .../components/pages/SharedLinkPage.svelte | 5 +- .../shared-components/password-field.svelte | 49 ------------------- .../settings/setting-input-field.svelte | 21 +++++--- 7 files changed, 28 insertions(+), 73 deletions(-) delete mode 100644 web/src/lib/components/shared-components/password-field.svelte diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1df0e209dd..a2304738a4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -684,8 +684,8 @@ importers: specifier: file:../open-api/typescript-sdk version: link:../open-api/typescript-sdk '@immich/ui': - specifier: ^0.28.0 - version: 0.28.0(@internationalized/date@3.8.2)(svelte@5.35.5) + specifier: ^0.28.1 + version: 0.28.1(@internationalized/date@3.8.2)(svelte@5.35.5) '@mapbox/mapbox-gl-rtl-text': specifier: 0.2.3 version: 0.2.3(mapbox-gl@1.13.3) @@ -2589,8 +2589,8 @@ packages: cpu: [x64] os: [win32] - '@immich/ui@0.28.0': - resolution: {integrity: sha512-plQedwUbAu6FqbkYxYdzTigTQU5GfsIW287VO/EIOjd9hODEZYMfIuS0eiBivWtFmSA/lR+kuNoV6JAAw84PuQ==} + '@immich/ui@0.28.1': + resolution: {integrity: sha512-FAQBPsbPaLtTYsEH+/wQxPbUI19ZPuOEScSHgSqteI601qVZNQcfU7YuinKqK94iva2RNhvUgrNGHweIBentZg==} peerDependencies: svelte: ^5.0.0 @@ -13114,7 +13114,7 @@ snapshots: '@docusaurus/react-loadable@6.0.0(react@18.3.1)': dependencies: - '@types/react': 19.1.13 + '@types/react': 19.1.12 react: 18.3.1 '@docusaurus/theme-classic@3.8.1(@types/react@19.1.13)(acorn@8.15.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(typescript@5.9.2)': @@ -13706,7 +13706,7 @@ snapshots: '@img/sharp-win32-x64@0.34.3': optional: true - '@immich/ui@0.28.0(@internationalized/date@3.8.2)(svelte@5.35.5)': + '@immich/ui@0.28.1(@internationalized/date@3.8.2)(svelte@5.35.5)': dependencies: '@mdi/js': 7.4.47 bits-ui: 2.9.8(@internationalized/date@3.8.2)(svelte@5.35.5) diff --git a/web/package.json b/web/package.json index ab89fca7bf..614a0784bd 100644 --- a/web/package.json +++ b/web/package.json @@ -28,7 +28,7 @@ "dependencies": { "@formatjs/icu-messageformat-parser": "^2.9.8", "@immich/sdk": "file:../open-api/typescript-sdk", - "@immich/ui": "^0.28.0", + "@immich/ui": "^0.28.1", "@mapbox/mapbox-gl-rtl-text": "0.2.3", "@mdi/js": "^7.4.47", "@photo-sphere-viewer/core": "^5.11.5", 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.svelte index 5acd096dd5..06deb05a44 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 @@ -182,7 +182,7 @@ /> + 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 { SettingInputFieldType } from '$lib/constants'; import { getJobName } from '$lib/utils'; import { JobName, type SystemConfigDto, type SystemConfigJobDto } 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 SettingButtonsRow from '$lib/components/shared-components/settings/setting-buttons-row.svelte'; - import SettingInputField from '$lib/components/shared-components/settings/setting-input-field.svelte'; - import { t } from 'svelte-i18n'; - import { SettingInputFieldType } from '$lib/constants'; interface Props { savedConfig: SystemConfigDto; @@ -63,7 +63,7 @@ inputType={SettingInputFieldType.NUMBER} label={$t('admin.job_concurrency', { values: { job: $getJobName(jobName) } })} description="" - value="1" + value={1} disabled={true} title={$t('admin.job_not_concurrency_safe')} /> diff --git a/web/src/lib/components/pages/SharedLinkPage.svelte b/web/src/lib/components/pages/SharedLinkPage.svelte index a3f5599077..3807f5ef0f 100644 --- a/web/src/lib/components/pages/SharedLinkPage.svelte +++ b/web/src/lib/components/pages/SharedLinkPage.svelte @@ -3,7 +3,6 @@ import IndividualSharedViewer from '$lib/components/share-page/individual-shared-viewer.svelte'; import ControlAppBar from '$lib/components/shared-components/control-app-bar.svelte'; import ImmichLogoSmallLink from '$lib/components/shared-components/immich-logo-small-link.svelte'; - import PasswordField from '$lib/components/shared-components/password-field.svelte'; import ThemeButton from '$lib/components/shared-components/theme-button.svelte'; import { assetViewingStore } from '$lib/stores/asset-viewing.store'; import { user } from '$lib/stores/user.store'; @@ -11,7 +10,7 @@ import { handleError } from '$lib/utils/handle-error'; import { navigate } from '$lib/utils/navigation'; import { getMySharedLink, SharedLinkType, type AssetResponseDto, type SharedLinkResponseDto } from '@immich/sdk'; - import { Button } from '@immich/ui'; + import { Button, PasswordInput } from '@immich/ui'; import { tick } from 'svelte'; import { t } from 'svelte-i18n'; @@ -79,7 +78,7 @@
- +
diff --git a/web/src/lib/components/shared-components/password-field.svelte b/web/src/lib/components/shared-components/password-field.svelte deleted file mode 100644 index ba2a1f68fd..0000000000 --- a/web/src/lib/components/shared-components/password-field.svelte +++ /dev/null @@ -1,49 +0,0 @@ - - -
- { - password = e.currentTarget.value; - onInput?.(password); - }} - /> - - {#if password.length > 0} - - {/if} -
- - diff --git a/web/src/lib/components/shared-components/settings/setting-input-field.svelte b/web/src/lib/components/shared-components/settings/setting-input-field.svelte index a03e81a663..54b2c4ea23 100644 --- a/web/src/lib/components/shared-components/settings/setting-input-field.svelte +++ b/web/src/lib/components/shared-components/settings/setting-input-field.svelte @@ -1,15 +1,13 @@