Home Explore Help
Sign In
wiki
/
weseek__growi
mirror of https://github.com/weseek/growi
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

refactor user group page

Yuki Takei 7 months ago
parent
9f89086682
commit
bf28dbb1bf
2 changed files with 46 additions and 95 deletions
Unified View Show Diff Stats
  1. 22 52
      apps/app/src/pages/admin/user-group-detail/[userGroupId].page.tsx
  2. 24 43
      apps/app/src/pages/admin/user-groups.page.tsx

+ 22 - 52
apps/app/src/pages/admin/user-group-detail/[userGroupId].page.tsx
View File 

@@ -1,69 +1,39 @@
 
-import type {
 
-  NextPage, GetServerSideProps, GetServerSidePropsContext,
 
-} from 'next';
 
-import { useTranslation } from 'next-i18next';
 
+import { useMemo } from 'react';
 
+
 
+import { useHydrateAtoms } from 'jotai/utils';
 
 import dynamic from 'next/dynamic';
 
 import dynamic from 'next/dynamic';
 
-import Head from 'next/head';
 
 import { useRouter } from 'next/router';
 
 import { useRouter } from 'next/router';
 
 
 
-import type { CrowiRequest } from '~/interfaces/crowi-request';
 
-import type { CommonProps } from '~/pages/utils/commons';
 
-import { generateCustomTitle } from '~/pages/utils/commons';
 
-import { useIsAclEnabled, useCurrentUser } from '~/stores-universal/context';
 
-import { useIsMaintenanceMode } from '~/stores/maintenanceMode';
 
+import { isAclEnabledAtom } from '~/states/server-configurations';
 
 
 
-import { retrieveServerSideProps } from '../../../utils/admin-page-util';
 
+import type { NextPageWithLayout } from '../../_app.page';
 
+import type { AdminCommonProps } from '../_shared';
 
+import { createAdminPageLayout, getServerSideAdminCommonProps } from '../_shared';
 
 
 
-const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 
 const UserGroupDetailPage = dynamic(() => import('~/client/components/Admin/UserGroupDetail/UserGroupDetailPage'), { ssr: false });
 
 const UserGroupDetailPage = dynamic(() => import('~/client/components/Admin/UserGroupDetail/UserGroupDetailPage'), { ssr: false });
 
