Patch file-open-save-new-core to fix the ThinDialog page loading

Jenkinsfile

@@ -43,6 +43,7 @@ pipeline {
                     paths+=(`find plugins/repositories/core/target | grep -E "repositories-plugin-core-$dist(-sources)?\\.jar"`)
                     paths+=(`find plugins/engine-configuration/ui/target | grep -E "pdi-engine-configuration-ui-$dist(-sources)?\\.jar"`)
                     paths+=(`find plugins/file-open-save/core/target | grep -E "file-open-save-core-$dist(-sources)?\\.jar"`)
+                    paths+=(`find plugins/file-open-save-new/core/target | grep -E "file-open-save-new-core-$dist(-sources)?\\.jar"`)
                     paths+=(`find plugins/get-fields/core/target | grep -E "get-fields-core-$dist(-sources)?\\.jar"`)
                     paths+=(`find plugins/connections/ui/target | grep -E "connections-ui-$dist(-sources)?\\.jar"`)
 

plugins/file-open-save-new/core/src/main/java/org/pentaho/di/plugins/fileopensave/dialog/FileOpenSaveDialog.java

@@ -240,7 +240,7 @@ private static String getRepoURL( String path ) {
       host = LOCALHOST;
       port = getOsgiServicePort();
     }
-    return "http://" + host + ":" + port + path;
+    return System.getProperty( "KETTLE_CONTEXT_PATH" ) + "/osgi" + path;
   }
 
   private static String getKettleProperty( String propertyName ) {

plugins/file-open-save-new/core/src/main/resources-filtered/app/index.html

@@ -6,8 +6,8 @@
   <title>File Open and Save Dialog</title>
   <!-- Requesting webcontext.js one level above to workaround the filter on PDI issue (BACKLOG-17885) -->
   <!-- Remove '../' when not needed -->
-  <link rel="stylesheet" type="text/css" href="/@pentaho/di-core-ui@${project.version}/css/fonts/opensans/style.css">
-  <link rel="stylesheet" type="text/css" href="/@pentaho/di-core-ui@${project.version}/css/global.css">
+  <link rel="stylesheet" type="text/css" href="../di-core-ui@${project.version}/css/fonts/opensans/style.css">
+  <link rel="stylesheet" type="text/css" href="../di-core-ui@${project.version}/css/global.css">
   <script type="text/javascript" src="../webcontext.js?requireJsOnly=true"></script>
   <link rel="stylesheet" type="text/css" href="css/index.css">
   <script>
@@ -17,10 +17,10 @@
       // overrides just for this app
       require.config({
         paths: {
-          "pentaho": "/@pentaho/di-core-ui@${project.version}/pentaho",
-          "css": "/require-css@${require-css.version}/css",
-          "text": "/requirejs-text@${requirejs-text.version}/text",
-          "dojo": "/dojo@${dojo.version}"
+          "pentaho": "../di-core-ui@${project.version}/pentaho",
+          "css": "../../require-css@${require-css.version}/css",
+          "text": "../../requirejs-text@${requirejs-text.version}/text",
+          "dojo": "../dojo@${dojo.version}"
         }
       });
 

plugins/pom.xml

@@ -44,6 +44,7 @@
       </activation>
       <modules>
         <module>file-open-save/core</module>
+        <module>file-open-save-new/core</module>
         <module>get-fields/core</module>
         <module>repositories/core</module>
         <module>engine-configuration/ui</module>