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

Moving away from dependencies on Crowi

Shun Miyazawa 2 лет назад
Родитель
Сommit
e04e9e3a5a

+ 1 - 1
apps/app/src/pages/[[...path]].page.tsx

@@ -485,7 +485,7 @@ async function injectPageData(context: GetServerSidePropsContext, props: Props):
   if (page != null) {
   if (page != null) {
     page.initLatestRevisionField(revisionId);
     page.initLatestRevisionField(revisionId);
     props.isLatestRevision = page.isLatestRevision();
     props.isLatestRevision = page.isLatestRevision();
-    props.skipSSR = skipSSR(context, page);
+    props.skipSSR = await skipSSR(page);
     await page.populateDataToShowRevision(props.skipSSR); // shouldExcludeBody = skipSSR
     await page.populateDataToShowRevision(props.skipSSR); // shouldExcludeBody = skipSSR
   }
   }
 
 

+ 1 - 1
apps/app/src/pages/share/[[...path]].page.tsx

@@ -234,7 +234,7 @@ export const getServerSideProps: GetServerSideProps = async(context: GetServerSi
     }
     }
     else {
     else {
       props.isNotFound = false;
       props.isNotFound = false;
-      props.skipSSR = skipSSR(context, shareLink.relatedPage);
+      props.skipSSR = await skipSSR(shareLink.relatedPage);
       props.shareLinkRelatedPage = await shareLink.relatedPage.populateDataToShowRevision(props.skipSSR); // shouldExcludeBody = skipSSR
       props.shareLinkRelatedPage = await shareLink.relatedPage.populateDataToShowRevision(props.skipSSR); // shouldExcludeBody = skipSSR
       props.isExpired = shareLink.isExpired();
       props.isExpired = shareLink.isExpired();
       props.shareLink = shareLink.toObject();
       props.shareLink = shareLink.toObject();

+ 5 - 4
apps/app/src/pages/utils/commons.ts

@@ -75,7 +75,7 @@ export const getServerSideCommonProps: GetServerSideProps<CommonProps> = async(c
   const isDefaultLogo = crowi.configManager.getConfig('crowi', 'customize:isDefaultLogo') || !isCustomizedLogoUploaded;
   const isDefaultLogo = crowi.configManager.getConfig('crowi', 'customize:isDefaultLogo') || !isCustomizedLogoUploaded;
   const forcedColorScheme = crowi.customizeService.forcedColorScheme;
   const forcedColorScheme = crowi.customizeService.forcedColorScheme;
 
 
-  // retrieve UserUISettings
+  // retrieve UserUISett ings
   const UserUISettings = getModelSafely<UserUISettingsDocument>('UserUISettings');
   const UserUISettings = getModelSafely<UserUISettingsDocument>('UserUISettings');
   const userUISettings = user != null && UserUISettings != null
   const userUISettings = user != null && UserUISettings != null
     ? await UserUISettings.findOne({ user: user._id }).exec()
     ? await UserUISettings.findOne({ user: user._id }).exec()
@@ -171,14 +171,15 @@ export const useInitSidebarConfig = (sidebarConfig: ISidebarConfig, userUISettin
 };
 };
 
 
 
 
-export const skipSSR = (context: GetServerSidePropsContext, page: PageDocument): boolean => {
+export const skipSSR = async(page: PageDocument): Promise<boolean> => {
+  const { configManager } = await import('~/server/service/config-manager');
+
   // page document only stores the bodyLength of the latest revision
   // page document only stores the bodyLength of the latest revision
   if (!page.isLatestRevision() || page.latestRevisionBodyLength == null) {
   if (!page.isLatestRevision() || page.latestRevisionBodyLength == null) {
     return true;
     return true;
   }
   }
 
 
-  const req = context.req as CrowiRequest;
-  const ssrMaxRevisionBodyLength = req.crowi.configManager.getConfig('crowi', 'app:ssrMaxRevisionBodyLength');
+  const ssrMaxRevisionBodyLength = configManager.getConfig('crowi', 'app:ssrMaxRevisionBodyLength');
   if (ssrMaxRevisionBodyLength < page.latestRevisionBodyLength) {
   if (ssrMaxRevisionBodyLength < page.latestRevisionBodyLength) {
     return true;
     return true;
   }
   }