override max date in public url form

rilldata · Jan 28, 2025 · 6c0f6cf · 6c0f6cf
1 parent baa6274
commit 6c0f6cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/web-admin/src/features/public-urls/CreatePublicURLForm.svelte b/web-admin/src/features/public-urls/CreatePublicURLForm.svelte
@@ -134,15 +134,17 @@
     hasDashboardDimensionThresholdFilter($dashboardStore);
 
   $: if (setExpiration && $form.expiresAt === null) {
-    // When `setExpiration` is toggled, initialize the expiration time to 60 days from today
-    $form.expiresAt = DateTime.now().plus({ days: 60 }).toISO();
+    $form.expiresAt = includingTomorrowDate.toISO();
+    popoverOpen = true;
   } else if (!setExpiration) {
     $form.expiresAt = null;
+    popoverOpen = false;
   }
 
   $: ({ length: allErrorsLength } = $allErrors);
 
   $: includingTomorrowDate = DateTime.now().plus({ days: 1 }).startOf("day");
+  $: maxExpirationDate = DateTime.now().plus({ years: 1 }).startOf("day");
 </script>
 
 {#if !url}
@@ -187,6 +189,7 @@
                   selection={DateTime.fromISO($form.expiresAt)}
                   singleDaySelection
                   minDate={includingTomorrowDate}
+                  maxDate={maxExpirationDate}
                   firstVisibleMonth={DateTime.fromISO($form.expiresAt)}
                   onSelectDay={(date) => {
                     $form.expiresAt = date.toISO();

diff --git a/web-common/src/components/date-picker/Calendar.svelte b/web-common/src/components/date-picker/Calendar.svelte
@@ -7,7 +7,7 @@
 
   export let selection: MaybeDate | Interval = undefined;
   export let minDate: MaybeDate = undefined;
-  export let maxDate: MaybeDate = DateTime.now().startOf("day");
+  export let maxDate: MaybeDate = undefined;
   export let visibleMonths = 1;
   export let selectingStart = true;
   export let firstVisibleMonth: MaybeDate = isValidDateTime(selection)