Merge branch 'imprv/show-mailer-status' into imprv/manage-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_invalid": "The current mail setting is invalid.",
     "from_e-mail_address": "From e-mail address",
     "send_test_email": "Send a test-email",
     "success_to_send_test_email": "Success to send a test-email",

resource/locales/ja_JP/admin/admin.json

@@ -27,6 +27,7 @@
     "attach_enable": "許可をしている場合、画像以外のファイルをページに添付可能になります。",
     "update": "更新",
     "mail_settings": "メールの設定",
+    "mailer_is_invalid": "メールサーバーが有効ではありません。",
     "from_e-mail_address": "Fromアドレス",
     "send_test_email": "テストメールを送信",
     "success_to_send_test_email": "テストメールを送信しました。",

resource/locales/zh_CN/admin/admin.json

@@ -27,7 +27,8 @@
 		"attach_enable": "如果启用此选项，则可以附加图像文件以外的文件。",
 		"update": "更新",
 		"mail_settings": "邮件设置",
-		"from_e-mail_address": "From e-mail address",
+    "mailer_is_invalid": "The current mail setting is invalid.",
+    "from_e-mail_address": "From e-mail address",
     "send_test_email": "Send a test-email",
     "success_to_send_test_email": "Success to send a test-email",
     "smtp_settings": "SMTP 设置",

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

@@ -61,6 +61,9 @@ class MailSetting extends React.Component {
 
     return (
       <React.Fragment>
+        {!adminAppContainer.state.isMailerActive && (
+          <p className="alert alert-danger"><i className="icon-exclamation"></i> {t('admin:app_setting.mailer_is_invalid')}</p>
+        )}
         <div className="row form-group mb-5">
           <label className="col-md-3 col-form-label text-left">{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,
+      isMailerActive: false,
       fromAddress: '',
       smtpHost: '',
       smtpPort: '',
@@ -62,6 +63,9 @@ export default class AdminAppContainer extends Container {
       siteUrl: appSettingsParams.siteUrl,
       envSiteUrl: appSettingsParams.envSiteUrl,
       isSetSiteUrl: !!appSettingsParams.siteUrl,
+      // GW-3714 manage mailer state
+      isMailerActive: true,
+      // isMailerActive: appSettingsParams.isMailerActive,
       fromAddress: appSettingsParams.fromAddress,
       smtpHost: appSettingsParams.smtpHost,
       smtpPort: appSettingsParams.smtpPort,
@@ -261,6 +265,9 @@ export default class AdminAppContainer extends Container {
       smtpPassword: this.state.smtpPassword,
     });
     const { mailSettingParams } = response.data;
+    // GW-3714 manage mailer state
+    this.setState({ isMailerActive: true });
+    // this.setState({ isMailerActive: mailSettingParams.isMailerActive });
     return mailSettingParams;
   }
 
@@ -275,6 +282,9 @@ export default class AdminAppContainer extends Container {
       sesSecretAccessKey: this.state.sesSecretAccessKey,
     });
     const { mailSettingParams } = response.data;
+    // GW-3714 manage mailer state
+    this.setState({ isMailerActive: true });
+    // this.setState({ isMailerActive: mailSettingParams.isMailerActive });
     return mailSettingParams;
   }