Yuki Takei пре 7 месеци
родитељ
комит
7b3effe079
2 измењених фајлова са 40 додато и 96 уклоњено
  1. 22 44
      apps/app/src/pages/admin/ai-integration.page.tsx
  2. 18 52
      apps/app/src/pages/admin/app.page.tsx

+ 22 - 44
apps/app/src/pages/admin/ai-integration.page.tsx

@@ -1,61 +1,39 @@
-import type {
-  NextPage, GetServerSideProps, GetServerSidePropsContext,
-} from 'next';
-import { useTranslation } from 'next-i18next';
+import type { GetServerSideProps } from 'next';
 import dynamic from 'next/dynamic';
-import Head from 'next/head';
 
 import type { CrowiRequest } from '~/interfaces/crowi-request';
-import type { CommonProps } from '~/pages/utils/commons';
-import { generateCustomTitle } from '~/pages/utils/commons';
 
-import { retrieveServerSideProps } from '../../utils/admin-page-util';
+import type { NextPageWithLayout } from '../_app.page';
+import { mergeGetServerSidePropsResults } from '../utils/server-side-props';
+
+import type { AdminCommonProps } from './_shared';
+import { createAdminPageLayout, getServerSideAdminCommonProps } from './_shared';
 
-const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
-const ForbiddenPage = dynamic(() => import('~/client/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
 const AiIntegration = dynamic(() => import('~/features/openai/client/components/AiIntegration/AiIntegration').then(mod => mod.AiIntegration), { ssr: false });
 const AiIntegrationDisableMode = dynamic(
   () => import('~/features/openai/client/components/AiIntegration/AiIntegrationDisableMode').then(mod => mod.AiIntegrationDisableMode), { ssr: false },
 );
 
-type Props = CommonProps & {
-  aiEnabled: boolean,
-};
+type Props = AdminCommonProps & { aiEnabled: boolean };
 
-const AdminAiIntegrationPage: NextPage<Props> = (props: Props) => {
-  const { t } = useTranslation('admin');
-
-  const title = t('ai_integration.ai_integration');
-  const headTitle = generateCustomTitle(props, title);
-
-  if (props.isAccessDeniedForNonAdminUser) {
-    return <ForbiddenPage />;
-  }
-
-  return (
-    <AdminLayout componentTitle={title}>
-      <Head>
-        <title>{headTitle}</title>
-      </Head>
-      {props.aiEnabled
-        ? <AiIntegration />
-        : <AiIntegrationDisableMode />
-      }
-    </AdminLayout>
-  );
-};
+const AdminAiIntegrationPage: NextPageWithLayout<Props> = (props: Props) => (
+  props.aiEnabled ? <AiIntegration /> : <AiIntegrationDisableMode />
+);
 
-const injectServerConfigurations = async(context: GetServerSidePropsContext, props: Props): Promise<void> => {
-  const req: CrowiRequest = context.req as CrowiRequest;
-  const { crowi } = req;
-  const { configManager } = crowi;
+AdminAiIntegrationPage.getLayout = createAdminPageLayout<Props>({
+  title: (_p, t) => t('ai_integration.ai_integration'),
+});
 
-  props.aiEnabled = configManager.getConfig('app:aiEnabled');
-};
+export const getServerSideProps: GetServerSideProps = async(context) => {
+  const baseResult = await getServerSideAdminCommonProps(context);
+  if (!('props' in baseResult)) return baseResult; // redirect / notFound pass-through
+
+  const req = context.req as CrowiRequest;
+  const { configManager } = req.crowi;
+  const aiEnabled = configManager.getConfig('app:aiEnabled');
 
-export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
-  const props = await retrieveServerSideProps(context, injectServerConfigurations);
-  return props;
+  const aiPropsResult = { props: { aiEnabled } } as const;
+  return mergeGetServerSidePropsResults(baseResult, aiPropsResult);
 };
 
 export default AdminAiIntegrationPage;

+ 18 - 52
apps/app/src/pages/admin/app.page.tsx

@@ -1,64 +1,30 @@
-import { useEffect, useMemo } from 'react';
-
-import type {
-  NextPage, GetServerSideProps, GetServerSidePropsContext,
-} from 'next';
-import { useTranslation } from 'next-i18next';
+import type { GetServerSideProps } from 'next';
 import dynamic from 'next/dynamic';
-import Head from 'next/head';
-import type { Container } from 'unstated';
-import { Provider } from 'unstated';
-
-import type { CommonProps } from '~/pages/utils/commons';
-import { generateCustomTitle } from '~/pages/utils/commons';
-import { useCurrentUser } from '~/stores-universal/context';
-import { useIsMaintenanceMode } from '~/stores/maintenanceMode';
 
-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 AppSettingsPageContents = dynamic(() => import('~/client/components/Admin/App/AppSettingsPageContents'), { ssr: false });
-const ForbiddenPage = dynamic(() => import('~/client/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
-
 
-const AdminAppPage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation('commons');
-  useIsMaintenanceMode(props.isMaintenanceMode);
-  useCurrentUser(props.currentUser ?? null);
+type Props = AdminCommonProps;
 
-  const injectableContainers: Container<any>[] = useMemo(() => [], []);
+const AdminAppPage: NextPageWithLayout<Props> = () => <AppSettingsPageContents />;
 
-  useEffect(() => {
-    (async() => {
+AdminAppPage.getLayout = createAdminPageLayout<Props>({
+  title: (_p, t) => t('headers.app_settings'),
+  containerFactories: [
+    async() => {
       const AdminAppContainer = (await import('~/client/services/AdminAppContainer')).default;
-      const adminAppContainer = new AdminAppContainer();
-      injectableContainers.push(adminAppContainer);
-    })();
-  }, [injectableContainers]);
-
-  const title = generateCustomTitle(props, t('headers.app_settings'));
-
-  if (props.isAccessDeniedForNonAdminUser) {
-    return <ForbiddenPage />;
-  }
-
-  return (
-    <Provider inject={[...injectableContainers]}>
-      <AdminLayout componentTitle={title}>
-        <Head>
-          <title>{title}</title>
-        </Head>
-        <AppSettingsPageContents />
-      </AdminLayout>
-    </Provider>
-  );
-};
-
-export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
-  const props = await retrieveServerSideProps(context);
-  return props;
+      return new AdminAppContainer();
+    },
+  ],
+});
+
+export const getServerSideProps: GetServerSideProps = async(context) => {
+  // Just delegate to common admin props (no extra server props for this page now)
+  return getServerSideAdminCommonProps(context);
 };
 
-
 export default AdminAppPage;