Просмотр исходного кода

refactor export page, importer page and plugins page

Yuki Takei 7 месяцев назад
Родитель
Сommit
5c39586368

+ 15 - 51
apps/app/src/pages/admin/export.page.tsx

@@ -1,63 +1,27 @@
-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 type { NextPageWithLayout } from '../_app.page';
 
-import { retrieveServerSideProps } from '../../utils/admin-page-util';
+import type { AdminCommonProps } from './_shared';
+import { createAdminPageLayout, getServerSideAdminCommonProps } from './_shared';
 
-const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const ExportArchiveDataPage = dynamic(() => import('~/client/components/Admin/ExportArchiveDataPage'), { ssr: false });
-const ForbiddenPage = dynamic(() => import('~/client/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
-
-
-const AdminExportDataArchivePage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation('admin');
-  useCurrentUser(props.currentUser ?? null);
 
-  const componentTitle = t('export_management.export_archive_data');
-  const pageTitle = generateCustomTitle(props, componentTitle);
+type Props = AdminCommonProps;
 
-  const injectableContainers: Container<any>[] = useMemo(() => [], []);
+const AdminExportDataArchivePage: NextPageWithLayout<Props> = () => <ExportArchiveDataPage />;
 
-  useEffect(() => {
-    (async() => {
+AdminExportDataArchivePage.getLayout = createAdminPageLayout<Props>({
+  title: (_p, t) => t('export_management.export_archive_data'),
+  containerFactories: [
+    async() => {
       const AdminAppContainer = (await import('~/client/services/AdminAppContainer')).default;
-      const adminAppContainer = new AdminAppContainer();
-      injectableContainers.push(adminAppContainer);
-    })();
-  }, [injectableContainers]);
-
-  if (props.isAccessDeniedForNonAdminUser) {
-    return <ForbiddenPage />;
-  }
-
-  return (
-    <Provider inject={[...injectableContainers]}>
-      <AdminLayout componentTitle={componentTitle}>
-        <Head>
-          <title>{pageTitle}</title>
-        </Head>
-        <ExportArchiveDataPage />
-      </AdminLayout>
-    </Provider>
-  );
-};
-
-
-export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
-  const props = await retrieveServerSideProps(context);
-  return props;
-};
+      return new AdminAppContainer();
+    },
+  ],
+});
 
+export const getServerSideProps: GetServerSideProps = getServerSideAdminCommonProps;
 
 export default AdminExportDataArchivePage;

+ 15 - 53
apps/app/src/pages/admin/importer.page.tsx

@@ -1,65 +1,27 @@
-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 type { NextPageWithLayout } from '../_app.page';
 
-import { retrieveServerSideProps } from '../../utils/admin-page-util';
+import type { AdminCommonProps } from './_shared';
+import { createAdminPageLayout, getServerSideAdminCommonProps } from './_shared';
 
-const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const DataImportPageContents = dynamic(() => import('~/client/components/Admin/ImportData/ImportDataPageContents'), { ssr: false });
-const ForbiddenPage = dynamic(() => import('~/client/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
-
-
-const AdminDataImportPage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation('admin');
-  useCurrentUser(props.currentUser ?? null);
 
-  const componentTitle = t('importer_management.import_data');
-  const pageTitle = generateCustomTitle(props, componentTitle);
+type Props = AdminCommonProps;
 
-  const injectableContainers: Container<any>[] = useMemo(() => [], []);
+const AdminDataImportPage: NextPageWithLayout<Props> = () => <DataImportPageContents />;
 
-  useEffect(() => {
-    (async() => {
+AdminDataImportPage.getLayout = createAdminPageLayout<Props>({
+  title: (_p, t) => t('importer_management.import_data'),
+  containerFactories: [
+    async() => {
       const AdminImportContainer = (await import('~/client/services/AdminImportContainer')).default;
-      const adminImportContainer = new AdminImportContainer();
-      injectableContainers.push(adminImportContainer);
-    })();
-  }, [injectableContainers]);
-
-  if (props.isAccessDeniedForNonAdminUser) {
-    return <ForbiddenPage />;
-  }
-
-
-  return (
-    <Provider inject={[...injectableContainers]}>
-      <AdminLayout componentTitle={componentTitle}>
-        <Head>
-          <title>{pageTitle}</title>
-        </Head>
-        <DataImportPageContents />
-      </AdminLayout>
-    </Provider>
-  );
-
-};
-
-
-export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
-  const props = await retrieveServerSideProps(context);
-  return props;
-};
+      return new AdminImportContainer();
+    },
+  ],
+});
 
+export const getServerSideProps: GetServerSideProps = getServerSideAdminCommonProps;
 
 export default AdminDataImportPage;

+ 15 - 53
apps/app/src/pages/admin/plugins.page.tsx

@@ -1,68 +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 type { NextPageWithLayout } from '../_app.page';
 
-import { retrieveServerSideProps } from '../../utils/admin-page-util';
+import type { AdminCommonProps } from './_shared';
+import { createAdminPageLayout, getServerSideAdminCommonProps } from './_shared';
 
-
-const AdminLayout = dynamic(() => import('~/components/Layout/AdminLayout'), { ssr: false });
 const PluginsExtensionPageContents = dynamic(
   () => import('~/features/growi-plugin/client/components/Admin').then(mod => mod.PluginsExtensionPageContents),
   { ssr: false },
 );
-const ForbiddenPage = dynamic(() => import('~/client/components/Admin/ForbiddenPage').then(mod => mod.ForbiddenPage), { ssr: false });
-
 
-const AdminAppPage: NextPage<CommonProps> = (props) => {
-  const { t } = useTranslation('admin');
-  useIsMaintenanceMode(props.isMaintenanceMode);
-  useCurrentUser(props.currentUser ?? null);
+type Props = AdminCommonProps;
 
-  const title = t('plugins.plugins');
+const AdminAppPage: NextPageWithLayout<Props> = () => <PluginsExtensionPageContents />;
 
-  const injectableContainers: Container<any>[] = useMemo(() => [], []);
-
-  useEffect(() => {
-    (async() => {
+AdminAppPage.getLayout = createAdminPageLayout<Props>({
+  title: (_p, t) => t('plugins.plugins'),
+  containerFactories: [
+    async() => {
       const AdminAppContainer = (await import('~/client/services/AdminAppContainer')).default;
-      const adminAppContainer = new AdminAppContainer();
-      injectableContainers.push(adminAppContainer);
-    })();
-  }, [injectableContainers]);
-
-  if (props.isAccessDeniedForNonAdminUser) {
-    return <ForbiddenPage />;
-  }
-
-  return (
-    <Provider inject={[...injectableContainers]}>
-      <AdminLayout componentTitle={title}>
-        <Head>
-          <title>{generateCustomTitle(props, title)}</title>
-        </Head>
-        <PluginsExtensionPageContents />
-      </AdminLayout>
-    </Provider>
-  );
-};
-
-export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
-  const props = await retrieveServerSideProps(context);
-  return props;
-};
+      return new AdminAppContainer();
+    },
+  ],
+});
 
+export const getServerSideProps: GetServerSideProps = getServerSideAdminCommonProps;
 
 export default AdminAppPage;