refactor

apps/app/src/pages/[[...path]]/server-side-props.ts

@@ -8,8 +8,8 @@ import type { GeneralPageInitialProps } from '../general-page';
 import {
   getServerSideRendererConfigProps,
   getActivityAction, isValidInitialAndSameRouteProps,
+  getServerSideGeneralPageProps,
 } from '../general-page';
-import { getServerSideConfigurationProps } from '../general-page/configuration-props';
 import { addActivity } from '../utils/activity';
 import { mergeGetServerSidePropsResults } from '../utils/server-side-props';
 
@@ -53,14 +53,14 @@ export async function getServerSidePropsForInitial(context: GetServerSidePropsCo
   const [
     commonInitialResult,
     basicLayoutResult,
-    serverConfigResult,
+    generalPageResult,
     rendererConfigResult,
     i18nPropsResult,
     pageDataResult,
   ] = await Promise.all([
     getServerSideCommonInitialProps(context),
     getServerSideBasicLayoutProps(context),
-    getServerSideConfigurationProps(context),
+    getServerSideGeneralPageProps(context),
     getServerSideRendererConfigProps(context),
     getServerSideI18nProps(context, ['translation']),
     getPageDataForInitial(context),
@@ -70,7 +70,7 @@ export async function getServerSidePropsForInitial(context: GetServerSidePropsCo
   const mergedResult = mergeGetServerSidePropsResults(commonEachPropsResult,
     mergeGetServerSidePropsResults(commonInitialResult,
       mergeGetServerSidePropsResults(basicLayoutResult,
-        mergeGetServerSidePropsResults(serverConfigResult,
+        mergeGetServerSidePropsResults(generalPageResult,
           mergeGetServerSidePropsResults(rendererConfigResult,
             mergeGetServerSidePropsResults(i18nPropsResult,
               mergeGetServerSidePropsResults(pageDataResult, nextjsRoutingProps)))))));

apps/app/src/pages/general-page/configuration-props.ts

@@ -35,7 +35,7 @@ export const getServerSideRendererConfigProps: GetServerSideProps<RendererConfig
   };
 };
 
-export const getServerSideConfigurationProps: GetServerSideProps<ServerConfigurationProps> = async(context: GetServerSidePropsContext) => {
+export const getServerSideGeneralPageProps: GetServerSideProps<ServerConfigurationProps> = async(context: GetServerSidePropsContext) => {
   const req: CrowiRequest = context.req as CrowiRequest;
   const { crowi } = req;
   const {

apps/app/src/pages/general-page/index.ts

@@ -1,4 +1,4 @@
-export { getServerSideRendererConfigProps, getServerSideConfigurationProps } from './configuration-props';
+export { getServerSideRendererConfigProps, getServerSideGeneralPageProps } from './configuration-props';
 export { getActivityAction } from './get-activity-action';
 export type * from './types';
 export { isValidInitialAndSameRouteProps } from './type-guards';

apps/app/src/pages/share/[[...path]]/server-side-props.ts

@@ -6,7 +6,7 @@ import {
 } from '../../common-props';
 import type { GeneralPageInitialProps } from '../../general-page';
 import {
-  getServerSideConfigurationProps,
+  getServerSideGeneralPageProps,
   getServerSideRendererConfigProps,
   getActivityAction, isValidInitialAndSameRouteProps,
 } from '../../general-page';
@@ -62,13 +62,13 @@ export async function getServerSidePropsForInitial(context: GetServerSidePropsCo
 
   const [
     commonInitialResult,
-    serverConfigResult,
+    generalPageResult,
     rendererConfigResult,
     i18nPropsResult,
     pageDataResult,
   ] = await Promise.all([
     getServerSideCommonInitialProps(context),
-    getServerSideConfigurationProps(context),
+    getServerSideGeneralPageProps(context),
     getServerSideRendererConfigProps(context),
     getServerSideI18nProps(context, ['translation']),
     getPageDataForInitial(context),
@@ -77,7 +77,7 @@ export async function getServerSidePropsForInitial(context: GetServerSidePropsCo
   // Merge all results in a type-safe manner (using sequential merging)
   const mergedResult = mergeGetServerSidePropsResults(commonEachPropsResult,
     mergeGetServerSidePropsResults(commonInitialResult,
-      mergeGetServerSidePropsResults(serverConfigResult,
+      mergeGetServerSidePropsResults(generalPageResult,
         mergeGetServerSidePropsResults(rendererConfigResult,
           mergeGetServerSidePropsResults(i18nPropsResult,
             mergeGetServerSidePropsResults(pageDataResult,