Revert usage of AdminAppContainer, changed to AppContainer

config/env.dev.js

@@ -22,6 +22,6 @@ module.exports = {
   // DEV_HTTPS: true,
   // FORCE_WIKI_MODE: 'private', // 'public', 'private', undefined
   // PROMSTER_ENABLED: true,
-  // GROWI_CLOUD_URI: 'http://growi.cloud',
-  // GROWI_APP_ID_FOR_GROWI_CLOUD: '012345',
+  GROWI_CLOUD_URI: 'http://growi.cloud',
+  GROWI_APP_ID_FOR_GROWI_CLOUD: '012345',
 };

src/client/js/components/Admin/Common/AdminNavigation.jsx

@@ -1,21 +1,17 @@
 /* eslint-disable no-multi-spaces */
 /* eslint-disable react/jsx-props-no-multi-spaces */
 
-import React, { useEffect } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 import urljoin from 'url-join';
-import AdminAppContainer from '../../../services/AdminAppContainer';
+import AppContainer from '../../../services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
 const AdminNavigation = (props) => {
-  const { t, adminAppContainer } = props;
+  const { t, appContainer } = props;
   const pathname = window.location.pathname;
 
-  useEffect(() => {
-    adminAppContainer.retrieveAppSettingsData();
-  }, [adminAppContainer]);
-
   // eslint-disable-next-line react/prop-types
   const MenuLabel = ({ menu }) => {
     switch (menu) {
@@ -70,11 +66,11 @@ const AdminNavigation = (props) => {
         <MenuLink menu="users"        isListGroupItems isActive={isActiveMenu('/users')} />
         <MenuLink menu="user-groups"  isListGroupItems isActive={isActiveMenu('/user-groups')} />
         <MenuLink menu="search"       isListGroupItems isActive={isActiveMenu('/search')} />
-        {adminAppContainer.state.growiCloudUri != null
-          && adminAppContainer.state.growiAppIdForGrowiCloud != null
+        {appContainer.config.env.GROWI_CLOUD_URI != null
+          && appContainer.config.env.GROWI_APP_ID_FOR_GROWI_CLOUD != null
           && (
           <a
-            href={`${adminAppContainer.state.growiCloudUri}/my/apps/${adminAppContainer.state.growiAppIdForGrowiCloud}`}
+            href={`${appContainer.config.env.GROWI_CLOUD_URI}/my/apps/${appContainer.config.env.GROWI_APP_ID_FOR_GROWI_CLOUD}`}
             className="list-group-item list-group-item-action border-0 round-corner"
           >
             <MenuLabel menu="cloud" />
@@ -126,11 +122,11 @@ const AdminNavigation = (props) => {
   );
 };
 
-const AdminNavigationWrapper = withUnstatedContainers(AdminNavigation, [AdminAppContainer]);
+const AdminNavigationWrapper = withUnstatedContainers(AdminNavigation, [AppContainer]);
 
 AdminNavigation.propTypes = {
   t: PropTypes.func.isRequired, // i18next
-  adminAppContainer: PropTypes.instanceOf(AdminAppContainer).isRequired,
+  appContainer: PropTypes.instanceOf(AppContainer).isRequired,
 };
 
 export default withTranslation()(AdminNavigationWrapper);

src/client/js/services/AdminAppContainer.js

@@ -57,9 +57,6 @@ export default class AdminAppContainer extends Container {
       s3ReferenceFileWithRelayMode: false,
 
       isEnabledPlugins: true,
-
-      growiCloudUri: '',
-      growiAppIdForGrowiCloud: '',
     };
 
   }
@@ -117,9 +114,6 @@ export default class AdminAppContainer extends Container {
       envGcsBucket: appSettingsParams.envGcsBucket,
       envGcsUploadNamespace: appSettingsParams.envGcsUploadNamespace,
       isEnabledPlugins: appSettingsParams.isEnabledPlugins,
-
-      growiCloudUri: appSettingsParams.growiCloudUri,
-      growiAppIdForGrowiCloud: appSettingsParams.growiAppIdForGrowiCloud,
     });
 
     // if useOnlyEnvVarForFileUploadType is true, get fileUploadType from only env var and make the forms fixed.

src/server/models/config.js

@@ -222,6 +222,8 @@ module.exports = function(crowi) {
         HACKMD_URI: env.HACKMD_URI || null,
         MATHJAX: env.MATHJAX || null,
         NO_CDN: env.NO_CDN || null,
+        GROWI_CLOUD_URI: env.GROWI_CLOUD_URI || null,
+        GROWI_APP_ID_FOR_GROWI_CLOUD: env.GROWI_APP_ID_FOR_GROWI_CLOUD || null,
       },
       isEnabledStaleNotification: crowi.configManager.getConfig('crowi', 'customize:isEnabledStaleNotification'),
       isAclEnabled: crowi.aclService.isAclEnabled(),

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

@@ -260,9 +260,6 @@ module.exports = (crowi) => {
       envGcsUploadNamespace: crowi.configManager.getConfigFromEnvVars('crowi', 'gcs:uploadNamespace'),
 
       isEnabledPlugins: crowi.configManager.getConfig('crowi', 'plugin:isEnabledPlugins'),
-
-      growiCloudUri: crowi.configManager.getConfigFromEnvVars('crowi', 'app:growiCloudUri'),
-      growiAppIdForGrowiCloud: crowi.configManager.getConfigFromEnvVars('crowi', 'app:growiAppIdForCloud'),
     };
     return res.apiv3({ appSettingsParams });