Merge pull request #5460 from gooddata/mkn-f1-739

fix: show % in alerts description
gooddata · Oct 9, 2024 · 57f6002 · 57f6002
2 parents ed11138 + de6c746
commit 57f6002
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 18 deletions.
diff --git a/...presentation/alerting/DefaultAlertingManagementDialog/DefaultAlertingManagementDialog.tsx b/...presentation/alerting/DefaultAlertingManagementDialog/DefaultAlertingManagementDialog.tsx
@@ -16,6 +16,7 @@ import { Alerts } from "./components/AlertsList.js";
 import { DeleteAlertConfirmDialog } from "./components/DeleteAlertConfirmDialog.js";
 import { PauseAlertRunner } from "./components/PauseAlertRunner.js";
 import { GoodDataSdkError } from "@gooddata/sdk-ui";
+import { useDashboardSelector, selectIsWhiteLabeled } from "../../../model/index.js";
 
 /**
  * @alpha
@@ -34,6 +35,7 @@ export const AlertingManagementDialog: React.FC<IAlertingManagementDialogProps>
     const [alertToDelete, setAlertToDelete] = useState<IAutomationMetadataObject | null>(null);
     const [alertToPause, setAlertToPause] = useState<[IAutomationMetadataObject, boolean] | null>(null);
     const intl = useIntl();
+    const isWhiteLabeled = useDashboardSelector(selectIsWhiteLabeled);
 
     const handleAlertDelete = useCallback((alert: IAutomationMetadataObject) => {
         setAlertToDelete(alert);
@@ -109,11 +111,13 @@ export const AlertingManagementDialog: React.FC<IAlertingManagementDialogProps>
                 </div>
                 <div className="gd-content-divider"></div>
                 <div className="gd-buttons">
-                    <Hyperlink
-                        text={intl.formatMessage({ id: helpTextId })}
-                        href="https://www.gooddata.com/docs/cloud/create-dashboards/automation/alerts/"
-                        iconClass="gd-icon-circle-question"
-                    />
+                    {!isWhiteLabeled ? (
+                        <Hyperlink
+                            text={intl.formatMessage({ id: helpTextId })}
+                            href="https://www.gooddata.com/docs/cloud/create-dashboards/automation/alerts/"
+                            iconClass="gd-icon-circle-question"
+                        />
+                    ) : null}
                     <Button
                         onClick={onClose}
                         className="gd-button-secondary s-close-button"

diff --git a/...-dashboard/src/presentation/alerting/DefaultAlertingManagementDialog/components/Alert.tsx b/...-dashboard/src/presentation/alerting/DefaultAlertingManagementDialog/components/Alert.tsx
@@ -19,6 +19,7 @@ import { useAlertValidation } from "../../../widget/insight/configuration/Insigh
 import {
     getAlertThreshold,
     getOperatorTitle,
+    getValueSuffix,
 } from "../../../widget/insight/configuration/InsightAlertConfig/utils.js";
 
 interface IAlertProps {
@@ -62,7 +63,8 @@ export const Alert: React.FC<IAlertProps> = (props) => {
     const insightWidget = isInsightWidget(widget) ? widget : undefined;
     const widgetName = insightWidget?.title ?? "";
 
-    const subtitle = [`${getOperatorTitle(intl, alert.alert)} ${threshold}`, widgetName]
+    const valueSuffix = getValueSuffix(alert.alert) ?? "";
+    const subtitle = [`${getOperatorTitle(intl, alert.alert)} ${threshold}${valueSuffix}`, widgetName]
         .filter(Boolean)
         .join(" • ");
 

diff --git a/...c/presentation/scheduledEmail/DefaultScheduledEmailDialog/DefaultScheduledEmailDialog.tsx b/...c/presentation/scheduledEmail/DefaultScheduledEmailDialog/DefaultScheduledEmailDialog.tsx
@@ -28,6 +28,7 @@ import {
     selectEntitlementMaxAutomationRecipients,
     selectEntitlementMinimumRecurrenceMinutes,
     selectIsCrossFiltering,
+    selectIsWhiteLabeled,
 } from "../../../model/index.js";
 import { IScheduledEmailDialogProps } from "../types.js";
 import { getDefaultCronExpression, useEditScheduledEmail } from "./hooks/useEditScheduledEmail.js";
@@ -72,6 +73,8 @@ export function ScheduledMailDialogRenderer({
         IAutomationMetadataObject | IAutomationMetadataObjectDefinition | null
     >(null);
 
+    const isWhiteLabeled = useDashboardSelector(selectIsWhiteLabeled);
+
     const handleScheduleDeleteSuccess = () => {
         onDeleteSuccess?.();
         setScheduledEmailToDelete(null);
@@ -155,11 +158,13 @@ export function ScheduledMailDialogRenderer({
                         showProgressIndicator={isSavingScheduledEmail}
                         footerLeftRenderer={() => (
                             <div className="gd-notifications-channels-dialog-footer-link">
-                                <Hyperlink
-                                    text={intl.formatMessage({ id: helpTextId })}
-                                    href="https://www.gooddata.com/docs/cloud/create-dashboards/automation/scheduled-exports/#ScheduleExportsinDashboards-ScheduleExport"
-                                    iconClass="gd-icon-circle-question"
-                                />
+                                {!isWhiteLabeled ? (
+                                    <Hyperlink
+                                        text={intl.formatMessage({ id: helpTextId })}
+                                        href="https://www.gooddata.com/docs/cloud/create-dashboards/automation/scheduled-exports/#ScheduleExportsinDashboards-ScheduleExport"
+                                        iconClass="gd-icon-circle-question"
+                                    />
+                                ) : null}
                                 {scheduledExportToEdit ? (
                                     <Button
                                         className="gd-button-link-dimmed"

diff --git a/...uledEmail/DefaultScheduledEmailManagementDialog/DefaultScheduledEmailManagementDialog.tsx b/...uledEmail/DefaultScheduledEmailManagementDialog/DefaultScheduledEmailManagementDialog.tsx
@@ -16,6 +16,7 @@ import {
     useDashboardSelector,
     DEFAULT_MAX_AUTOMATIONS,
     selectCanCreateAutomation,
+    selectIsWhiteLabeled,
 } from "../../../model/index.js";
 import { messages } from "../../../locales.js";
 import { isMobileView } from "../DefaultScheduledEmailDialog/utils/responsive.js";
@@ -41,6 +42,7 @@ export const ScheduledEmailManagementDialog: React.FC<IScheduledEmailManagementD
     const currentUser = useDashboardSelector(selectCurrentUser);
     const maxAutomationsEntitlement = useDashboardSelector(selectEntitlementMaxAutomations);
     const unlimitedAutomationsEntitlement = useDashboardSelector(selectEntitlementUnlimitedAutomations);
+    const isWhiteLabeled = useDashboardSelector(selectIsWhiteLabeled);
     const maxAutomations = parseInt(maxAutomationsEntitlement?.value ?? DEFAULT_MAX_AUTOMATIONS, 10);
     const intl = useIntl();
 
@@ -108,11 +110,13 @@ export const ScheduledEmailManagementDialog: React.FC<IScheduledEmailManagementD
                 </div>
                 <div className="gd-content-divider"></div>
                 <div className="gd-buttons">
-                    <Hyperlink
-                        text={intl.formatMessage({ id: helpTextId })}
-                        href="https://www.gooddata.com/docs/cloud/create-dashboards/automation/scheduled-exports/#ScheduleExportsinDashboards-ScheduleExport"
-                        iconClass="gd-icon-circle-question"
-                    />
+                    {!isWhiteLabeled ? (
+                        <Hyperlink
+                            text={intl.formatMessage({ id: helpTextId })}
+                            href="https://www.gooddata.com/docs/cloud/create-dashboards/automation/scheduled-exports/#ScheduleExportsinDashboards-ScheduleExport"
+                            iconClass="gd-icon-circle-question"
+                        />
+                    ) : null}
                     <Button
                         onClick={onClose}
                         className="gd-button-secondary s-close-button"

diff --git a/...board/src/presentation/widget/insight/configuration/InsightAlertConfig/AlertsListItem.tsx b/...board/src/presentation/widget/insight/configuration/InsightAlertConfig/AlertsListItem.tsx
@@ -6,7 +6,7 @@ import { useTheme } from "@gooddata/sdk-ui-theme-provider";
 import { Icon } from "@gooddata/sdk-ui-kit";
 import cx from "classnames";
 import { AlertActionsDropdown } from "./AlertActionsDropdown.js";
-import { getAlertThreshold, getOperatorTitle } from "./utils.js";
+import { getAlertThreshold, getOperatorTitle, getValueSuffix } from "./utils.js";
 import { gdColorNegative } from "../../../../constants/colors.js";
 import { useAlertValidation } from "./hooks/useAlertValidation.js";
 import {
@@ -33,7 +33,10 @@ export const AlertsListItem: React.FC<IAlertsListItemProps> = ({
     const theme = useTheme();
     const intl = useIntl();
     const isPaused = alert.alert?.trigger?.state === "PAUSED";
-    const description = `${getOperatorTitle(intl, alert.alert)} ${getAlertThreshold(alert.alert)}`;
+    const valueSuffix = getValueSuffix(alert.alert) ?? "";
+    const description = `${getOperatorTitle(intl, alert.alert)} ${getAlertThreshold(
+        alert.alert,
+    )}${valueSuffix}`;
     const { isValid } = useAlertValidation(alert);
     const currentUser = useDashboardSelector(selectCurrentUser);
     const canManageWorkspace = useDashboardSelector(selectCanManageWorkspace);