Disable the day of month selection for now

rilldata · Feb 3, 2025 · d972f41 · d972f41
1 parent d5dcb17
commit d972f41
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 21 deletions.
diff --git a/web-admin/src/features/scheduled-reports/metadata/ReportMetadata.svelte b/web-admin/src/features/scheduled-reports/metadata/ReportMetadata.svelte
@@ -10,7 +10,6 @@
   import { getRuntimeServiceListResourcesQueryKey } from "@rilldata/web-common/runtime-client";
   import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
   import { useQueryClient } from "@tanstack/svelte-query";
-  import cronstrue from "cronstrue";
   import { createAdminServiceDeleteReport } from "../../../client";
   import ProjectAccessControls from "../../projects/ProjectAccessControls.svelte";
   import {
@@ -22,7 +21,11 @@
   import MetadataValue from "./MetadataValue.svelte";
   import ReportOwnerBlock from "./ReportOwnerBlock.svelte";
   import RunNowButton from "./RunNowButton.svelte";
-  import { exportFormatToPrettyString, formatNextRunOn } from "./utils";
+  import {
+    exportFormatToPrettyString,
+    formatNextRunOn,
+    formatRefreshSchedule,
+  } from "./utils";
 
   export let organization: string;
   export let project: string;
@@ -39,18 +42,11 @@
   $: dashboardTitle =
     $dashboard.data?.explore?.displayName || $dashboardName.data;
 
-  // Get human-readable frequency
-  $: humanReadableFrequency =
-    $reportQuery.data &&
-    cronstrue.toString(
-      $reportQuery.data.resource.report.spec.refreshSchedule.cron,
-      {
-        verbose: true,
-      },
-    );
-
   $: reportSpec = $reportQuery.data?.resource?.report?.spec;
 
+  // Get human-readable frequency
+  $: humanReadableFrequency = formatRefreshSchedule(reportSpec);
+
   $: emailNotifier = extractNotifier(reportSpec?.notifiers, "email");
   $: slackNotifier = extractNotifier(reportSpec?.notifiers, "slack");
 

diff --git a/web-admin/src/features/scheduled-reports/metadata/utils.ts b/web-admin/src/features/scheduled-reports/metadata/utils.ts
@@ -1,3 +1,5 @@
+import type { V1ReportSpec } from "@rilldata/web-common/runtime-client";
+import cronstrue from "cronstrue";
 import { DateTime } from "luxon";
 import { V1ExportFormat } from "../../../client";
 
@@ -25,3 +27,27 @@ export function formatNextRunOn(nextRunOn: string, timeZone: string): string {
     .setZone(timeZone)
     .toLocaleString(DateTime.DATETIME_FULL);
 }
+
+const suffixMap = {
+  1: "st",
+  2: "nd",
+  3: "rd",
+};
+export function formatRefreshSchedule(reportSpec: V1ReportSpec) {
+  if (!reportSpec.refreshSchedule?.cron) return "";
+  let formattedRefreshSchedule = cronstrue.toString(
+    reportSpec.refreshSchedule.cron,
+    {
+      verbose: true,
+    },
+  );
+  formattedRefreshSchedule = formattedRefreshSchedule.replace(
+    /on day (\d*) of the month/,
+    (_, day: number) => {
+      const suffix = suffixMap[day % 10] ?? "th";
+      return `on the ${day}${suffix} of each month`;
+    },
+  );
+
+  return formattedRefreshSchedule;
+}
diff --git a/web-common/src/components/forms/Select.svelte b/web-common/src/components/forms/Select.svelte
@@ -85,6 +85,7 @@
   >
     <Select.Trigger
       {id}
+      {disabled}
       {lockable}
       {lockTooltip}
       bind:el={selectElement}

diff --git a/web-common/src/components/select/select-trigger.svelte b/web-common/src/components/select/select-trigger.svelte
@@ -7,6 +7,7 @@
   import TooltipContent from "../tooltip/TooltipContent.svelte";
 
   type $$Props = SelectPrimitive.TriggerProps & {
+    disabled?: boolean;
     lockable?: boolean;
     lockTooltip?: string;
     // See: https://www.bits-ui.com/docs/components/select#selecttrigger
@@ -18,6 +19,7 @@
   let className: $$Props["class"] = undefined;
 
   export let el: HTMLButtonElement | undefined = undefined;
+  export let disabled = false;
   export let lockable = false;
   export let lockTooltip = "";
   export { className as class };
@@ -27,7 +29,7 @@
 
 <SelectPrimitive.Trigger
   bind:el
-  disabled={locked}
+  disabled={locked || disabled}
   class={cn(
     "flex h-8 w-full items-center relative justify-between rounded-[2px] border border-gray-300 bg-transparent px-2 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:border-primary-400 disabled:cursor-not-allowed disabled:bg-gray-50 disabled:text-gray-400 [&>span]:line-clamp-1",
     className,

diff --git a/web-common/src/features/scheduled-reports/BaseScheduledReportForm.svelte b/web-common/src/features/scheduled-reports/BaseScheduledReportForm.svelte
@@ -74,14 +74,12 @@
       />
     {/if}
     {#if $data["frequency"] === ReportFrequency.Monthly}
-      <Input
-        bind:value={$data["dayOfMonth"]}
-        errors={$errors["dayOfMonth"]}
+      <Select
+        value={"1"}
         id="dayOfMonth"
         label="Day"
-        inputType="number"
-        width="64px"
-        labelGap={2}
+        options={[{ value: "1", label: "First day" }]}
+        disabled
       />
     {/if}
     <TimePicker bind:value={$data["timeOfDay"]} id="timeOfDay" label="Time" />

diff --git a/web-common/src/features/scheduled-reports/ScheduledReportDialog.svelte b/web-common/src/features/scheduled-reports/ScheduledReportDialog.svelte
@@ -55,8 +55,6 @@
   const schema = yup(
     object({
       title: string().required("Required"),
-      // There isnt enough space so just say "Invalid"
-      dayOfMonth: number().min(1, "Invalid").max(31, "Invalid"),
       emailRecipients: array().of(string().email("Invalid email")),
       slackChannels: array().of(string()),
       slackUsers: array().of(string().email("Invalid email")),