Zowe Suite v1.27.0-RC1

zowe · Jan 11, 2022 · 6073ba9 · 6073ba9
2 parents 0140195 + 77fae99
commit 6073ba9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/bootstrap/src/uri/mvd-uri.ts b/bootstrap/src/uri/mvd-uri.ts
@@ -36,7 +36,7 @@ export class MvdUri implements ZLUX.UriBroker {
             if (agentConfig.mediationLayer && agentConfig.mediationLayer.enabled && agentConfig.mediationLayer.serviceName) {
               let version = agentConfig.mediationLayer.serviceVersion || 'v1';
               let name = agentConfig.mediationLayer.serviceName;
-              this.agentPrefix = `/api/${version}/${name}/`
+              this.agentPrefix = `/${name}/api/${version}/`
             }
           }
           resolve(this.agentPrefix);
@@ -212,10 +212,14 @@ export class MvdUri implements ZLUX.UriBroker {
     // This is a workaround for the mediation layer not having a dynamic way to get the websocket uri for zlux
     // Since we know our uri is /ui/v1/zlux/ behind the api-layer we replace the ui with ws to get /ws/v1/zlux/
     if (proxy_mode) {
-      if (uri.startsWith('/api/')) {
-        return uri.replace('/api/', '/ws/');
-      } else {
+      let apiIndex = uri.indexOf('/api/');
+      let uiIndex = uri.indexOf('/ui/');
+      if (apiIndex == -1 && uiIndex == -1) {
+        return uri;
+      } else if (apiIndex == -1 || (uiIndex != -1 && (uiIndex < apiIndex))) {
         return uri.replace('/ui/', '/ws/');
+      } else {
+        return uri.replace('/api/', '/ws/');
       }
     } else {
       return uri;

diff --git a/system-apps/app-generator/templates/iframe/Basic/web/html/index.html b/system-apps/app-generator/templates/iframe/Basic/web/html/index.html
@@ -6,11 +6,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="../css/iframe.css">
     <script type="text/javascript" src="/ZLUX/plugins/org.zowe.zlux.bootstrap/web/adapter-init.js"></script>
-    <script type="text/javascript" src="/ui/v1/zlux/ZLUX/plugins/org.zowe.zlux.bootstrap/web/adapter-init.js"></script>
+    <script type="text/javascript" src="/zlux/ui/v1/ZLUX/plugins/org.zowe.zlux.bootstrap/web/adapter-init.js"></script>
     <script type="text/javascript" src="/lib/org.zowe.zlux.logger/0.9.0/logger.js"></script>
-    <script type="text/javascript" src="/ui/v1/zlux/lib/org.zowe.zlux.logger/0.9.0/logger.js"></script>
+    <script type="text/javascript" src="/zlux/ui/v1/lib/org.zowe.zlux.logger/0.9.0/logger.js"></script>
     <script type="text/javascript" src="/ZLUX/plugins/org.zowe.zlux.bootstrap/web/iframe-adapter.js"></script>
-    <script type="text/javascript" src="/ui/v1/zlux/ZLUX/plugins/org.zowe.zlux.bootstrap/web/iframe-adapter.js"></script>
+    <script type="text/javascript" src="/zlux/ui/v1/ZLUX/plugins/org.zowe.zlux.bootstrap/web/iframe-adapter.js"></script>
     <script type="text/javascript" src="../js/main.js"></script>
   </head>
   <body class="iframe-font" onload="ready(this)">

diff --git a/system-apps/app-generator/webClient/src/index.html b/system-apps/app-generator/webClient/src/index.html
@@ -15,11 +15,11 @@
 	<title>Zowe App Generator</title>
 	<base href="./">
   <script type="text/javascript" src="/ZLUX/plugins/org.zowe.zlux.bootstrap/web/adapter-init.js"></script>
-  <script type="text/javascript" src="/ui/v1/zlux/ZLUX/plugins/org.zowe.zlux.bootstrap/web/adapter-init.js"></script>
+  <script type="text/javascript" src="/zlux/ui/v1/ZLUX/plugins/org.zowe.zlux.bootstrap/web/adapter-init.js"></script>
   <script type="text/javascript" src="/lib/org.zowe.zlux.logger/0.9.0/logger.js"></script>
-  <script type="text/javascript" src="/ui/v1/zlux/lib/org.zowe.zlux.logger/0.9.0/logger.js"></script>
+  <script type="text/javascript" src="/zlux/ui/v1/lib/org.zowe.zlux.logger/0.9.0/logger.js"></script>
   <script type="text/javascript" src="/ZLUX/plugins/org.zowe.zlux.bootstrap/web/iframe-adapter.js"></script>
-  <script type="text/javascript" src="/ui/v1/zlux/ZLUX/plugins/org.zowe.zlux.bootstrap/web/iframe-adapter.js"></script>
+  <script type="text/javascript" src="/zlux/ui/v1/ZLUX/plugins/org.zowe.zlux.bootstrap/web/iframe-adapter.js"></script>
 	<meta name="theme-color" content="#ffff00">
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>