fix: add monaco plugin to prevent loading of CDN files

terrestris · Oct 17, 2024 · e3fd64e · e3fd64e
1 parent e779623
commit e3fd64e
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 88 deletions.
diff --git a/rspack.common.js b/rspack.common.js
@@ -18,8 +18,6 @@ module.exports = {
     shogunApplicationConfig: 'shogunApplicationConfig'
   },
   output: {
-    // TODO needed?
-    globalObject: 'self',
     path: path.resolve(__dirname, 'dist'),
     clean: true
   },

diff --git a/src/Component/FormField/JSONEditor/JSONEditor.tsx b/src/Component/FormField/JSONEditor/JSONEditor.tsx
@@ -1,15 +1,14 @@
 import './JSONEditor.less';
 
-// import './UserWorker';
-
 import React, {
   useCallback,
   useEffect,
   useMemo,
   useState
 } from 'react';
 
-import Editor, {
+import {
+  Editor,
   EditorProps,
   OnChange,
   useMonaco,
@@ -29,31 +28,7 @@ import {
 import OpenAPIUtil from '../../../Util/OpenAPIUtil';
 import FullscreenWrapper from '../../FullscreenWrapper/FullscreenWrapper';
 
-// loader.config({ monaco });
-
-// @ts-ignore
-
-// self.MonacoEnvironment = {
-//   getWorker: function (moduleId, label) {
-//     if (label === 'json') {
-//       return new Worker(new URL('monaco-editor/esm/vs/language/json/json.worker', import.meta.url));
-//     }
-//     if (label === 'css' || label === 'scss' || label === 'less') {
-//       return new Worker(new URL('monaco-editor/esm/vs/language/css/css.worker', import.meta.url));
-//     }
-//     if (label === 'html' || label === 'handlebars' || label === 'razor') {
-//       return new Worker(new URL('monaco-editor/esm/vs/language/html/html.worker', import.meta.url));
-//     }
-//     if (label === 'typescript' || label === 'javascript') {
-//       return new Worker(
-//         new URL('monaco-editor/esm/vs/language/typescript/ts.worker', import.meta.url),
-//       );
-//     }
-//     return new Worker(new URL('monaco-editor/esm/vs/editor/editor.worker', import.meta.url));
-//   }
-// };
-
-loader.config({ monacoEditor });
+loader.config({ monaco: monacoEditor });
 
 export type JSONEditorProps = {
   value?: string;

diff --git a/src/Component/Menu/Navigation/Navigation.tsx b/src/Component/Menu/Navigation/Navigation.tsx
@@ -66,50 +66,58 @@ export const Navigation: React.FC<NavigationProps> = ({
     const layersConfig = entityConfigs.find(e => e.entityType === 'layer');
     const userConfig = entityConfigs.find(e => e.entityType === 'user');
     const groupsConfig = entityConfigs.find(e => e.entityType === 'group');
-    navigationContentChildren.push({
-      key: 'application',
-      label: (
-        <>
-          <BankOutlined />
-          <span>
-            {TranslationUtil.getTranslationFromConfig(applicationConfig?.navigationTitle, applicationConfig?.i18n)}
-          </span>
-        </>
-      )
-    });
-    navigationContentChildren.push({
-      key: 'layer',
-      label: (
-        <>
-          <AppstoreOutlined />
-          <span>
-            {TranslationUtil.getTranslationFromConfig(layersConfig?.navigationTitle, layersConfig?.i18n)}
-          </span>
-        </>
-      )
-    });
-    navigationContentChildren.push({
-      key: 'user',
-      label: (
-        <>
-          <UserOutlined />
-          <span>
-            {TranslationUtil.getTranslationFromConfig(userConfig?.navigationTitle, userConfig?.i18n)}
-          </span>
-        </>
-      )
-    });
-    navigationContentChildren.push({
-      key: 'group',
-      label: (
-        <>
-          <TeamOutlined />
-          <span>
-            {TranslationUtil.getTranslationFromConfig(groupsConfig?.navigationTitle, groupsConfig?.i18n)}
-          </span>
-        </>
-      )
-    });
+    if (applicationConfig) {
+      navigationContentChildren.push({
+        key: 'application',
+        label: (
+          <>
+            <BankOutlined />
+            <span>
+              {TranslationUtil.getTranslationFromConfig(applicationConfig?.navigationTitle, applicationConfig?.i18n)}
+            </span>
+          </>
+        )
+      });
+    }
+    if (layersConfig) {
+      navigationContentChildren.push({
+        key: 'layer',
+        label: (
+          <>
+            <AppstoreOutlined />
+            <span>
+              {TranslationUtil.getTranslationFromConfig(layersConfig?.navigationTitle, layersConfig?.i18n)}
+            </span>
+          </>
+        )
+      });
+    }
+    if (userConfig) {
+      navigationContentChildren.push({
+        key: 'user',
+        label: (
+          <>
+            <UserOutlined />
+            <span>
+              {TranslationUtil.getTranslationFromConfig(userConfig?.navigationTitle, userConfig?.i18n)}
+            </span>
+          </>
+        )
+      });
+    }
+    if (groupsConfig) {
+      navigationContentChildren.push({
+        key: 'group',
+        label: (
+          <>
+            <TeamOutlined />
+            <span>
+              {TranslationUtil.getTranslationFromConfig(groupsConfig?.navigationTitle, groupsConfig?.i18n)}
+            </span>
+          </>
+        )
+      });
+    }
   }
 
   if (navigationConf?.general?.imagefiles?.visible) {

diff --git a/src/index.tsx b/src/index.tsx
@@ -22,7 +22,7 @@ import config from 'shogunApplicationConfig';
 
 import SHOGunAPIClient from '@terrestris/shogun-util/dist/service/SHOGunAPIClient';
 
-import { PluginProvider } from './Context/PluginContext';
+// import { PluginProvider } from './Context/PluginContext';
 import { SHOGunAPIClientProvider } from './Context/SHOGunAPIClientContext';
 
 import i18n from './i18n';
@@ -206,22 +206,14 @@ const renderApp = async () => {
 
     // const plugins = await loadPlugins();
 
-    // loader.config({
-    //   paths: {
-    //     vs: './vs'
-    //   }
-    // });
-
-    console.log(client.application());
-
     root.render(
       <SHOGunAPIClientProvider client={client}>
         {/* <PluginProvider plugins={plugins}> */}
-          <RecoilRoot>
-            <Suspense>
-              <App />
-            </Suspense>
-          </RecoilRoot>
+        <RecoilRoot>
+          <Suspense>
+            <App />
+          </Suspense>
+        </RecoilRoot>
         {/* </PluginProvider> */}
       </SHOGunAPIClientProvider>
     );