add isMailerActive

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

@@ -61,7 +61,7 @@ class MailSetting extends React.Component {
 
     return (
       <React.Fragment>
-        {!adminAppContainer.state.isMailSetup && (
+        {!adminAppContainer.state.isMailerActive && (
           <p className="alert alert-danger"><i className="icon-exclamation"></i> {t('admin:app_setting.mailer_not_set_up')}</p>
         )}
         <div className="row form-group mb-5">

src/client/js/services/AdminAppContainer.js

@@ -23,7 +23,7 @@ export default class AdminAppContainer extends Container {
       siteUrl: '',
       envSiteUrl: '',
       isSetSiteUrl: true,
-      isMailerSetup: false,
+      isMailerActive: false,
       fromAddress: '',
       smtpHost: '',
       smtpPort: '',
@@ -63,7 +63,7 @@ export default class AdminAppContainer extends Container {
       siteUrl: appSettingsParams.siteUrl,
       envSiteUrl: appSettingsParams.envSiteUrl,
       isSetSiteUrl: !!appSettingsParams.siteUrl,
-      isMailerSetup: appSettingsParams.isMailerSetup,
+      isMailerActive: appSettingsParams.isMailerActive,
       fromAddress: appSettingsParams.fromAddress,
       smtpHost: appSettingsParams.smtpHost,
       smtpPort: appSettingsParams.smtpPort,
@@ -263,6 +263,7 @@ export default class AdminAppContainer extends Container {
       smtpPassword: this.state.smtpPassword,
     });
     const { mailSettingParams } = response.data;
+    this.setState({ isMailerActive: mailSettingParams.isMailerActive });
     return mailSettingParams;
   }
 
@@ -277,6 +278,7 @@ export default class AdminAppContainer extends Container {
       sesSecretAccessKey: this.state.sesSecretAccessKey,
     });
     const { mailSettingParams } = response.data;
+    this.setState({ isMailerActive: mailSettingParams.isMailerActive });
     return mailSettingParams;
   }
 

src/server/routes/apiv3/app-settings.js

@@ -182,6 +182,7 @@ module.exports = (crowi) => {
       fileUpload: crowi.configManager.getConfig('crowi', 'app:fileUpload'),
       siteUrl: crowi.configManager.getConfig('crowi', 'app:siteUrl'),
       envSiteUrl: crowi.configManager.getConfigFromEnvVars('crowi', 'app:siteUrl'),
+      isMailerActive: crowi.mailService.isMailerActive,
       fromAddress: crowi.configManager.getConfig('crowi', 'mail:from'),
       smtpHost: crowi.configManager.getConfig('crowi', 'mail:smtpHost'),
       smtpPort: crowi.configManager.getConfig('crowi', 'mail:smtpPort'),
@@ -197,10 +198,7 @@ module.exports = (crowi) => {
       isEnabledPlugins: crowi.configManager.getConfig('crowi', 'plugin:isEnabledPlugins'),
     };
 
-    appSettingsParams.isMailerSetup = crowi.mailService.isMailerSetup;
-
     return res.apiv3({ appSettingsParams });
-
   });
 
 
@@ -374,7 +372,7 @@ module.exports = (crowi) => {
     mailService.publishUpdatedMessage();
 
     return {
-      isMailerSetup: mailService.isMailerSetup,
+      isMailerActive: mailService.isMailerActive,
       fromAddress: configManager.getConfig('crowi', 'mail:from'),
       smtpHost: configManager.getConfig('crowi', 'mail:smtpHost'),
       smtpPort: configManager.getConfig('crowi', 'mail:smtpPort'),