Skip to content

Commit 78ad419

Browse files
authored
Merge pull request #10550 from growilabs/fix/174840-specific-element-not-displayed-on-user-group-page
fix: Specific element not displayed on user group page
2 parents 65f53e8 + ab54870 commit 78ad419

File tree

1 file changed

+22
-1
lines changed

1 file changed

+22
-1
lines changed

apps/app/src/pages/admin/user-group-detail/[userGroupId].page.tsx

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import { useMemo } from 'react';
2+
import type { GetServerSideProps, GetServerSidePropsContext } from 'next';
23
import dynamic from 'next/dynamic';
34
import { useRouter } from 'next/router';
45
import { useHydrateAtoms } from 'jotai/utils';
56

7+
import type { CrowiRequest } from '~/interfaces/crowi-request';
68
import { isAclEnabledAtom } from '~/states/server-configurations';
79

810
import type { NextPageWithLayout } from '../../_app.page';
11+
import { mergeGetServerSidePropsResults } from '../../utils/server-side-props';
912
import type { AdminCommonProps } from '../_shared';
1013
import {
1114
createAdminPageLayout,
@@ -45,6 +48,24 @@ AdminUserGroupDetailPage.getLayout = createAdminPageLayout<Props>({
4548
title: (_p, t) => t('user_group_management.user_group_management'),
4649
});
4750

48-
export const getServerSideProps = getServerSideAdminCommonProps;
51+
export const getServerSideProps: GetServerSideProps<Props> = async (
52+
context: GetServerSidePropsContext,
53+
) => {
54+
const commonResult = await getServerSideAdminCommonProps(context);
55+
56+
const req: CrowiRequest = context.req as CrowiRequest;
57+
const { crowi } = req;
58+
59+
const UserGroupDetailPropsFragment = {
60+
props: {
61+
isAclEnabled: crowi.aclService.isAclEnabled(),
62+
},
63+
} satisfies { props: PageProps };
64+
65+
return mergeGetServerSidePropsResults(
66+
commonResult,
67+
UserGroupDetailPropsFragment,
68+
);
69+
};
4970

5071
export default AdminUserGroupDetailPage;

0 commit comments

Comments
 (0)