Merge branch 'reactify-admin/enable-mail-setting' into reactify-admin/enable-aws-setting

src/client/js/app.jsx

@@ -37,7 +37,7 @@ import TableOfContents from './components/TableOfContents';
 import UserGroupDetailPage from './components/Admin/UserGroupDetail/UserGroupDetailPage';
 import MarkdownSetting from './components/Admin/MarkdownSetting/MarkDownSetting';
 import UserManagement from './components/Admin/UserManagement';
-import AppSettingPage from './components/Admin/App/AppSettingPage';
+import AppSettingsPage from './components/Admin/App/AppSettingsPage';
 import ManageExternalAccount from './components/Admin/ManageExternalAccount';
 import UserGroupPage from './components/Admin/UserGroup/UserGroupPage';
 import Customize from './components/Admin/Customize/Customize';
@@ -176,7 +176,7 @@ if (adminAppElem != null) {
   ReactDOM.render(
     <Provider inject={[injectableContainers, adminAppContainer]}>
       <I18nextProvider i18n={i18n}>
-        <AppSettingPage />
+        <AppSettingsPage />
       </I18nextProvider>
     </Provider>,
     adminAppElem,

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

@@ -17,7 +17,7 @@ import PluginSetting from './PluginSetting';
 
 const logger = loggerFactory('growi:appSettings');
 
-class AppSettingPage extends React.Component {
+class AppSettingsPage extends React.Component {
 
   async componentDidMount() {
     const { adminAppContainer } = this.props;
@@ -77,7 +77,7 @@ class AppSettingPage extends React.Component {
 
 }
 
-AppSettingPage.propTypes = {
+AppSettingsPage.propTypes = {
   t: PropTypes.func.isRequired, // i18next
   appContainer: PropTypes.instanceOf(AppContainer).isRequired,
   adminAppContainer: PropTypes.instanceOf(AdminAppContainer).isRequired,
@@ -86,9 +86,9 @@ AppSettingPage.propTypes = {
 /**
  * Wrapper component for using unstated
  */
-const AppSettingPageWrapper = (props) => {
-  return createSubscribedElement(AppSettingPage, props, [AppContainer, AdminAppContainer]);
+const AppSettingsPageWrapper = (props) => {
+  return createSubscribedElement(AppSettingsPage, props, [AppContainer, AdminAppContainer]);
 };
 
 
-export default withTranslation()(AppSettingPageWrapper);
+export default withTranslation()(AppSettingsPageWrapper);