diff --git a/admin/server/alerts.go b/admin/server/alerts.go index a93ffa423214..6909ab87d13b 100644 --- a/admin/server/alerts.go +++ b/admin/server/alerts.go @@ -589,7 +589,7 @@ type alertYAML struct { RenotifyAfter uint32 `yaml:"renotify_after"` Notify struct { Email struct { - Recipients []string `yaml:"emails"` + Recipients []string `yaml:"recipients"` } Slack struct { Users []string `yaml:"users"` diff --git a/web-admin/src/features/alerts/history/AlertHistoryTableCompositeCell.svelte b/web-admin/src/features/alerts/history/AlertHistoryTableCompositeCell.svelte index 6aa07acc02a0..9075936f58f3 100644 --- a/web-admin/src/features/alerts/history/AlertHistoryTableCompositeCell.svelte +++ b/web-admin/src/features/alerts/history/AlertHistoryTableCompositeCell.svelte @@ -11,7 +11,6 @@ export let timeZone: string; export let currentExecution: V1AlertExecution | null; export let result: V1AssertionResult; - $: console.log("result", result);
diff --git a/web-admin/src/features/alerts/metadata/AlertMetadata.svelte b/web-admin/src/features/alerts/metadata/AlertMetadata.svelte index a99f05c096f4..169af87e4f7e 100644 --- a/web-admin/src/features/alerts/metadata/AlertMetadata.svelte +++ b/web-admin/src/features/alerts/metadata/AlertMetadata.svelte @@ -11,9 +11,10 @@ useIsAlertCreatedByCode, } from "@rilldata/web-admin/features/alerts/selectors"; import ProjectAccessControls from "@rilldata/web-admin/features/projects/ProjectAccessControls.svelte"; - import EmailRecipients from "@rilldata/web-admin/features/scheduled-reports/metadata/EmailRecipients.svelte"; import MetadataLabel from "@rilldata/web-admin/features/scheduled-reports/metadata/MetadataLabel.svelte"; + import MetadataList from "@rilldata/web-admin/features/scheduled-reports/metadata/MetadataList.svelte"; import MetadataValue from "@rilldata/web-admin/features/scheduled-reports/metadata/MetadataValue.svelte"; + import { extractNotifier } from "@rilldata/web-admin/features/scheduled-reports/metadata/notifiers-utils"; import { IconButton } from "@rilldata/web-common/components/button"; import Button from "@rilldata/web-common/components/button/Button.svelte"; import * as DropdownMenu from "@rilldata/web-common/components/dropdown-menu"; @@ -40,13 +41,16 @@ $: dashboardTitle = $dashboard.data?.metricsView.spec.title || $dashboardName.data; + $: alertSpec = $alertQuery.data?.resource?.alert?.spec; + $: metricsViewAggregationRequest = JSON.parse( - $alertQuery.data?.resource?.alert?.spec?.queryArgsJson ?? "{}", + alertSpec?.queryArgsJson ?? "{}", ) as V1MetricsViewAggregationRequest; - $: snoozeLabel = humaniseAlertSnoozeOption( - $alertQuery.data?.resource?.alert?.spec, - ); + $: snoozeLabel = humaniseAlertSnoozeOption(alertSpec); + + $: emailNotifier = extractNotifier(alertSpec?.notifiers, "email"); + $: slackNotifier = extractNotifier(alertSpec?.notifiers, "slack"); // Actions const queryClient = useQueryClient(); @@ -71,7 +75,7 @@ } -{#if $alertQuery.data?.resource?.alert?.spec} +{#if alertSpec}
@@ -83,9 +87,7 @@ {/if} @@ -93,7 +95,7 @@

- {$alertQuery.data.resource.alert.spec.title} + {alertSpec.title}

{#if !$isAlertCreatedByCode.data} @@ -159,19 +161,28 @@ filters={metricsViewAggregationRequest?.having} /> - - n.connector === "email", - )?.properties?.recipients ?? []} - /> + + {#if slackNotifier} + + {/if} + + + {#if emailNotifier} + + {/if}
{/if} {#if $alertQuery.data && $dashboard.data?.metricsView.spec} (showEditAlertDialog = false)} metricsViewName={$dashboardName.data} /> diff --git a/web-admin/src/features/scheduled-reports/metadata/MetadataList.svelte b/web-admin/src/features/scheduled-reports/metadata/MetadataList.svelte new file mode 100644 index 000000000000..c12eb2b5aff5 --- /dev/null +++ b/web-admin/src/features/scheduled-reports/metadata/MetadataList.svelte @@ -0,0 +1,17 @@ + + +
+ {label} ({data.length}) +
+ {#each data as datum} + + {datum} + + {/each} +
+
diff --git a/web-admin/src/features/scheduled-reports/metadata/ReportMetadata.svelte b/web-admin/src/features/scheduled-reports/metadata/ReportMetadata.svelte index 1a04cb9c0d0f..5bde39bf026b 100644 --- a/web-admin/src/features/scheduled-reports/metadata/ReportMetadata.svelte +++ b/web-admin/src/features/scheduled-reports/metadata/ReportMetadata.svelte @@ -1,6 +1,7 @@
@@ -22,10 +25,16 @@ {/if} + {#if showSectionToggle} +
+ + {/if} {#if description} {description} {/if}
- + {#if enabled} + + {/if}
diff --git a/web-common/src/components/forms/InputArray.svelte b/web-common/src/components/forms/InputArray.svelte index f4a5d87a0f50..5358078532b8 100644 --- a/web-common/src/components/forms/InputArray.svelte +++ b/web-common/src/components/forms/InputArray.svelte @@ -1,5 +1,5 @@
@@ -42,6 +62,9 @@ {/if} + {#if description} +
{description}
+ {/if}
{/if}
- - dispatch("remove-item", { - index: i, - })} - > + handleRemove(i)}>
- {#if errors[i]?.[accessorKey]} + {#if errs[i]?.[accessorKey]}
- {errors[i][accessorKey]} + {errs[i][accessorKey]}
{/if}
{/each} -