fix: geo chart, arithmetic metric repairs

- Alert on "Is a total" metric get error email - No metric found on geo chart alert setting - Timezone view repair JIRA: F1-805, F1-804, F1-786
gooddata · Oct 14, 2024 · 8a912bf · 8a912bf
1 parent ec428ce
commit 8a912bf
Show file tree

Hide file tree

Showing 6 changed files with 251 additions and 80 deletions.
diff --git a/...c/presentation/scheduledEmail/DefaultScheduledEmailDialog/DefaultScheduledEmailDialog.tsx b/...c/presentation/scheduledEmail/DefaultScheduledEmailDialog/DefaultScheduledEmailDialog.tsx
@@ -34,7 +34,7 @@ import { IScheduledEmailDialogProps } from "../types.js";
 import { getDefaultCronExpression, useEditScheduledEmail } from "./hooks/useEditScheduledEmail.js";
 import { useSaveScheduledEmailToBackend } from "./hooks/useSaveScheduledEmailToBackend.js";
 import { IAutomationMetadataObject, IAutomationMetadataObjectDefinition } from "@gooddata/sdk-model";
-import { getTimezoneByIdentifier, TIMEZONE_DEFAULT } from "./utils/timezone.js";
+import { TIMEZONE_DEFAULT } from "./utils/timezone.js";
 import { DASHBOARD_DIALOG_OVERS_Z_INDEX, DASHBOARD_TITLE_MAX_LENGTH } from "../../constants/index.js";
 import { isMobileView } from "./utils/responsive.js";
 import { DeleteScheduleConfirmDialog } from "../DefaultScheduledEmailManagementDialog/components/DeleteScheduleConfirmDialog.js";
@@ -208,12 +208,7 @@ export function ScheduledMailDialogRenderer({
                                 cronExpression={
                                     editedAutomation.schedule?.cron ?? getDefaultCronExpression(startDate)
                                 }
-                                timezone={
-                                    (
-                                        getTimezoneByIdentifier(editedAutomation.schedule?.timezone) ??
-                                        TIMEZONE_DEFAULT
-                                    ).title
-                                }
+                                timezone={editedAutomation.schedule?.timezone ?? TIMEZONE_DEFAULT.identifier}
                                 dateFormat={dateFormat ?? "MM/dd/yyyy"}
                                 locale={locale}
                                 weekStart={weekStart}

diff --git a/...-dashboard/src/presentation/widget/insight/configuration/InsightAlertConfig/EditAlert.tsx b/...-dashboard/src/presentation/widget/insight/configuration/InsightAlertConfig/EditAlert.tsx
@@ -95,6 +95,7 @@ export const EditAlert: React.FC<IEditAlertProps> = ({
         createAlert,
         updateAlert,
     } = useEditAlert({
+        metrics: measures,
         alert,
         onCreate,
         onUpdate,

diff --git a/...rd/src/presentation/widget/insight/configuration/InsightAlertConfig/hooks/useEditAlert.ts b/...rd/src/presentation/widget/insight/configuration/InsightAlertConfig/hooks/useEditAlert.ts
@@ -20,22 +20,25 @@ import {
 import { AlertMetric } from "../../../types.js";
 
 export interface IUseEditAlertProps {
+    metrics: AlertMetric[];
     alert: IAutomationMetadataObject;
     catalogMeasures: ICatalogMeasure[];
     onCreate?: (alert: IAutomationMetadataObjectDefinition) => void;
     onUpdate?: (alert: IAutomationMetadataObject) => void;
 }
 
-export const useEditAlert = ({ alert, onCreate, onUpdate, catalogMeasures }: IUseEditAlertProps) => {
+export const useEditAlert = ({ metrics, alert, onCreate, onUpdate, catalogMeasures }: IUseEditAlertProps) => {
     const [viewMode, setViewMode] = useState<"edit" | "configuration">("edit");
     const [updatedAlert, setUpdatedAlert] = useState<IAutomationMetadataObject>(alert);
 
     const changeMeasure = (measure: AlertMetric) => {
-        setUpdatedAlert((alert) => transformAlertByMetric(alert, measure, catalogMeasures));
+        setUpdatedAlert((alert) => transformAlertByMetric(metrics, alert, measure, catalogMeasures));
     };
 
     const changeComparisonOperator = (measure: AlertMetric, comparisonOperator: IAlertComparisonOperator) => {
-        setUpdatedAlert((alert) => transformAlertByComparisonOperator(alert, measure, comparisonOperator));
+        setUpdatedAlert((alert) =>
+            transformAlertByComparisonOperator(metrics, alert, measure, comparisonOperator),
+        );
     };
 
     const changeRelativeOperator = (
@@ -45,6 +48,7 @@ export const useEditAlert = ({ alert, onCreate, onUpdate, catalogMeasures }: IUs
     ) => {
         setUpdatedAlert((alert) =>
             transformAlertByRelativeOperator(
+                metrics,
                 alert,
                 measure,
                 relativeOperator,

diff --git a/.../presentation/widget/insight/configuration/InsightAlertConfig/hooks/useInsightAlerting.ts b/.../presentation/widget/insight/configuration/InsightAlertConfig/hooks/useInsightAlerting.ts
@@ -150,6 +150,7 @@ export const useInsightWidgetAlerting = ({ widget, closeInsightWidgetMenu }: IIn
             setDefaultAlert(
                 createDefaultAlert(
                     widgetFilters,
+                    supportedMeasures,
                     defaultMeasure,
                     defaultNotificationChannelId,
                     metricsAndFacts?.metrics ?? [],
@@ -166,6 +167,7 @@ export const useInsightWidgetAlerting = ({ widget, closeInsightWidgetMenu }: IIn
         defaultAlert,
         defaultMeasure,
         defaultNotificationChannelId,
+        supportedMeasures,
         widgetFilters,
         widgetFiltersStatus,
         metricsAndFacts,