Merge branch 'develop' into CYB-201

# Conflicts: # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/angular.json # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/package-lock.json # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/package.json # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/chain-page.module.ts # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/custom-form/components/multi-input/multi-input.component.spec.ts # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/indexing-form/indexing-form.component.ts # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/live-view/diff-popup/diff-popup.component.html # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/live-view/live-view.module.ts # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/live-view/sample-data-form/sample-data-text-folder-input/sample-data-text-folder-input.component.ts # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/live-view/text-diff-view/text-diff-view.component.ts # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/parser/advanced-editor/advanced-editor.component.spec.ts # flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/components/parser/parser.component.spec.ts
cloudera · Mar 20, 2024 · 0fb1291 · 0fb1291
2 parents edcafdd + cddb986
commit 0fb1291
Show file tree

Hide file tree

Showing 31 changed files with 305 additions and 12,511 deletions.
diff --git a/...tron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/angular.json b/...tron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/angular.json
@@ -25,6 +25,7 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.app.json",
+            "baseHref": "/ui/",
             "preserveSymlinks": true,
             "allowedCommonJsDependencies": [
               "lodash",
@@ -41,12 +42,12 @@
               {
                 "glob": "**/*",
                 "input": "node_modules/monaco-editor",
-                "output": "assets/monaco-editor"
+                "output": "/assets/monaco/"
               },
               {
                 "glob": "**/*",
                 "input": "node_modules/monaco-editor/min-maps",
-                "output": "./assets/min-maps/"
+                "output": "/assets/min-maps/"
               }
             ],
             "styles": [
@@ -140,8 +141,8 @@
               "src/assets",
               {
                 "glob": "**/*",
-                "input": "node_modules/ngx-monaco-editor-v13/assets/monaco",
-                "output": "./assets/monaco-editor/min"
+                "input": "node_modules/ngx-monaco-editor-v2",
+                "output": "/assets/monaco-editor/min"
               }
             ]
           }