MID-6271 ace editor worker-xml.js loading fixed + minor typo in tomca…

…t root valve
Evolveum · May 25, 2022 · d209748 · d209748
1 parent 3e02928
commit d209748
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/gui/admin-gui/src/frontend/js/vendors.js b/gui/admin-gui/src/frontend/js/vendors.js
@@ -28,5 +28,12 @@ ace.config.setModuleUrl('ace/ext/searchbox',
     require('../../../node_modules/ace-builds/src-noconflict/ext-searchbox.js'));
 
 // ace.config.setModuleUrl('ace/mode/xml_worker', require('../../../node_modules/ace-builds/src-noconflict/worker-xml.js'));
-ace.config.setModuleUrl('ace/mode/xml_worker',
-    require('file-loader?publicPath=../../static/&name=[name].[ext]&esModule=false!../../../node_modules/ace-builds/src-noconflict/worker-xml.js'));
+require('file-loader?publicPath=../../static/&name=[name].[ext]&esModule=false!../../../node_modules/ace-builds/src-noconflict/worker-xml.js')
+
+
+// xml worker module is being loaded always using some url, it's different that theme and ext modules, therefore we'll compute
+// <midpoint_context>/static/worker-xml.js from current script URL and use it to load correctly worker-xml.js script
+var url = document.currentScript.src;
+url = url.replace(/vendors.js/, "worker-xml.js");
+
+ace.config.setModuleUrl('ace/mode/xml_worker', url);
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/TomcatRootValve.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/TomcatRootValve.java
@@ -35,10 +35,10 @@ public class TomcatRootValve extends ValveBase {
 
     private String servletPath;
 
-    public TomcatRootValve(String serlvetPath) {
+    public TomcatRootValve(String servletPath) {
         super();
 
-        this.servletPath = serlvetPath == null ? "" : serlvetPath;
+        this.servletPath = servletPath == null ? "" : servletPath;
     }
 
     @Override