refs 125405: remove external-user-group-ddetail route

apps/app/src/components/Admin/UserGroup/UserGroupTable.tsx

@@ -127,8 +127,6 @@ export const UserGroupTable: FC<Props> = ({
     onDelete(userGroup);
   };
 
-  const groupDetailPageName = isExternalGroup ? 'external-user-group-detail' : 'user-group-detail';
-
   /*
    * useEffect
    */
@@ -160,7 +158,7 @@ export const UserGroupTable: FC<Props> = ({
               <tr key={group._id}>
                 {isAclEnabled
                   ? (
-                    <td><a href={`/admin/${groupDetailPageName}/${group._id}`}>{group.name}</a></td>
+                    <td><a href={`/admin/user-group-detail/${group._id}?isExternalGroup=${isExternalGroup}`}>{group.name}</a></td>
                   )
                   : (
                     <td>{group.name}</td>
@@ -181,7 +179,7 @@ export const UserGroupTable: FC<Props> = ({
                         <li key={group._id} className="list-inline-item badge badge-success">
                           {isAclEnabled
                             ? (
-                              <a href={`/admin/${groupDetailPageName}/${group._id}`}>{group.name}</a>
+                              <a href={`/admin/user-group-detail/${group._id}?isExternalGroup=${isExternalGroup}`}>{group.name}</a>
                             )
                             : (
                               <p>{group.name}</p>

apps/app/src/features/external-user-group/client/components/ExternalUserGroupDetail/ExternalUserGroupDetail.tsx

@@ -155,7 +155,12 @@ const ExternalUserGroupDetailPage = (props: Props): JSX.Element => {
                 { ancestorExternalUserGroup._id === currentExternalUserGroupId ? (
                   <span>{ancestorExternalUserGroup.name}</span>
                 ) : (
-                  <Link href={`/admin/external-user-group-detail/${ancestorExternalUserGroup._id}`} prefetch={false}>
+                  <Link
+                    href={{
+                      pathname: `/admin/user-group-detail/${ancestorExternalUserGroup._id}`,
+                      query: { isExternalGroup: 'true' },
+                    }}
+                    prefetch={false}>
                     {ancestorExternalUserGroup.name}
                   </Link>
                 ) }

apps/app/src/features/external-user-group/client/stores/external-user-group.ts

@@ -64,7 +64,7 @@ export const useSWRxExternalUserGroupRelationList = (
   );
 };
 
-export const useSWRxAncestorExternalUserGroups = (groupId: string | undefined): SWRResponse<IExternalUserGroupHasId[], Error> => {
+export const useSWRxAncestorExternalUserGroups = (groupId?: string): SWRResponse<IExternalUserGroupHasId[], Error> => {
   return useSWRImmutable(
     groupId != null ? ['/external-user-groups/ancestors', groupId] : null,
     ([endpoint, groupId]) => apiv3Get(endpoint, { groupId }).then(result => result.data.ancestorExternalUserGroups),

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

@@ -1,61 +0,0 @@
-import {
-  NextPage, GetServerSideProps, GetServerSidePropsContext,
-} from 'next';
-import { useTranslation } from 'next-i18next';
-import dynamic from 'next/dynamic';
-import Head from 'next/head';
-import { useRouter } from 'next/router';
-
-import ExternalUserGroupDetailPage from '~/features/external-user-group/client/components/ExternalUserGroupDetail/ExternalUserGroupDetail';
-import { CrowiRequest } from '~/interfaces/crowi-request';
-import { CommonProps, generateCustomTitle } from '~/pages/utils/commons';
-import { useIsAclEnabled, useCurrentUser } from '~/stores/context';
-import { useIsMaintenanceMode } from '~/stores/maintenanceMode';
-
-import { retrieveServerSideProps } from '../../../utils/admin-page-util';
-
-const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
-
-type Props = CommonProps & {
-  isAclEnabled: boolean
-}
-
-const AdminExternalUserGroupDetailPage: NextPage<Props> = (props: Props) => {
-  const { t } = useTranslation('admin');
-  useIsMaintenanceMode(props.isMaintenanceMode);
-  useCurrentUser(props.currentUser ?? null);
-  const router = useRouter();
-  const { externalUserGroupId } = router.query;
-
-  const title = t('user_group_management.user_group_management');
-  const customTitle = generateCustomTitle(props, title);
-
-  const currentExternalUserGroupId = Array.isArray(externalUserGroupId) ? externalUserGroupId[0] : externalUserGroupId;
-
-  useIsAclEnabled(props.isAclEnabled);
-
-  return (
-    <AdminLayout componentTitle={title}>
-      <Head>
-        <title>{customTitle}</title>
-      </Head>
-      {
-        currentExternalUserGroupId != null && router.isReady
-      && <ExternalUserGroupDetailPage externalUserGroupId={currentExternalUserGroupId} />
-      }
-    </AdminLayout>
-  );
-};
-
-const injectServerConfigurations = async(context: GetServerSidePropsContext, props: Props): Promise<void> => {
-  const req: CrowiRequest = context.req as CrowiRequest;
-  props.isAclEnabled = req.crowi.aclService.isAclEnabled();
-};
-
-export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
-  const props = await retrieveServerSideProps(context, injectServerConfigurations);
-
-  return props;
-};
-
-export default AdminExternalUserGroupDetailPage;

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

@@ -6,6 +6,7 @@ import dynamic from 'next/dynamic';
 import Head from 'next/head';
 import { useRouter } from 'next/router';
 
+import ExternalUserGroupDetailPage from '~/features/external-user-group/client/components/ExternalUserGroupDetail/ExternalUserGroupDetail';
 import { CrowiRequest } from '~/interfaces/crowi-request';
 import { CommonProps, generateCustomTitle } from '~/pages/utils/commons';
 import { useIsAclEnabled, useCurrentUser } from '~/stores/context';
@@ -25,13 +26,15 @@ const AdminUserGroupDetailPage: NextPage<Props> = (props: Props) => {
   useIsMaintenanceMode(props.isMaintenanceMode);
   useCurrentUser(props.currentUser ?? null);
   const router = useRouter();
-  const { userGroupId } = router.query;
+  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);
 
   return (
@@ -41,7 +44,9 @@ const AdminUserGroupDetailPage: NextPage<Props> = (props: Props) => {
       </Head>
       {
         currentUserGroupId != null && router.isReady
-      && <UserGroupDetailPage userGroupId={currentUserGroupId} />
+      && (isExternalGroupBool
+        ? <ExternalUserGroupDetailPage externalUserGroupId={currentUserGroupId}/>
+        : <UserGroupDetailPage userGroupId={currentUserGroupId} />)
       }
     </AdminLayout>
   );