delete useGrowiHydratedEnv and replace it to useDrawioUri

packages/app/src/components/PageEditor/DrawioModal.tsx

@@ -9,7 +9,7 @@ import {
 
 
 import { getDiagramsNetLangCode } from '~/client/util/locale-utils';
-import { useGrowiHydratedEnv } from '~/stores/context';
+import { useDrawioUri } from '~/stores/context';
 import { useDrawioModal } from '~/stores/modal';
 import { usePersonalSettings } from '~/stores/personal-settings';
 
@@ -19,7 +19,7 @@ type Props = {
 };
 
 export const DrawioModal = (props: Props): JSX.Element => {
-  const { data: growiHydratedEnv } = useGrowiHydratedEnv();
+  const { data: growiDrawioUri } = useDrawioUri();
   const { data: personalSettingsInfo } = usePersonalSettings();
 
 
@@ -31,7 +31,7 @@ export const DrawioModal = (props: Props): JSX.Element => {
   };
 
   const drawioUrl = useMemo(() => {
-    const drawioUri = growiHydratedEnv?.DRAWIO_URI || 'https://embed.diagrams.net/';
+    const drawioUri = growiDrawioUri || 'https://embed.diagrams.net/';
     const url = new URL(drawioUri);
 
     // refs: https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported-
@@ -42,7 +42,7 @@ export const DrawioModal = (props: Props): JSX.Element => {
     url.searchParams.append('configure', '1');
 
     return url;
-  }, [growiHydratedEnv?.DRAWIO_URI, personalSettingsInfo?.lang]);
+  }, [growiDrawioUri, personalSettingsInfo?.lang]);
 
 
   return (

packages/app/src/interfaces/services/renderer.ts

@@ -1,12 +1,5 @@
 import { XssOptionConfig } from '~/services/xss/xssOption';
 
-export type GrowiHydratedEnv = {
-  DRAWIO_URI: string | null,
-  HACKMD_URI: string | null,
-  NO_CDN: string | null,
-  GROWI_CLOUD_URI: string | null,
-  GROWI_APP_ID_FOR_GROWI_CLOUD: string | null,
-}
 
 export type RendererConfig = {
   isEnabledLinebreaks: boolean,

packages/app/src/pages/[[...path]].page.tsx

@@ -29,7 +29,7 @@ import { CrowiRequest } from '~/interfaces/crowi-request';
 // import { EditorMode, useEditorMode, useIsMobile } from '~/stores/ui';
 import { EditorConfig } from '~/interfaces/editor-settings';
 import { CustomWindow } from '~/interfaces/global';
-import { GrowiHydratedEnv, RendererConfig } from '~/interfaces/services/renderer';
+import { RendererConfig } from '~/interfaces/services/renderer';
 import { ISidebarConfig } from '~/interfaces/sidebar-config';
 import { IUserUISettings } from '~/interfaces/user-ui-settings';
 import { PageModel, PageDocument } from '~/server/models/page';
@@ -58,10 +58,10 @@ import {
   useIsForbidden, useIsNotFound, useIsTrashPage, useIsSharedUser,
   useIsEnabledStaleNotification, useIsIdenticalPath,
   useIsSearchServiceConfigured, useIsSearchServiceReachable, useDisableLinkSharing,
-  useHackmdUri,
+  useDrawioUri, useHackmdUri,
   useIsAclEnabled, useIsUserPage,
   useCsrfToken, useIsSearchScopeChildrenAsDefault, useCurrentPageId, useCurrentPathname,
-  useIsSlackConfigured, useGrowiHydratedEnv, useRendererConfig, useEditingMarkdown,
+  useIsSlackConfigured, useRendererConfig, useEditingMarkdown,
   useEditorConfig, useIsAllReplyShown, useIsUploadableFile, useIsUploadableImage, usePageUser,
 } from '../stores/context';
 
@@ -147,7 +147,9 @@ type Props = CommonProps & {
   // isMailerSetup: boolean,
   isAclEnabled: boolean,
   // hasSlackConfig: boolean,
+  drawioUri: string,
   hackmdUri: string,
+  noCdn: string,
   // highlightJsStyle: string,
   isAllReplyShown: boolean,
   // isContainerFluid: boolean,
@@ -159,7 +161,6 @@ type Props = CommonProps & {
   // isIndentSizeForced: boolean,
   disableLinkSharing: boolean,
 
-  growiHydratedEnv : GrowiHydratedEnv,
   rendererConfig: RendererConfig,
 
   // UI
@@ -212,13 +213,11 @@ const GrowiPage: NextPage<Props> = (props: Props) => {
   // useIsMailerSetup(props.isMailerSetup);
   useIsAclEnabled(props.isAclEnabled);
   // useHasSlackConfig(props.hasSlackConfig);
-  // useDrawioUri(props.drawioUri);
+  useDrawioUri(props.drawioUri);
   useHackmdUri(props.hackmdUri);
   // useNoCdn(props.noCdn);
   // useIndentSize(props.adminPreferredIndentSize);
   useDisableLinkSharing(props.disableLinkSharing);
-
-  useGrowiHydratedEnv(props.growiHydratedEnv);
   useRendererConfig(props.rendererConfig);
   // useRendererSettings(props.rendererSettingsStr != null ? JSON.parse(props.rendererSettingsStr) : undefined);
   // useGrowiRendererConfig(props.growiRendererConfigStr != null ? JSON.parse(props.growiRendererConfigStr) : undefined);
@@ -496,6 +495,9 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
   // props.highlightJsStyle = configManager.getConfig('crowi', 'customize:highlightJsStyle');
   props.isAllReplyShown = configManager.getConfig('crowi', 'customize:isAllReplyShown');
   // props.isContainerFluid = configManager.getConfig('crowi', 'customize:isContainerFluid');
+  props.drawioUri = configManager.getConfig('crowi', 'app:drawioUri');
+  props.hackmdUri = configManager.getConfig('crowi', 'app:hackmdUri');
+  props.noCdn = configManager.getConfig('crowi', 'app:noCdn');
   props.isEnabledStaleNotification = configManager.getConfig('crowi', 'customize:isEnabledStaleNotification');
   // props.isEnabledLinebreaks = configManager.getConfig('markdown', 'markdown:isEnabledLinebreaks');
   // props.isEnabledLinebreaksInComments = configManager.getConfig('markdown', 'markdown:isEnabledLinebreaksInComments');
@@ -509,14 +511,6 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
   // props.adminPreferredIndentSize = configManager.getConfig('markdown', 'markdown:adminPreferredIndentSize');
   // props.isIndentSizeForced = configManager.getConfig('markdown', 'markdown:isIndentSizeForced');
 
-  props.growiHydratedEnv = {
-    DRAWIO_URI: configManager.getConfig('crowi', 'app:drawioUri'),
-    HACKMD_URI: configManager.getConfig('crowi', 'app:hackmdUri'),
-    NO_CDN: configManager.getConfig('crowi', 'app:noCdn'),
-    GROWI_CLOUD_URI: configManager.getConfig('crowi', 'app:growiCloudUri'),
-    GROWI_APP_ID_FOR_GROWI_CLOUD: configManager.getConfig('crowi', 'app:growiAppIdForCloud'),
-  };
-
   props.rendererConfig = {
     isEnabledLinebreaks: configManager.getConfig('markdown', 'markdown:isEnabledLinebreaks'),
     isEnabledLinebreaksInComments: configManager.getConfig('markdown', 'markdown:isEnabledLinebreaksInComments'),

packages/app/src/stores/context.tsx

@@ -6,7 +6,7 @@ import useSWRImmutable from 'swr/immutable';
 import { SupportedActionType } from '~/interfaces/activity';
 import { EditorConfig } from '~/interfaces/editor-settings';
 // import { CustomWindow } from '~/interfaces/global';
-import { GrowiHydratedEnv, RendererConfig } from '~/interfaces/services/renderer';
+import { RendererConfig } from '~/interfaces/services/renderer';
 import { GrowiThemes } from '~/interfaces/theme';
 import InterceptorManager from '~/services/interceptor-manager';
 
@@ -134,6 +134,10 @@ export const useRevisionIdHackmdSynced = (initialData?: Nullable<any>): SWRRespo
   return useStaticSWR<Nullable<any>, Error>('revisionIdHackmdSynced', initialData);
 };
 
+export const useDrawioUri = (initialData?: Nullable<string>): SWRResponse<Nullable<string>, Error> => {
+  return useStaticSWR<Nullable<string>, Error>('drawioUri', initialData);
+};
+
 export const useHackmdUri = (initialData?: Nullable<string>): SWRResponse<Nullable<string>, Error> => {
   return useStaticSWR<Nullable<string>, Error>('hackmdUri', initialData);
 };
@@ -230,10 +234,6 @@ export const useEditorConfig = (initialData?: EditorConfig): SWRResponse<EditorC
   return useStaticSWR<EditorConfig, Error>('editorConfig', initialData);
 };
 
-export const useGrowiHydratedEnv = (initialData?: GrowiHydratedEnv): SWRResponse<GrowiHydratedEnv, Error> => {
-  return useStaticSWR('growiHydratedEnv', initialData);
-};
-
 export const useRendererConfig = (initialData?: RendererConfig): SWRResponse<RendererConfig, any> => {
   return useStaticSWR('growiRendererConfig', initialData);
 };