Skip to content

Commit c1c9f30

Browse files
chore: migrate to immich/ui confirm modal (#20114)
1 parent bc8cb9b commit c1c9f30

12 files changed

+15
-73
lines changed

web/package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"dependencies": {
2929
"@formatjs/icu-messageformat-parser": "^2.9.8",
3030
"@immich/sdk": "file:../open-api/typescript-sdk",
31-
"@immich/ui": "^0.23.2",
31+
"@immich/ui": "^0.23.5",
3232
"@mapbox/mapbox-gl-rtl-text": "0.2.3",
3333
"@mdi/js": "^7.4.47",
3434
"@photo-sphere-viewer/core": "^5.11.5",

web/src/lib/components/asset-viewer/editor/editor-panel.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<script lang="ts">
22
import { shortcut } from '$lib/actions/shortcut';
3-
import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
43
import { editTypes, showCancelConfirmDialog } from '$lib/stores/asset-editor.store';
54
import { websocketEvents } from '$lib/stores/websocket';
65
import { type AssetResponseDto } from '@immich/sdk';
7-
import { IconButton } from '@immich/ui';
6+
import { ConfirmModal, IconButton } from '@immich/ui';
87
import { mdiClose } from '@mdi/js';
98
import { onMount } from 'svelte';
109
import { t } from 'svelte-i18n';

web/src/lib/components/photos-page/delete-asset-dialog.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<script lang="ts">
22
import FormatMessage from '$lib/components/i18n/format-message.svelte';
3-
import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
43
import { showDeleteModal } from '$lib/stores/preferences.store';
5-
import { Checkbox, Label } from '@immich/ui';
4+
import { Checkbox, ConfirmModal, Label } from '@immich/ui';
65
import { mdiDeleteForeverOutline } from '@mdi/js';
76
import { t } from 'svelte-i18n';
87

web/src/lib/components/shared-components/change-date.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ describe('ChangeDate component', () => {
1212

1313
const getDateInput = () => screen.getByLabelText('date_and_time') as HTMLInputElement;
1414
const getTimeZoneInput = () => screen.getByLabelText('timezone') as HTMLInputElement;
15-
const getCancelButton = () => screen.getByText('cancel');
16-
const getConfirmButton = () => screen.getByText('confirm');
15+
const getCancelButton = () => screen.getByText('Cancel');
16+
const getConfirmButton = () => screen.getByText('Confirm');
1717

1818
beforeEach(() => {
1919
vi.stubGlobal('IntersectionObserver', getIntersectionObserverMock());

web/src/lib/components/shared-components/change-date.svelte

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts">
2-
import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
2+
import { ConfirmModal } from '@immich/ui';
33
import { mdiCalendarEditOutline } from '@mdi/js';
44
import { DateTime, Duration } from 'luxon';
55
import { t } from 'svelte-i18n';
@@ -184,8 +184,6 @@
184184
disabled={!date.isValid}
185185
onClose={(confirmed) => (confirmed ? handleConfirm() : onCancel())}
186186
>
187-
<!-- @migration-task: migrate this slot by hand, `prompt` would shadow a prop on the parent component -->
188-
<!-- @migration-task: migrate this slot by hand, `prompt` would shadow a prop on the parent component -->
189187
{#snippet promptSnippet()}
190188
<div class="flex flex-col text-start gap-2">
191189
<div class="flex flex-col">

web/src/lib/components/shared-components/change-location.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import LoadingSpinner from '$lib/components/shared-components/loading-spinner.svelte';
77
import type Map from '$lib/components/shared-components/map/map.svelte';
88
import { timeDebounceOnSearch, timeToLoadTheMap } from '$lib/constants';
9-
import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
109
import { lastChosenLocation } from '$lib/stores/asset-editor.store';
1110
import { delay } from '$lib/utils/asset-utils';
1211
import { handleError } from '$lib/utils/handle-error';
1312
import { searchPlaces, type AssetResponseDto, type PlacesResponseDto } from '@immich/sdk';
13+
import { ConfirmModal } from '@immich/ui';
1414
import { mdiMapMarkerMultipleOutline } from '@mdi/js';
1515
import { t } from 'svelte-i18n';
1616
import { get } from 'svelte/store';

web/src/lib/managers/modal-manager.svelte.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
1+
import { ConfirmModal } from '@immich/ui';
22
import { mount, unmount, type Component, type ComponentProps } from 'svelte';
33

44
type OnCloseData<T> = T extends { onClose: (data?: infer R) => void }

web/src/lib/modals/AssetUpdateDecriptionConfirmModal.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<script lang="ts">
2-
import ConfirmModal from '$lib/modals/ConfirmModal.svelte';
3-
import { Input } from '@immich/ui';
2+
import { ConfirmModal, Input } from '@immich/ui';
43
import { mdiText } from '@mdi/js';
54
import { t } from 'svelte-i18n';
65

web/src/lib/modals/ConfirmModal.svelte

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)