Merge pull request #2738 from weseek/imprv/show-mailer-status

Imprv/show mailer status

resource/locales/en_US/admin/admin.json

@@ -27,6 +27,7 @@
     "attach_enable": "You can attach files other than image files if you enable this option.",
     "update": "Update",
     "mail_settings": "E-mail Settings",
+    "mailer_is_not_set_up": "E-mail setting is not set up.",
     "from_e-mail_address": "From e-mail address",
     "transmission_method":"Transmission Method",
     "smtp_label":"SMTP",

resource/locales/ja_JP/admin/admin.json

@@ -27,6 +27,7 @@
     "attach_enable": "許可をしている場合、画像以外のファイルをページに添付可能になります。",
     "update": "更新",
     "mail_settings": "メールの設定",
+    "mailer_is_not_set_up": "メール設定がセットアップされていません。",
     "from_e-mail_address": "Fromアドレス",
     "transmission_method":"送信方法",
     "smtp_label":"SMTP",

resource/locales/zh_CN/admin/admin.json

@@ -27,6 +27,7 @@
 		"attach_enable": "如果启用此选项，则可以附加图像文件以外的文件。",
 		"update": "更新",
 		"mail_settings": "邮件设置",
+    "mailer_is_not_set_up": "E-mail setting is not set up.",
     "transmission_method":"Transmission Method",
     "smtp_label":"SMTP",
     "ses_label":"SES(AWS)",

src/client/js/components/Admin/App/MailSetting.jsx

@@ -13,6 +13,7 @@ import SesSetting from './SesSetting';
 
 function MailSetting(props) {
   const { t, adminAppContainer } = props;
+
   const transmissionMethods = ['smtp', 'ses'];
 
   async function submitHandler() {
@@ -38,8 +39,12 @@ function MailSetting(props) {
     }
   }
 
+
   return (
     <React.Fragment>
+      {!adminAppContainer.state.isMailerSetup && (
+        <div className="alert alert-danger"><i className="icon-exclamation"></i> {t('admin:app_setting.mailer_is_not_set_up')}</div>
+      )}
       <div className="row form-group mb-5">
         <label className="col-md-3 col-form-label text-right">{t('admin:app_setting.from_e-mail_address')}</label>
         <div className="col-md-6">

src/client/js/services/AdminAppContainer.js

@@ -23,6 +23,7 @@ export default class AdminAppContainer extends Container {
       siteUrl: '',
       envSiteUrl: '',
       isSetSiteUrl: true,
+      isMailerSetup: false,
       fromAddress: '',
       transmissionMethod: '',
       smtpHost: '',
@@ -63,6 +64,9 @@ export default class AdminAppContainer extends Container {
       siteUrl: appSettingsParams.siteUrl,
       envSiteUrl: appSettingsParams.envSiteUrl,
       isSetSiteUrl: !!appSettingsParams.siteUrl,
+      // GW-3714 manage mailer state
+      isMailerSetup: true,
+      // isMailerSetup: appSettingsParams.isMailerSetup,
       fromAddress: appSettingsParams.fromAddress,
       transmissionMethod: appSettingsParams.transmissionMethod,
       smtpHost: appSettingsParams.smtpHost,
@@ -271,6 +275,9 @@ export default class AdminAppContainer extends Container {
       smtpPassword: this.state.smtpPassword,
     });
     const { mailSettingParams } = response.data;
+    // GW-3714 manage mailer state
+    this.setState({ isMailerSetup: true });
+    // this.setState({ isMailerSetup: mailSettingParams.isMailerSetup });
     return mailSettingParams;
   }
 
@@ -287,6 +294,9 @@ export default class AdminAppContainer extends Container {
       sesSecretAccessKey: this.state.sesSecretAccessKey,
     });
     const { mailSettingParams } = response.data;
+    // GW-3714 manage mailer state
+    this.setState({ isMailerSetup: true });
+    // this.setState({ isMailerSetup: mailSettingParams.isMailerSetup });
     return mailSettingParams;
   }