Merge pull request #7577 from weseek/imprv/plantuml-uri-injection

imprv: Inject PlantUML URI with config-loader

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

@@ -9,6 +9,6 @@ export type RendererConfig = {
   highlightJsStyleBorder: boolean,
 
   drawioUri: string,
-  plantumlUri: string | null,
+  plantumlUri: string,
   blockdiagUri: string | null,
 } & XssOptionConfig;

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

@@ -577,7 +577,7 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
     isIndentSizeForced: configManager.getConfig('markdown', 'markdown:isIndentSizeForced'),
 
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
-    plantumlUri: process.env.PLANTUML_URI ?? null,
+    plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
     blockdiagUri: process.env.BLOCKDIAG_URI ?? null,
 
     // XSS Options

apps/app/src/pages/_private-legacy-pages.page.tsx

@@ -96,7 +96,7 @@ async function injectServerConfigurations(context: GetServerSidePropsContext, pr
     isIndentSizeForced: configManager.getConfig('markdown', 'markdown:isIndentSizeForced'),
 
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
-    plantumlUri: process.env.PLANTUML_URI ?? null,
+    plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
     blockdiagUri: process.env.BLOCKDIAG_URI ?? null,
 
     // XSS Options

apps/app/src/pages/_search.page.tsx

@@ -133,7 +133,7 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
     isIndentSizeForced: configManager.getConfig('markdown', 'markdown:isIndentSizeForced'),
 
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
-    plantumlUri: process.env.PLANTUML_URI ?? null,
+    plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
     blockdiagUri: process.env.BLOCKDIAG_URI ?? null,
 
     // XSS Options

apps/app/src/pages/me/[[...path]].page.tsx

@@ -159,7 +159,7 @@ async function injectServerConfigurations(context: GetServerSidePropsContext, pr
     isIndentSizeForced: configManager.getConfig('markdown', 'markdown:isIndentSizeForced'),
 
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
-    plantumlUri: process.env.PLANTUML_URI ?? null,
+    plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
     blockdiagUri: process.env.BLOCKDIAG_URI ?? null,
 
     // XSS Options

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

@@ -156,7 +156,7 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
     isIndentSizeForced: configManager.getConfig('markdown', 'markdown:isIndentSizeForced'),
 
     drawioUri: configManager.getConfig('crowi', 'app:drawioUri'),
-    plantumlUri: process.env.PLANTUML_URI ?? null,
+    plantumlUri: configManager.getConfig('crowi', 'app:plantumlUri'),
     blockdiagUri: process.env.BLOCKDIAG_URI ?? null,
 
     // XSS Options

apps/app/src/server/service/config-loader.ts

@@ -73,12 +73,6 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     type:    ValueType.STRING,
     default: null,
   },
-  // PLANTUML_URI: {
-  //   ns:      ,
-  //   key:     ,
-  //   type:    ,
-  //   default:
-  // },
   // BLOCKDIAG_URI: {
   //   ns:      ,
   //   key:     ,
@@ -121,6 +115,12 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
   //   type:    ,
   //   default:
   // },
+  PLANTUML_URI: {
+    ns:      'crowi',
+    key:     'app:plantumlUri',
+    type:    ValueType.STRING,
+    default: 'https://www.plantuml.com/plantuml',
+  },
   DRAWIO_URI: {
     ns:      'crowi',
     key:     'app:drawioUri',

apps/app/src/services/renderer/remark-plugins/plantuml.ts

@@ -3,11 +3,11 @@ import { Plugin } from 'unified';
 import urljoin from 'url-join';
 
 type PlantUMLPluginParams = {
-  plantumlUri?: string,
+  plantumlUri: string,
 }
 
 export const remarkPlugin: Plugin<[PlantUMLPluginParams]> = (options) => {
-  const plantumlUri = options.plantumlUri ?? 'https://www.plantuml.com/plantuml';
+  const plantumlUri = options.plantumlUri;
 
   const baseUrl = urljoin(plantumlUri, '/svg');