fix

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

@@ -38,7 +38,7 @@ class AppSetting extends React.Component {
 
     return (
       <React.Fragment>
-        <div className="row md-5">
+        <div className="row mb-5">
           <label className="col-xs-3 control-label">{t('app_setting:site_name')}</label>
           <div className="col-xs-6">
             <input
@@ -52,7 +52,7 @@ class AppSetting extends React.Component {
           </div>
         </div>
 
-        <div className="row md-5">
+        <div className="row mb-5">
           <label className="col-xs-3 control-label">{t('app_setting:confidential_name')}</label>
           <div className="col-xs-6">
             <input
@@ -66,7 +66,7 @@ class AppSetting extends React.Component {
           </div>
         </div>
 
-        <div className="row md-5">
+        <div className="row mb-5">
           <label className="col-xs-3 control-label">{t('app_setting:default_language')}</label>
           <div className="col-xs-6">
             <div className="radio radio-primary radio-inline">
@@ -76,7 +76,7 @@ class AppSetting extends React.Component {
                 name="globalLang"
                 value="en-US"
                 checked={adminAppContainer.state.globalLang === 'en-US'}
-                onClick={(e) => { adminAppContainer.changeGlobalLang(e.target.value) }}
+                onChange={(e) => { adminAppContainer.changeGlobalLang(e.target.value) }}
               />
               <label htmlFor="radioLangEn">{t('English')}</label>
             </div>
@@ -87,14 +87,14 @@ class AppSetting extends React.Component {
                 name="globalLang"
                 value="ja"
                 checked={adminAppContainer.state.globalLang === 'ja'}
-                onClick={(e) => { adminAppContainer.changeGlobalLang(e.target.value) }}
+                onChange={(e) => { adminAppContainer.changeGlobalLang(e.target.value) }}
               />
               <label htmlFor="radioLangJa">{t('Japanese')}</label>
             </div>
           </div>
         </div>
 
-        <div className="row md-5">
+        <div className="row mb-5">
           <label className="col-xs-3 control-label">{t('app_setting:file_uploading')}</label>
           <div className="col-xs-6">
             <div className="checkbox checkbox-info">

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

@@ -66,17 +66,17 @@ class SiteUrlSetting extends React.Component {
                         onChange={(e) => { adminAppContainer.changeSiteUrl(e.target.value) }}
                         placeholder="e.g. https://my.growi.org"
                       />
-                      <p className="help-block">
+                      <div className="help-block">
                         {/* eslint-disable-next-line react/no-danger */}
-                        <div dangerouslySetInnerHTML={{ __html: t('app_setting:siteurl_help') }} />
-                      </p>
+                        <span dangerouslySetInnerHTML={{ __html: t('app_setting:siteurl_help') }} />
+                      </div>
                     </td>
                     <td>
                       <input className="form-control" type="text" value={adminAppContainer.state.envSiteUrl} readOnly />
-                      <p className="help-block">
+                      <div className="help-block">
                         {/* eslint-disable-next-line react/no-danger */}
-                        <div dangerouslySetInnerHTML={{ __html: t('app_setting:use_env_var_if_empty', { variable: 'APP_SITE_URL' }) }} />
-                      </p>
+                        <span dangerouslySetInnerHTML={{ __html: t('app_setting:use_env_var_if_empty', { variable: 'APP_SITE_URL' }) }} />
+                      </div>
                     </td>
                   </tr>
                 </tbody>

src/client/js/services/AdminAppContainer.js

@@ -78,24 +78,24 @@ export default class AdminAppContainer extends Container {
       const { appSettingsParams } = response.data;
 
       this.setState({
-        title: appSettingsParams.title,
-        confidential: appSettingsParams.confidential,
-        globalLang: appSettingsParams.globalLang,
-        fileUpload: appSettingsParams.fileUpload,
-        siteUrl: appSettingsParams.siteUrl,
-        envSiteUrl: appSettingsParams.envSiteUrl,
+        title: appSettingsParams.title || '',
+        confidential: appSettingsParams.confidential || '',
+        globalLang: appSettingsParams.globalLang || '',
+        fileUpload: appSettingsParams.fileUpload || '',
+        siteUrl: appSettingsParams.siteUrl || '',
+        envSiteUrl: appSettingsParams.envSiteUrl || '',
         isSetSiteUrl: !!appSettingsParams.siteUrl,
-        fromAddress: appSettingsParams.fromAddress,
-        smtpHost: appSettingsParams.smtpHost,
-        smtpPort: appSettingsParams.smtpPort,
-        smtpUser: appSettingsParams.smtpUser,
-        smtpPassword: appSettingsParams.smtpPassword,
-        region: appSettingsParams.region,
-        customEndpoint: appSettingsParams.customEndpoint,
-        bucket: appSettingsParams.bucket,
-        accessKeyId: appSettingsParams.accessKeyId,
-        secretKey: appSettingsParams.secretKey,
-        isEnabledPlugins: appSettingsParams.isEnabledPlugins,
+        fromAddress: appSettingsParams.fromAddress || '',
+        smtpHost: appSettingsParams.smtpHost || '',
+        smtpPort: appSettingsParams.smtpPort || '',
+        smtpUser: appSettingsParams.smtpUser || '',
+        smtpPassword: appSettingsParams.smtpPassword || '',
+        region: appSettingsParams.region || '',
+        customEndpoint: appSettingsParams.customEndpoint || '',
+        bucket: appSettingsParams.bucket || '',
+        accessKeyId: appSettingsParams.accessKeyId || '',
+        secretKey: appSettingsParams.secretKey || '',
+        isEnabledPlugins: appSettingsParams.isEnabledPlugins || false,
       });
 
     }