fix: narrow generated API types

proto/gen/rill/runtime/v1/runtime.swagger.yaml

@@ -2862,6 +2862,8 @@ definitions:
     title: Selector for a dimension
   MetricsViewSpecDimensionV2:
     type: object
+    required:
+      - name
     properties:
       name:
         type: string
@@ -2889,6 +2891,9 @@ definitions:
     title: Type of measure query to generate
   MetricsViewSpecMeasureV2:
     type: object
+    required:
+      - name
+      - expression
     properties:
       name:
         type: string
@@ -4715,8 +4720,12 @@ definitions:
     title: Response message for QueryService.MetricsViewComparison
   v1MetricsViewComparisonRow:
     type: object
+    required:
+      - dimensionValue
+      - measureValues
     properties:
       dimensionValue:
+        type: string
         title: Not optional, not null
       measureValues:
         type: array
@@ -4857,6 +4866,9 @@ definitions:
         title: Optional, defaults to false
   v1MetricsViewSpec:
     type: object
+    required:
+      - dimensions
+      - measures
     properties:
       connector:
         type: string
@@ -4967,6 +4979,8 @@ definitions:
           Deprecated: Now defined in the Explore resource.
   v1MetricsViewState:
     type: object
+    required:
+      - validSpec
     properties:
       validSpec:
         $ref: '#/definitions/v1MetricsViewSpec'
@@ -5144,6 +5158,9 @@ definitions:
         title: Not optional, not null
   v1MetricsViewV2:
     type: object
+    required:
+      - spec
+      - state
     properties:
       spec:
         $ref: '#/definitions/v1MetricsViewSpec'
@@ -6207,4 +6224,4 @@ definitions:
       name:
         $ref: '#/definitions/v1ResourceName'
       resource:
-        $ref: '#/definitions/v1Resource'
+        $ref: '#/definitions/v1Resource'

web-admin/src/features/alerts/EditAlert.svelte

@@ -5,30 +5,39 @@
   } from "@rilldata/web-common/components/dialog-v2";
   import GuardedDialog from "@rilldata/web-common/components/dialog-v2/GuardedDialog.svelte";
   import EditAlertForm from "@rilldata/web-common/features/alerts/EditAlertForm.svelte";
+  import { useMetricsView } from "@rilldata/web-common/features/dashboards/selectors";
   import type { V1AlertSpec } from "@rilldata/web-common/runtime-client";
+  import { runtime } from "@rilldata/web-common/runtime-client/runtime-store";
   import Button from "web-common/src/components/button/Button.svelte";
 
   export let alertSpec: V1AlertSpec;
   export let metricsViewName: string;
+
+  $: ({ instanceId } = $runtime);
+  $: metricsViewSpecQuery = useMetricsView(instanceId, metricsViewName);
+  $: validSpec = $metricsViewSpecQuery.data;
 </script>
 
-<GuardedDialog
-  title="Close without saving?"
-  description="You haven’t saved changes to this alert yet, so closing this window will lose your work."
-  confirmLabel="Close"
-  cancelLabel="Keep editing"
-  let:onCancel
-  let:onClose
->
-  <DialogTrigger asChild let:builder>
-    <Button type="secondary" builders={[builder]}>Edit</Button>
-  </DialogTrigger>
-  <DialogContent class="p-0 m-0 w-[802px] max-w-fit" noClose>
-    <EditAlertForm
-      {alertSpec}
-      on:cancel={onCancel}
-      on:close={onClose}
-      {metricsViewName}
-    />
-  </DialogContent>
-</GuardedDialog>
+{#if validSpec}
+  <GuardedDialog
+    title="Close without saving?"
+    description="You haven’t saved changes to this alert yet, so closing this window will lose your work."
+    confirmLabel="Close"
+    cancelLabel="Keep editing"
+    let:onCancel
+    let:onClose
+  >
+    <DialogTrigger asChild let:builder>
+      <Button type="secondary" builders={[builder]}>Edit</Button>
+    </DialogTrigger>
+    <DialogContent class="p-0 m-0 w-[802px] max-w-fit" noClose>
+      <EditAlertForm
+        defaultTimeRange={validSpec.defaultTimeRange}
+        {alertSpec}
+        on:cancel={onCancel}
+        on:close={onClose}
+        {metricsViewName}
+      />
+    </DialogContent>
+  </GuardedDialog>
+{/if}

web-common/src/features/alerts/BaseAlertForm.svelte

@@ -65,11 +65,16 @@
     }
     currentTabIndex += 1;
 