-const ForbiddenPage = dynamic(() => import('~/client/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
 
 
-type Props = CommonProps & {
 
-  isAclEnabled: boolean
 
-}
 
+type PageProps = { isAclEnabled: boolean };
 
+type Props = AdminCommonProps & PageProps;
 
 
 
-const AdminUserGroupDetailPage: NextPage<Props> = (props: Props) => {
 
-  const { t } = useTranslation('admin');
 
-  useIsMaintenanceMode(props.isMaintenanceMode);
 
-  useCurrentUser(props.currentUser ?? null);
 
+const AdminUserGroupDetailPage: NextPageWithLayout<Props> = (props: Props) => {
 
   const router = useRouter();
 
   const router = useRouter();
 
-  const { userGroupId, isExternalGroup } = router.query;
 
-
 
-  const title = t('user_group_management.user_group_management');
 
-  const customTitle = generateCustomTitle(props, title);
 
-
 
-  const currentUserGroupId = Array.isArray(userGroupId) ? userGroupId[0] : userGroupId;
 
-
 
-  const isExternalGroupBool = isExternalGroup === 'true';
 
 
 
-  useIsAclEnabled(props.isAclEnabled);
 
+  // hydrate
 
+  useHydrateAtoms([[isAclEnabledAtom, props.isAclEnabled]], { dangerouslyForceHydrate: true });
 
 
 
-  if (props.isAccessDeniedForNonAdminUser) {
 
-    return <ForbiddenPage />;
 
-  }
 
-
 
-  return (
 
-    <AdminLayout componentTitle={title}>
 
-      <Head>
 
-        <title>{customTitle}</title>
 
-      </Head>
 
-      {
 
-        currentUserGroupId != null && router.isReady
 
-      && <UserGroupDetailPage userGroupId={currentUserGroupId} isExternalGroup={isExternalGroupBool} />
 
-      }
 
-    </AdminLayout>
 
-  );
 
-};
 
+  const { userGroupId, isExternalGroup } = router.query;
 
+  const id = useMemo(() => (Array.isArray(userGroupId) ? userGroupId[0] : userGroupId), [userGroupId]);
 
+  const isExternal = isExternalGroup === 'true';
 
 
 
-const injectServerConfigurations = async(context: GetServerSidePropsContext, props: Props): Promise<void> => {
 
-  const req: CrowiRequest = context.req as CrowiRequest;
 
-  props.isAclEnabled = req.crowi.aclService.isAclEnabled();
 
+  return (id != null && router.isReady)
 
+    ? <UserGroupDetailPage userGroupId={id} isExternalGroup={isExternal} />
 
+    : null;
 
 };
 
 };
 
 
 
-export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
 
-  const props = await retrieveServerSideProps(context, injectServerConfigurations);
 
+AdminUserGroupDetailPage.getLayout = createAdminPageLayout<Props>({
 
+  title: (_p, t) => t('user_group_management.user_group_management'),
 
+});
 
 
 
-  return props;
 
-};
 
+export const getServerSideProps = getServerSideAdminCommonProps;
 
 
 
 export default AdminUserGroupDetailPage;
 
 export default AdminUserGroupDetailPage;

+ 24 - 43
apps/app/src/pages/admin/user-groups.page.tsx
View File 

@@ -1,62 +1,43 @@
 
-import type {
 
-  NextPage, GetServerSideProps, GetServerSidePropsContext,
 
-} from 'next';
 
-import { useTranslation } from 'next-i18next';
 
+import { useHydrateAtoms } from 'jotai/utils';
 
+import type { GetServerSideProps, GetServerSidePropsContext } from 'next';
 
 import dynamic from 'next/dynamic';
 
 import dynamic from 'next/dynamic';
 
-import Head from 'next/head';
 
 
 
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 
-import type { CommonProps } from '~/pages/utils/commons';
 
-import { generateCustomTitle } from '~/pages/utils/commons';
 
-import { useIsAclEnabled, useCurrentUser } from '~/stores-universal/context';
 
+import { isAclEnabledAtom } from '~/states/server-configurations';
 
 
 
-import { retrieveServerSideProps } from '../../utils/admin-page-util';
 
-
 
-const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 
-const UserGroupPage = dynamic(() => import('~/client/components/Admin/UserGroup/UserGroupPage').then(mod => mod.UserGroupPage), { ssr: false });
 
-const ForbiddenPage = dynamic(() => import('~/client/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 
-
 
-
 
-type Props = CommonProps & {
 
-  isAclEnabled: boolean
 
-};
 
+import type { NextPageWithLayout } from '../_app.page';
 
+import { mergeGetServerSidePropsResults } from '../utils/server-side-props';
 
 
 
+import type { AdminCommonProps } from './_shared';
 
+import { createAdminPageLayout, getServerSideAdminCommonProps } from './_shared';
 
 
 
-const AdminUserGroupPage: NextPage<Props> = (props) => {
 
-  const { t } = useTranslation('admin');
 
-  useCurrentUser(props.currentUser ?? null);
 
-  useIsAclEnabled(props.isAclEnabled);
 
+const UserGroupPage = dynamic(() => import('~/client/components/Admin/UserGroup/UserGroupPage').then(mod => mod.UserGroupPage), { ssr: false });
 
 
 
-  const title = t('user_group_management.user_group_management');
 
-  const headTitle = generateCustomTitle(props, title);
 
+type PageProps = { isAclEnabled: boolean };
 
+type Props = AdminCommonProps & PageProps;
 
 
 
-  if (props.isAccessDeniedForNonAdminUser) {
 
-    return <ForbiddenPage />;
 
-  }
 
+const AdminUserGroupPage: NextPageWithLayout<Props> = (props: Props) => {
 
+  // hydrate
 
+  useHydrateAtoms([
 
+    [isAclEnabledAtom, props.isAclEnabled],
 
+  ], { dangerouslyForceHydrate: true });
 
 
 
-  return (
 
-    <AdminLayout componentTitle={title}>
 
-      <Head>
 
-        <title>{headTitle}</title>
 
-      </Head>
 
-      <UserGroupPage />
 
-    </AdminLayout>
 
-  );
 
+  return <UserGroupPage />;
 
 };
 
 };
 
 
 
+AdminUserGroupPage.getLayout = createAdminPageLayout<Props>({
 
+  title: (_p, t) => t('user_group_management.user_group_management'),
 
+});
 
+
 
+export const getServerSideProps: GetServerSideProps<Props> = async(context: GetServerSidePropsContext) => {
 
+  const baseResult = await getServerSideAdminCommonProps(context);
 
 
 
-const injectServerConfigurations = async(context: GetServerSidePropsContext, props: Props): Promise<void> => {
 
   const req: CrowiRequest = context.req as CrowiRequest;
 
   const req: CrowiRequest = context.req as CrowiRequest;
 
   const { crowi } = req;
 
   const { crowi } = req;
 
   const { aclService } = crowi;
 
   const { aclService } = crowi;
 
 
 
-  props.isAclEnabled = aclService.isAclEnabled();
 
+  const fragment = { props: { isAclEnabled: aclService.isAclEnabled() } } satisfies { props: PageProps };
 
+  return mergeGetServerSidePropsResults(baseResult, fragment);
 
 };
 
 };
 
 
 
-export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
 
-  const props = await retrieveServerSideProps(context, injectServerConfigurations);
 
-  return props;
 
-};
 
-
 
-
 
 export default AdminUserGroupPage;
 
 export default AdminUserGroupPage;