updating notification method logic

lint
apache · Feb 23, 2024 · 642b9d3 · 642b9d3
1 parent b164d2d
commit 642b9d3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/superset-frontend/src/features/alerts/AlertReportModal.tsx b/superset-frontend/src/features/alerts/AlertReportModal.tsx
@@ -493,9 +493,16 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
   >([]);
   const onNotificationAdd = () => {
     const settings: NotificationSetting[] = notificationSettings.slice();
+    const options: NotificationMethodOption[] =
+      allowedNotificationMethods.slice();
+    settings.forEach(setting => {
+      if (setting.method) {
+        options.splice(options.indexOf(setting.method), 1);
+      }
+    });
     settings.push({
       recipients: '',
-      options: allowedNotificationMethods,
+      options,
     });
 
     setNotificationSettings(settings);
@@ -543,8 +550,16 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     setting: NotificationSetting,
   ) => {
     const settings = notificationSettings.slice();
-
+    // if you've changed notification method
+    if (settings[index].method !== setting.method) {
+      // remove subsequent notification methods
+      while (settings.length - 1 > index) {
+        settings.pop();
+        setNotificationAddState('active');
+      }
+    }
     settings[index] = setting;
+
     setNotificationSettings(settings);
 
     if (setting.method !== undefined && notificationAddState !== 'hidden') {

diff --git a/superset-frontend/src/features/alerts/components/NotificationMethod.tsx b/superset-frontend/src/features/alerts/components/NotificationMethod.tsx
@@ -124,7 +124,7 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
               )}
               value={method}
             />
-            {method !== undefined && index !== 0 && !!onRemove ? (
+            {index !== 0 && !!onRemove ? (
               <span
                 role="button"
                 tabIndex={0}

diff --git a/superset-frontend/src/features/alerts/types.ts b/superset-frontend/src/features/alerts/types.ts
@@ -147,4 +147,3 @@ export enum Sections {
   Schedule = 'scheduleSection',
   Notification = 'notificationSection',
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -147,4 +147,3 @@ export enum Sections {
		Schedule = 'scheduleSection',
		Notification = 'notificationSection',
		}