fix: enter now submits the date modals (#25053)

* fix: enter now submits the date modals

* use FormModal

* apply prettier

* fix unit test

web/src/lib/modals/AssetChangeDateModal.svelte

@@ -5,7 +5,7 @@
   import { getPreferredTimeZone, getTimezones, toIsoDate } from '$lib/modals/timezone-utils';
   import { handleError } from '$lib/utils/handle-error';
   import { updateAsset } from '@immich/sdk';
-  import { Button, HStack, Label, Modal, ModalBody, ModalFooter } from '@immich/ui';
+  import { FormModal, Label } from '@immich/ui';
   import { mdiCalendarEdit } from '@mdi/js';
   import { DateTime } from 'luxon';
   import { t } from 'svelte-i18n';
@@ -28,7 +28,7 @@
   // the offsets (and validity) for time zones may change if the date is changed, which is why we recompute the list
   let selectedOption = $derived(getPreferredTimeZone(initialDate, initialTimeZone, timezones, lastSelectedTimezone));
 
-  const handleClose = async () => {
+  const onSubmit = async () => {
     if (!date.isValid || !selectedOption) {
       onClose(false);
       return;
@@ -49,8 +49,15 @@
   const date = $derived(DateTime.fromISO(selectedDate, { zone: selectedOption?.value, setZone: true }));
 </script>
 
-<Modal title={$t('edit_date_and_time')} icon={mdiCalendarEdit} onClose={() => onClose(false)} size="small">
+<FormModal
-  <ModalBody>
+  title={$t('edit_date_and_time')}
+  icon={mdiCalendarEdit}
+  onClose={() => onClose(false)}
+  {onSubmit}
+  submitText={$t('confirm')}
+  disabled={!date.isValid || !selectedOption}
+  size="small"
+>
   <Label for="datetime" class="block mb-1">{$t('date_and_time')}</Label>
   <DateInput
     class="immich-form-input text-gray-700 w-full mb-2"
@@ -63,11 +70,4 @@
       <Combobox bind:selectedOption label={$t('timezone')} options={timezones} placeholder={$t('search_timezone')} />
     </div>
   {/if}
-  </ModalBody>
+</FormModal>
-  <ModalFooter>
-    <HStack fullWidth>
-      <Button shape="round" color="secondary" fullWidth onclick={() => onClose(false)}>{$t('cancel')}</Button>
-      <Button shape="round" type="submit" fullWidth onclick={handleClose}>{$t('confirm')}</Button>
-    </HStack>
-  </ModalFooter>
-</Modal>

web/src/lib/modals/AssetSelectionChangeDateModal.spec.ts

@@ -17,8 +17,8 @@ describe('DateSelectionModal component', () => {
   const getRelativeInputToggle = () => screen.getByTestId('edit-by-offset-switch');
   const getDateInput = () => screen.getByLabelText('date_and_time') as HTMLInputElement;
   const getTimeZoneInput = () => screen.getByLabelText('timezone') as HTMLInputElement;
-  const getCancelButton = () => screen.getByText('cancel');
+  const getCancelButton = () => screen.getByRole('button', { name: /cancel/i });
-  const getConfirmButton = () => screen.getByText('confirm');
+  const getConfirmButton = () => screen.getByRole('button', { name: /confirm/i });
 
   beforeEach(() => {
     vi.stubGlobal('IntersectionObserver', getIntersectionObserverMock());

web/src/lib/modals/AssetSelectionChangeDateModal.svelte

@@ -8,7 +8,7 @@
   import { getOwnedAssetsWithWarning } from '$lib/utils/asset-utils';
   import { handleError } from '$lib/utils/handle-error';
   import { updateAssets } from '@immich/sdk';
-  import { Button, Field, HStack, Label, Modal, ModalBody, ModalFooter, Switch } from '@immich/ui';
+  import { Field, FormModal, Label, Switch } from '@immich/ui';
   import { mdiCalendarEdit } from '@mdi/js';
   import { DateTime } from 'luxon';
   import { t } from 'svelte-i18n';
@@ -30,7 +30,7 @@
   // the offsets (and validity) for time zones may change if the date is changed, which is why we recompute the list
   let selectedOption = $derived(getPreferredTimeZone(initialDate, initialTimeZone, timezones, lastSelectedTimezone));
 
-  const handleConfirm = async () => {
+  const onSubmit = async () => {
     const ids = getOwnedAssetsWithWarning(assets, $user);
     try {
       if (showRelative && (selectedDuration || selectedOption)) {
@@ -63,8 +63,15 @@
   const date = $derived(DateTime.fromISO(selectedDate, { zone: selectedOption?.value, setZone: true }));
 </script>
 
-<Modal title={$t('edit_date_and_time')} icon={mdiCalendarEdit} onClose={() => onClose(false)} size="small">
+<FormModal
-  <ModalBody>
+  title={$t('edit_date_and_time')}
+  icon={mdiCalendarEdit}
+  onClose={() => onClose(false)}
+  {onSubmit}
+  submitText={$t('confirm')}
+  disabled={!date.isValid}
+  size="small"
+>
   <Field label={$t('edit_date_and_time_by_offset')}>
     <Switch data-testid="edit-by-offset-switch" bind:checked={showRelative} class="mb-2" />
   </Field>
@@ -114,15 +121,4 @@
         </div>
       </CardBody>
     </Card> -->
-  </ModalBody>
+</FormModal>
-  <ModalFooter>
-    <HStack fullWidth>
-      <Button shape="round" color="secondary" fullWidth onclick={() => onClose(false)}>
-        {$t('cancel')}
-      </Button>
-      <Button shape="round" color="primary" fullWidth onclick={handleConfirm} disabled={!date.isValid}>
-        {$t('confirm')}
-      </Button>
-    </HStack>
-  </ModalFooter>
-</Modal>

web/src/lib/modals/NavigateToDateModal.svelte

@@ -3,10 +3,11 @@
   import { TimelineManager } from '$lib/managers/timeline-manager/timeline-manager.svelte';
   import type { TimelineAsset } from '$lib/managers/timeline-manager/types';
   import { getPreferredTimeZone, getTimezones, toDatetime, type ZoneOption } from '$lib/modals/timezone-utils';
-  import { Button, HStack, Modal, ModalBody, ModalFooter, VStack } from '@immich/ui';
+  import { FormModal, HStack, VStack } from '@immich/ui';
   import { mdiNavigationVariantOutline } from '@mdi/js';
   import { DateTime } from 'luxon';
   import { t } from 'svelte-i18n';
+
   interface Props {
     timelineManager: TimelineManager;
     onClose: (asset?: TimelineAsset) => void;
@@ -20,7 +21,7 @@
   // the offsets (and validity) for time zones may change if the date is changed, which is why we recompute the list
   let selectedOption: ZoneOption | undefined = $derived(getPreferredTimeZone(initialDate, undefined, timezones));
 
-  const handleClose = async () => {
+  const onSubmit = async () => {
     if (!date.isValid || !selectedOption) {
       onClose();
       return;
@@ -36,8 +37,15 @@
   const date = $derived(DateTime.fromISO(selectedDate, { zone: selectedOption?.value, setZone: true }));
 </script>
 
-<Modal title={$t('navigate_to_time')} icon={mdiNavigationVariantOutline} onClose={() => onClose()}>
+<FormModal
-  <ModalBody>
+  title={$t('navigate_to_time')}
+  icon={mdiNavigationVariantOutline}
+  onClose={() => onClose()}
+  {onSubmit}
+  submitText={$t('confirm')}
+  disabled={!date.isValid || !selectedOption}
+  size="medium"
+>
   <VStack fullWidth>
     <HStack fullWidth>
       <label class="immich-form-label" for="datetime">{$t('date_and_time')}</label>
@@ -51,11 +59,4 @@
       />
     </HStack>
   </VStack>
-  </ModalBody>
+</FormModal>
-  <ModalFooter>
-    <HStack fullWidth>
-      <Button shape="round" color="secondary" fullWidth onclick={() => onClose()}>{$t('cancel')}</Button>
-      <Button shape="round" type="submit" fullWidth onclick={handleClose}>{$t('confirm')}</Button>
-    </HStack>
-  </ModalFooter>
-</Modal>