Modify code to work well

apache · Feb 21, 2024 · 9a46987 · 9a46987
1 parent d651ef4
commit 9a46987
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/superset-frontend/src/features/alerts/AlertReportModal.tsx b/superset-frontend/src/features/alerts/AlertReportModal.tsx
@@ -1250,14 +1250,6 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     }
   };
 
-  const updatedNotificationSettings = notificationSettings.map(setting => {
-    const updatedEmailSubject = setting.email_subject || emailSubject;
-    return {
-      ...setting,
-      email_subject: updatedEmailSubject,
-    };
-  });
-
   return (
     <StyledModal
       className="no-content-padding"
@@ -1694,7 +1686,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
           }
           key="notification"
         >
-          {updatedNotificationSettings.map((notificationSetting, i) => {
+          {notificationSettings.map((notificationSetting, i) => {
             return (
               <StyledNotificationMethodWrapper
                 key={`NotificationMethodWrapper-${i}`}
@@ -1706,6 +1698,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
                   onUpdate={updateNotificationSetting}
                   onRemove={removeNotificationSetting}
                   onInputChange={onInputChange}
+                  email_subject={currentAlert?.email_subject || ''}
                   defaultSubject={emailSubject || ''}
                 />
               </StyledNotificationMethodWrapper>

diff --git a/superset-frontend/src/features/alerts/components/NotificationMethod.tsx b/superset-frontend/src/features/alerts/components/NotificationMethod.tsx
@@ -48,9 +48,9 @@ const StyledNotificationMethod = styled.div`
 
 type NotificationSetting = {
   method?: NotificationMethodOption;
+  email_subject?: string;
   recipients: string;
   options: NotificationMethodOption[];
-  email_subject: string;
 };
 
 interface NotificationMethodProps {
@@ -61,6 +61,7 @@ interface NotificationMethodProps {
   onInputChange?: (
     event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>,
   ) => void;
+  email_subject?: string;
   defaultSubject?: string;
 }
 
@@ -74,9 +75,10 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
   onUpdate,
   onRemove,
   onInputChange,
+  email_subject,
   defaultSubject,
 }) => {
-  const { method, recipients, options, email_subject } = setting || {};
+  const { method, recipients, options } = setting || {};
   const [recipientValue, setRecipientValue] = useState<string>(
     recipients || '',
   );
@@ -85,6 +87,18 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
   );
   const theme = useTheme();
 
+  useEffect(() => {
+    if (onUpdate) {
+      const updatedSetting: NotificationSetting = {
+        ...setting,
+        email_subject: defaultSubject,
+        recipients: setting?.recipients ?? '',
+        options: setting?.options ?? [],
+      };
+      onUpdate(index, updatedSetting);
+    }
+  }, []);
+
   useEffect(() => {
     setEmailSubject(email_subject || defaultSubject);
   }, [defaultSubject]);

diff --git a/tests/integration_tests/reports/api_tests.py b/tests/integration_tests/reports/api_tests.py
@@ -1041,6 +1041,7 @@ def test_create_multiple_creation_method_report_schedule_dashboards(self):
             "crontab": "0 9 * * *",
             "working_timeout": 3600,
             "dashboard": dashboard.id,
+            "email_subject": "Subject",
         }
         uri = "api/v1/report/"
         rv = self.post_assert_metric(uri, report_schedule_data, "post")
@@ -1057,6 +1058,7 @@ def test_create_multiple_creation_method_report_schedule_dashboards(self):
             "crontab": "0 9 * * *",
             "working_timeout": 3600,
             "dashboard": dashboard.id,
+            "email_subject": "Subject",
         }
         uri = "api/v1/report/"
         rv = self.post_assert_metric(uri, report_schedule_data, "post")