Steven Fukase 4 лет назад
Родитель
Сommit
7ce405b20a

+ 6 - 3
src/client/js/components/Admin/Common/AdminNavigation.jsx

@@ -26,7 +26,7 @@ const AdminNavigation = (props) => {
       case 'users':         return <><i className="icon-fw icon-user"></i>            { t('User_Management') }</>;
       case 'user-groups':   return <><i className="icon-fw icon-people"></i>          { t('UserGroup Management') }</>;
       case 'search':        return <><i className="icon-fw icon-magnifier"></i>       { t('Full Text Search Management') }</>;
-      case 'cloud':         return <><i className="icon-fw icon-share-alt"></i>       { t('to_cloud_settings') }</>;
+      case 'cloud':         return <><i className="icon-fw icon-share-alt"></i>       { `${t('to_cloud_settings')} ${adminAppContainer.state.growiCloudUri}`}</>;
       default:              return <><i className="icon-fw icon-home"></i>            { t('Wiki Management Home Page') }</>;
     }
   };
@@ -41,7 +41,7 @@ const AdminNavigation = (props) => {
 
     return (
       <a
-        href={isRoot ? '/admin' : urljoin('/admin', menu)}
+        // href={isRoot ? '/admin' : urljoin('/admin', menu)}
         className={`${pageTransitionClassName} ${isActive ? 'active' : ''}`}
       >
         <MenuLabel menu={menu} />
@@ -67,7 +67,10 @@ 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')} />
-        <MenuLink isListGroupItems onClick={console.log(adminAppContainer.state.)} />
+        <MenuLink
+          menu="cloud"
+          isListGroupItems
+        />
       </>
     );
   };

+ 4 - 0
src/client/js/services/AdminAppContainer.js

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

+ 3 - 0
src/server/routes/apiv3/app-settings.js

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

+ 2 - 2
src/server/service/config-loader.js

@@ -402,13 +402,13 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     ns:      'crowi',
     key:     'app:growiCloudUri',
     type:    TYPES.STRING,
-    default: null,
+    default: 'asdfasdf',
   },
   GROWI_APP_ID_FOR_GROWI_CLOUD: {
     ns:      'crowi',
     key:     'app:growiAppIdForCloud',
     type:    TYPES.STRING,
-    default: null,
+    default: 'asdfasdf',
   },
   DEFAULT_EMAIL_PUBLISHED: {
     ns:      'crowi',