Add condition when add custom email subject with only space

apache · May 12, 2024 · cd5f364 · cd5f364
1 parent 41ce35c
commit cd5f364
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 8 deletions.
diff --git a/superset-frontend/src/features/alerts/AlertReportModal.tsx b/superset-frontend/src/features/alerts/AlertReportModal.tsx
@@ -367,6 +367,7 @@ export const TRANSLATIONS = {
   CRONTAB_ERROR_TEXT: t('crontab'),
   WORKING_TIMEOUT_ERROR_TEXT: t('working timeout'),
   RECIPIENTS_ERROR_TEXT: t('recipients'),
+  EMAIL_SUBJECT_ERROR_TEXT: t('email subject'),
   ERROR_TOOLTIP_MESSAGE: t(
     'Not all required fields are complete. Please provide the following:',
   ),
@@ -492,6 +493,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     NotificationSetting[]
   >([]);
   const [emailSubject, setEmailSubject] = useState<string>('');
+  const [emailError, setEmailError] = useState(false);
 
   const onNotificationAdd = () => {
     setNotificationSettings([
@@ -1062,6 +1064,11 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
   const validateNotificationSection = () => {
     const hasErrors = !checkNotificationSettings();
     const errors = hasErrors ? [TRANSLATIONS.RECIPIENTS_ERROR_TEXT] : [];
+
+    if (emailError){
+      errors.push(TRANSLATIONS.EMAIL_SUBJECT_ERROR_TEXT);
+    }
+
     updateValidationStatus(Sections.Notification, errors);
   };
 
@@ -1217,6 +1224,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     contentType,
     notificationSettings,
     conditionNotNull,
+    emailError,
   ]);
   useEffect(() => {
     enforceValidation();
@@ -1270,6 +1278,10 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
     }
   };
 
+  const handleErrorUpdate = (hasError: boolean) => {
+    setEmailError(hasError);
+  };
+
   return (
     <StyledModal
       className="no-content-padding"
@@ -1720,6 +1732,7 @@ const AlertReportModal: FunctionComponent<AlertReportModalProps> = ({
                 onInputChange={onInputChange}
                 email_subject={currentAlert?.email_subject || ''}
                 defaultSubject={emailSubject || ''}
+                setErrorSubject={handleErrorUpdate}
               />
             </StyledNotificationMethodWrapper>
           ))}

diff --git a/superset-frontend/src/features/alerts/components/NotificationMethod.tsx b/superset-frontend/src/features/alerts/components/NotificationMethod.tsx
@@ -30,6 +30,12 @@ const StyledNotificationMethod = styled.div`
     textarea {
       height: auto;
     }
+
+    &.error {
+      input {
+        border-color: ${({ theme }) => theme.colors.error.base};
+      }
+    }
   }
 
   .inline-container {
@@ -56,10 +62,14 @@ interface NotificationMethodProps {
   ) => void;
   email_subject: string;
   defaultSubject: string;
+  setErrorSubject: (hasError: boolean) => void;
 }
 
 const TRANSLATIONS = {
   EMAIL_SUBJECT_NAME: t('Email subject name (optional)'),
+  EMAIL_SUBJECT_ERROR_TEXT: t(
+    'Please enter valid text. Spaces alone are not permitted.',
+  ),
 };
 
 export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
@@ -70,11 +80,13 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
   onInputChange,
   email_subject,
   defaultSubject,
+  setErrorSubject,
 }) => {
   const { method, recipients, options } = setting || {};
   const [recipientValue, setRecipientValue] = useState<string>(
     recipients || '',
   );
+  const [error, setError] = useState(false);
   const theme = useTheme();
 
   if (!setting) {
@@ -115,9 +127,17 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
   const onSubjectChange = (
     event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>,
   ) => {
+    const value = event.target.value;
+
     if (onInputChange) {
       onInputChange(event);
     }
+
+    const hasError = value.length > 0 && value.trim().length === 0;
+    setError(hasError);
+    if (setErrorSubject) {
+      setErrorSubject(hasError);
+    }
   };
 
   // Set recipients
@@ -166,15 +186,25 @@ export const NotificationMethod: FunctionComponent<NotificationMethodProps> = ({
                   <div className="control-label">
                     {TRANSLATIONS.EMAIL_SUBJECT_NAME}
                   </div>
-                  <div className="input-container">
+                  <div className={`input-container ${error ? 'error' : ''}`}>
                     <input
                       type="text"
                       name="email_subject"
                       value={email_subject}
                       placeholder={defaultSubject}
                       onChange={onSubjectChange}
                     />
-                  </div>{' '}
+                  </div>
+                  {error && (
+                    <div
+                      style={{
+                        color: theme.colors.error.base,
+                        fontSize: theme.gridUnit * 3,
+                      }}
+                    >
+                      {TRANSLATIONS.EMAIL_SUBJECT_ERROR_TEXT}
+                    </div>
+                  )}
                 </>
               ) : null}
             </StyledInputContainer>

diff --git a/..._add_subject_column_to_report_schedule.py → ..._add_subject_column_to_report_schedule.py b/..._add_subject_column_to_report_schedule.py → ..._add_subject_column_to_report_schedule.py
@@ -16,18 +16,18 @@
 # under the License.
 """add subject column to report schedule
 
-Revision ID: 100e3853bb0c
-Revises: 5f57af97bc3f
-Create Date: 2024-05-05 17:19:37.789891
+Revision ID: 9621c6d56ffb
+Revises: 4081be5b6b74
+Create Date: 2024-05-10 11:09:12.046862
 
 """
 
 import sqlalchemy as sa
 from alembic import op
 
 # revision identifiers, used by Alembic.
-revision = "100e3853bb0c"
-down_revision = "5f57af97bc3f"
+revision = '9621c6d56ffb'
+down_revision = '4081be5b6b74'
 
 
 def upgrade():
@@ -38,4 +38,4 @@ def upgrade():
 
 
 def downgrade():
-    op.drop_column("report_schedule", "email_subject")
+    op.drop_column("report_schedule", "email_subject")