Yuki Takei 3 лет назад
Родитель
Сommit
d9f25d1866

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

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

+ 1 - 0
packages/app/src/pages/_private-legacy-pages.page.tsx

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

+ 1 - 0
packages/app/src/pages/_search.page.tsx

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

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

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

+ 1 - 1
packages/app/src/server/service/config-loader.ts

@@ -149,7 +149,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
     ns:      'crowi',
     ns:      'crowi',
     key:     'app:drawioUri',
     key:     'app:drawioUri',
     type:    ValueType.STRING,
     type:    ValueType.STRING,
-    default: 'https://embed.diagrams.net/',
+    default: null,
   },
   },
   NCHAN_URI: {
   NCHAN_URI: {
     ns:      'crowi',
     ns:      'crowi',