Shun Miyazawa 2 年之前
父节点
当前提交
9b0a91b9aa
共有 2 个文件被更改,包括 4 次插入3 次删除
  1. 1 2
      apps/app/src/pages/admin/index.page.tsx
  2. 3 1
      apps/app/src/utils/admin-page-util.ts

+ 1 - 2
apps/app/src/pages/admin/index.page.tsx

@@ -11,7 +11,7 @@ import AdminHomeContainer from '~/client/services/AdminHomeContainer';
 import { CrowiRequest } from '~/interfaces/crowi-request';
 import { CommonProps, generateCustomTitle } from '~/pages/utils/commons';
 import {
-  useCurrentUser, useGrowiCloudUri, useGrowiAppIdForGrowiCloud, useIsAdmin,
+  useCurrentUser, useGrowiCloudUri, useGrowiAppIdForGrowiCloud,
 } from '~/stores/context';
 
 
@@ -36,7 +36,6 @@ const AdminHomePage: NextPage<Props> = (props) => {
   useCurrentUser(props.currentUser ?? null);
   useGrowiCloudUri(props.growiCloudUri);
   useGrowiAppIdForGrowiCloud(props.growiAppIdForGrowiCloud);
-  const { data: isAdmin } = useIsAdmin();
 
   const { t } = useTranslation('admin');
 

+ 3 - 1
apps/app/src/utils/admin-page-util.ts

@@ -44,7 +44,9 @@ export const retrieveServerSideProps: any = async(
     props.currentUser = user.toObject();
   }
 
-  props.isAccessDeniedForNonAdminUser = props.currentUser != null && !props.currentUser.admin;
+  props.isAccessDeniedForNonAdminUser = props.currentUser == null
+    ? false
+    : !props.currentUser.admin;
 
   await injectNextI18NextConfigurations(context, props, ['admin', 'commons']);