ホーム エクスプローラ ヘルプ
サインイン
wiki
/
weseek__growi
同期ミラー https://github.com/weseek/growi
2
0
フォーク 0
ファイル 課題 0 Wiki
ソースを参照

update SystemInfomationTable for pnpm

Yuki Takei 1 年間 前
親
75602d65a2
コミット
5c89828069
4 ファイル変更、8 行追加、20 行削除
一括表示 差分情報を表示
  1. 4 4
      apps/app/src/client/components/Admin/AdminHome/SystemInfomationTable.tsx
  2. 2 2
      apps/app/src/client/services/AdminHomeContainer.js
  3. 1 13
      apps/app/src/pages/admin/index.page.tsx
  4. 1 1
      apps/app/src/server/routes/apiv3/admin-home.js

+ 4 - 4
apps/app/src/client/components/Admin/AdminHome/SystemInfomationTable.tsx
ファイルの表示 

@@ -13,10 +13,10 @@ const SystemInformationTable = (props: Props) => {
 
   const { adminHomeContainer } = props;
 
   const { adminHomeContainer } = props;
 
 
 
   const {
 
   const {
 
-    growiVersion, nodeVersion, npmVersion, yarnVersion,
 
+    growiVersion, nodeVersion, npmVersion, pnpmVersion,
 
   } = adminHomeContainer.state;
 
   } = adminHomeContainer.state;
 
 
 
-  if (growiVersion == null || nodeVersion == null || npmVersion == null || yarnVersion == null) {
 
+  if (growiVersion == null || nodeVersion == null || npmVersion == null || pnpmVersion == null) {
 
     return <></>;
 
     return <></>;
 
   }
 
   }
 
 
 
@@ -36,8 +36,8 @@ const SystemInformationTable = (props: Props) => {
 
           <td>{ npmVersion }</td>
 
           <td>{ npmVersion }</td>
 
         </tr>
 
         </tr>
 
         <tr>
 
         <tr>
 
-          <th>yarn</th>
 
-          <td>{ yarnVersion }</td>
 
+          <th>pnpm</th>
 
+          <td>{ pnpmVersion }</td>
 
         </tr>
 
         </tr>
 
       </tbody>
 
       </tbody>
 
     </table>
 
     </table>

+ 2 - 2
apps/app/src/client/services/AdminHomeContainer.js
ファイルの表示 

@@ -31,7 +31,7 @@ export default class AdminHomeContainer extends Container {
 
       growiVersion: null,
 
       growiVersion: null,
 
       nodeVersion: null,
 
       nodeVersion: null,
 
       npmVersion: null,
 
       npmVersion: null,
 
-      yarnVersion: null,
 
+      pnpmVersion: null,
 
       copyState: this.copyStateValues.DEFAULT,
 
       copyState: this.copyStateValues.DEFAULT,
 
       installedPlugins: null,
 
       installedPlugins: null,
 
       isV5Compatible: null,
 
       isV5Compatible: null,
 
@@ -64,7 +64,7 @@ export default class AdminHomeContainer extends Container {
 
         growiVersion: adminHomeParams.growiVersion,
 
         growiVersion: adminHomeParams.growiVersion,
 
         nodeVersion: adminHomeParams.nodeVersion,
 
         nodeVersion: adminHomeParams.nodeVersion,
 
         npmVersion: adminHomeParams.npmVersion,
 
         npmVersion: adminHomeParams.npmVersion,
 
-        yarnVersion: adminHomeParams.yarnVersion,
 
+        pnpmVersion: adminHomeParams.pnpmVersion,
 
         envVars: adminHomeParams.envVars,
 
         envVars: adminHomeParams.envVars,
 
         isV5Compatible: adminHomeParams.isV5Compatible,
 
         isV5Compatible: adminHomeParams.isV5Compatible,
 
         isMaintenanceMode: adminHomeParams.isMaintenanceMode,
 
         isMaintenanceMode: adminHomeParams.isMaintenanceMode,

+ 1 - 13
apps/app/src/pages/admin/index.page.tsx
ファイルの表示 

@@ -25,10 +25,6 @@ const ForbiddenPage = dynamic(() => import('~/client/components/Admin/ForbiddenP
 
 
 
 
 
 type Props = CommonProps & {
 
 type Props = CommonProps & {
 
-  nodeVersion: string,
 
-  npmVersion: string,
 
-  yarnVersion: string,
 
-  installedPlugins: any,
 
   growiCloudUri: string,
 
   growiCloudUri: string,
 
   growiAppIdForGrowiCloud: number,
 
   growiAppIdForGrowiCloud: number,
 
 };
 
 };
 
@@ -64,12 +60,7 @@ const AdminHomepage: NextPage<Props> = (props) => {
 
         <Head>
 
         <Head>
 
           <title>{title}</title>
 
           <title>{title}</title>
 
         </Head>
 
         </Head>
 
-        <AdminHome
 
-          nodeVersion={props.nodeVersion}
 
-          npmVersion={props.npmVersion}
 
-          yarnVersion={props.yarnVersion}
 
-          installedPlugins={props.installedPlugins}
 
-        />
 
+        <AdminHome />
 
       </AdminLayout>
 
       </AdminLayout>
 
     </Provider>
 
     </Provider>
 
   );
 
   );
 
@@ -80,9 +71,6 @@ const injectServerConfigurations = async(context: GetServerSidePropsContext, pro
 
   const req: CrowiRequest = context.req as CrowiRequest;
 
   const req: CrowiRequest = context.req as CrowiRequest;
 
   const { crowi } = req;
 
   const { crowi } = req;
 
 
 
-  props.nodeVersion = crowi.runtimeVersions.versions.node ? crowi.runtimeVersions.versions.node.version.version : null;
 
-  props.npmVersion = crowi.runtimeVersions.versions.npm ? crowi.runtimeVersions.versions.npm.version.version : null;
 
-  props.pnpmVersion = crowi.runtimeVersions.versions.pnpm ? crowi.runtimeVersions.versions.pnpm.version.version : null;
 
   props.growiCloudUri = await crowi.configManager.getConfig('crowi', 'app:growiCloudUri');
 
   props.growiCloudUri = await crowi.configManager.getConfig('crowi', 'app:growiCloudUri');
 
   props.growiAppIdForGrowiCloud = await crowi.configManager.getConfig('crowi', 'app:growiAppIdForCloud');
 
   props.growiAppIdForGrowiCloud = await crowi.configManager.getConfig('crowi', 'app:growiAppIdForCloud');
 
 };
 
 };

+ 1 - 1
apps/app/src/server/routes/apiv3/admin-home.js
ファイルの表示 

@@ -27,7 +27,7 @@ const router = express.Router();
 
  *          npmVersion:
 
  *          npmVersion:
 
  *            type: string
 
  *            type: string
 
  *            description: version of npm
 
  *            description: version of npm
 
- *          yarnVersion:
 
+ *          pnpmVersion:
 
  *            type: string
 
  *            type: string
 
  *            description: version of yarn
 
  *            description: version of yarn
 
  *      InstalledPluginsParams:
 
  *      InstalledPluginsParams: