Просмотр исходного кода

add IResAdminHome type and update useSWRxAdminHome to use it

Yuki Takei 2 месяцев назад
Родитель
Сommit
737e37eaee

+ 9 - 0
apps/app/src/interfaces/res/admin/admin-home.ts

@@ -0,0 +1,9 @@
+export type IResAdminHome = {
+  growiVersion: string;
+  nodeVersion: string;
+  npmVersion: string;
+  pnpmVersion: string;
+  envVars: Record<string, string>;
+  isV5Compatible: boolean;
+  isMaintenanceMode: boolean;
+};

+ 3 - 2
apps/app/src/server/routes/apiv3/admin-home.ts

@@ -1,5 +1,6 @@
 import { SCOPE } from '@growi/core/dist/interfaces';
 import { SCOPE } from '@growi/core/dist/interfaces';
 
 
+import type { IResAdminHome } from '~/interfaces/res/admin/admin-home';
 import { accessTokenParser } from '~/server/middlewares/access-token-parser';
 import { accessTokenParser } from '~/server/middlewares/access-token-parser';
 import { configManager } from '~/server/service/config-manager';
 import { configManager } from '~/server/service/config-manager';
 import { getGrowiVersion } from '~/utils/growi-version';
 import { getGrowiVersion } from '~/utils/growi-version';
@@ -91,13 +92,13 @@ module.exports = (crowi) => {
     accessTokenParser([SCOPE.READ.ADMIN.TOP]),
     accessTokenParser([SCOPE.READ.ADMIN.TOP]),
     loginRequiredStrictly,
     loginRequiredStrictly,
     adminRequired,
     adminRequired,
-    async (req, res) => {
+    async (_req, res) => {
       const { getRuntimeVersions } = await import(
       const { getRuntimeVersions } = await import(
         '~/server/util/runtime-versions'
         '~/server/util/runtime-versions'
       );
       );
       const runtimeVersions = await getRuntimeVersions();
       const runtimeVersions = await getRuntimeVersions();
 
 
-      const adminHomeParams = {
+      const adminHomeParams: IResAdminHome = {
         growiVersion: getGrowiVersion(),
         growiVersion: getGrowiVersion(),
         nodeVersion: runtimeVersions.node ?? '-',
         nodeVersion: runtimeVersions.node ?? '-',
         npmVersion: runtimeVersions.npm ?? '-',
         npmVersion: runtimeVersions.npm ?? '-',

+ 2 - 11
apps/app/src/stores/admin/admin-home.tsx

@@ -2,18 +2,9 @@ import type { SWRResponse } from 'swr';
 import useSWR from 'swr';
 import useSWR from 'swr';
 
 
 import { apiv3Get } from '~/client/util/apiv3-client';
 import { apiv3Get } from '~/client/util/apiv3-client';
+import type { IResAdminHome } from '~/interfaces/res/admin/admin-home';
 
 
-export type AdminHomeData = {
-  growiVersion: string;
-  nodeVersion: string;
-  npmVersion: string;
-  pnpmVersion: string;
-  envVars: Record<string, string>;
-  isV5Compatible: boolean;
-  isMaintenanceMode: boolean;
-};
-
-export const useSWRxAdminHome = (): SWRResponse<AdminHomeData, Error> => {
+export const useSWRxAdminHome = (): SWRResponse<IResAdminHome, Error> => {
   return useSWR('/admin-home/', (endpoint) =>
   return useSWR('/admin-home/', (endpoint) =>
     apiv3Get(endpoint).then((response) => {
     apiv3Get(endpoint).then((response) => {
       return response.data.adminHomeParams;
       return response.data.adminHomeParams;