-    if (isEditForm || currentTabIndex !== 2 || $touched.name) {
+    if (
+      isEditForm ||
+      currentTabIndex !== 2 ||
+      $touched.name ||
+      !$metricsView.data
+    ) {
       return;
     }
     // if the user came to the delivery tab and name was not changed then auto generate it
-    const name = generateAlertName($form, $metricsView.data ?? {});
+    const name = generateAlertName($form, $metricsView.data);
     if (!name) return;
     $form.name = name;
   }

web-common/src/features/alerts/CreateAlertForm.svelte

@@ -28,23 +28,30 @@
   import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus";
   import { runtime } from "../../runtime-client/runtime-store";
   import BaseAlertForm from "./BaseAlertForm.svelte";
+  import { useMetricsView } from "../dashboards/selectors";
 
   const user = createAdminServiceGetCurrentUser();
   const createAlert = createAdminServiceCreateAlert();
-  $: organization = $page.params.organization;
-  $: project = $page.params.project;
+
   const queryClient = useQueryClient();
   const dispatch = createEventDispatcher();
 
   const {
     metricsViewName,
     dashboardStore,
+
     selectors: {
       timeRangeSelectors: { timeControlsState },
     },
   } = getStateManagers();
   const timeControls = get(timeControlsState);
 
+  $: ({ organization, project } = $page.params);
+
+  $: metricsViewQuery = useMetricsView($runtime.instanceId, $metricsViewName);
+
+  $: metricsView = $metricsViewQuery.data;
+
   // Set defaults depending on UI state
   // if in TDD take active measure and comparison dimension
   // If expanded leaderboard, take first dimension and active dimensions
@@ -56,14 +63,14 @@
   }
 
   // TODO: get metrics view spec
-  const timeRange = mapTimeRange(timeControls, {});
-  const comparisonTimeRange = mapComparisonTimeRange(
+  $: timeRange = mapTimeRange(timeControls, metricsView?.defaultTimeRange);
+  $: comparisonTimeRange = mapComparisonTimeRange(
     $dashboardStore,
     timeControls,
     timeRange,
   );
 
-  const formState = createForm<AlertFormValues>({
+  $: formState = createForm<AlertFormValues>({
     initialValues: {
       name: "",
       measure:
@@ -158,7 +165,7 @@
     },
   });
 
-  const { form } = formState;
+  $: form = formState.form;
   $: hasSlackNotifier = getHasSlackConnection($runtime.instanceId);
   $: if ($hasSlackNotifier.data) {
     $form["enableSlackNotification"] = true;

web-common/src/features/alerts/EditAlertForm.svelte

@@ -5,11 +5,8 @@
     extractAlertFormValues,
     extractAlertNotification,
   } from "@rilldata/web-common/features/alerts/extract-alert-form-values";
-  import {
-    useMetricsView,
-    useMetricsViewTimeRange,
-  } from "@rilldata/web-common/features/dashboards/selectors";
-  import { useQueryClient } from "@tanstack/svelte-query";
+  import { useMetricsViewTimeRange } from "@rilldata/web-common/features/dashboards/selectors";
+  import { queryClient } from "@rilldata/web-common/lib/svelte-query/globalQueryClient";
   import { createEventDispatcher } from "svelte";
   import { createForm } from "svelte-forms-lib";
   import { eventBus } from "@rilldata/web-common/lib/event-bus/event-bus";
@@ -31,25 +28,22 @@
 
   export let alertSpec: V1AlertSpec;
   export let metricsViewName: string;
+  export let defaultTimeRange: string | undefined;
 
   const editAlert = createAdminServiceEditAlert();
-  const queryClient = useQueryClient();
   const dispatch = createEventDispatcher();
 
-  $: organization = $page.params.organization;
-  $: project = $page.params.project;
-  $: alertName = $page.params.alert;
+  $: ({ instanceId } = $runtime);
+
+  $: ({ project, alert: alertName, organization } = $page.params);
   const queryArgsJson = JSON.parse(
     (alertSpec.resolverProperties?.query_args_json ??
       alertSpec.queryArgsJson) as string,
   ) as V1MetricsViewAggregationRequest;
 
-  $: metricsViewSpec = useMetricsView($runtime?.instanceId, metricsViewName);
-  $: timeRange = useMetricsViewTimeRange(
-    $runtime?.instanceId,
-    metricsViewName,
-    { query: { queryClient } },
-  );
+  $: timeRange = useMetricsViewTimeRange(instanceId, metricsViewName, {
+    query: { queryClient },
+  });
 
   const formState = createForm<AlertFormValues>({
     initialValues: {
@@ -59,7 +53,7 @@
       ...extractAlertNotification(alertSpec),
       ...extractAlertFormValues(
         queryArgsJson,
-        $metricsViewSpec?.data ?? {},
+        defaultTimeRange,
         $timeRange?.data ?? {},
       ),
     },
@@ -112,10 +106,10 @@
     },
   });
   const { form } = formState;
-  $: if ($metricsViewSpec?.data && $timeRange?.data) {
+  $: if ($timeRange?.data) {
     const formValues = extractAlertFormValues(
       queryArgsJson,
-      $metricsViewSpec.data,
+      defaultTimeRange,
       $timeRange.data,
     );
     for (const fk in formValues) {

web-common/src/features/alerts/alert-preview-data.ts

@@ -39,8 +39,8 @@ export function getAlertPreviewData(
 ): CreateQueryResult<AlertPreviewResponse> {
   return derived(
     [useMetricsView(get(runtime).instanceId, formValues.metricsViewName)],
-    ([metricsViewResp], set) =>
-      createQueryServiceMetricsViewAggregation(
+    ([metricsViewResp], set) => {
+      return createQueryServiceMetricsViewAggregation(
         get(runtime).instanceId,
         formValues.metricsViewName,
         getAlertPreviewQueryRequest(formValues),
@@ -51,7 +51,8 @@ export function getAlertPreviewData(
             metricsViewResp.data,
           ),
         },
-      ).subscribe(set),
+      ).subscribe(set);
+    },
   );
 }
 
@@ -88,7 +89,9 @@ function getAlertPreviewQueryOptions(
       return {
         rows: resp.data as V1MetricsViewAggregationResponseDataItem[],
         schema: (resp.schema?.fields
-          ?.map((field) => getSchemaEntryForField(metricsViewSpec ?? {}, field))
+          ?.map((field) =>
+            getSchemaEntryForField(metricsViewSpec as V1MetricsViewSpec, field),
+          )
           .filter(Boolean) ?? []) as VirtualizedTableColumns[],
       };
     },

web-common/src/features/alerts/extract-alert-form-values.ts

@@ -11,7 +11,6 @@ import {
   V1MetricsViewAggregationDimension,
   V1MetricsViewAggregationMeasure,
   V1MetricsViewAggregationRequest,
-  type V1MetricsViewSpec,
   type V1MetricsViewTimeRangeResponse,
   V1Operation,
   V1TimeRange,
@@ -32,17 +31,18 @@ export type AlertFormValuesSubset = Pick<
 
 export function extractAlertFormValues(
   queryArgs: V1MetricsViewAggregationRequest,
-  metricsViewSpec: V1MetricsViewSpec,
+  defaultTimeRange: string | undefined,
   allTimeRange: V1MetricsViewTimeRangeResponse,
 ): AlertFormValuesSubset {
+  console.log({ defaultTimeRange });
   if (!queryArgs) return {} as AlertFormValuesSubset;
 
   const measures = queryArgs.measures as V1MetricsViewAggregationMeasure[];
   const dimensions =
     queryArgs.dimensions as V1MetricsViewAggregationDimension[];
 
   const timeRange = (queryArgs.timeRange as V1TimeRange) ?? {
-    isoDuration: metricsViewSpec.defaultTimeRange ?? TimeRangePreset.ALL_TIME,
+    isoDuration: defaultTimeRange ?? TimeRangePreset.ALL_TIME,
   };
   if (!timeRange.end && allTimeRange.timeRangeSummary?.max) {
     // alerts only have duration optionally offset, end is added during execution by reconciler

web-common/src/features/alerts/utils.spec.ts

@@ -10,10 +10,12 @@ import { describe, expect, it } from "vitest";
 const MetricsView: V1MetricsViewSpec = {
   measures: [
     {
+      expression: "",
       name: "total_records",
       label: "Total records",
     },
   ],
+  dimensions: [],
 };
 
 describe("generateAlertName", () => {

web-common/src/features/dashboards/dimension-table/dimension-table-export-utils.ts

@@ -37,7 +37,10 @@ export function getDimensionTableExportArgs(
     ([metricViewName, dashboardState, timeControlState, metricsView]) => {
       if (!metricsView.data || !timeControlState.ready) return undefined;
 
-      const timeRange = mapTimeRange(timeControlState, metricsView.data);
+      const timeRange = mapTimeRange(
+        timeControlState,
+        metricsView.data.defaultTimeRange,
+      );
       if (!timeRange) return undefined;
 
       const comparisonTimeRange = mapComparisonTimeRange(