Merge branch 'v3.x/staging' into example/v3/customizable-entrypoint-url

zowe · Aug 29, 2024 · 6eca934 · 6eca934
2 parents eeec2b0 + 030ba3d
commit 6eca934
Show file tree

Hide file tree

Showing 204 changed files with 34,504 additions and 77,076 deletions.
diff --git a/.github/workflows/build-core.yml b/.github/workflows/build-core.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - v3.x/staging
+      - v3.x/rc
+      - v3.x/master
   pull_request:
     types: [opened, reopened, synchronize]
 
@@ -145,9 +147,9 @@ jobs:
             ${{ runner.os }}-build-cache-node-modules-
       
       - name: '[Prep 2] Setup Node'
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: 16.15.0
+          node-version: 18
 
       - name: '[Prep 3] Setup jFrog CLI'
         uses: jfrog/setup-jfrog-cli@v2

diff --git a/bootstrap/src/assets/i18n/log/messages_en.json b/bootstrap/src/assets/i18n/log/messages_en.json
@@ -41,6 +41,7 @@
     "ZWED5041I":"ectxt=",
     "ZWED5042I":"dispatcher.invokeAction on context %s",
     "ZWED5043I":"RESERVED: MVD standalone container requested with pluginId %s",
+    "ZWED5324I":"RESERVED: The requested Desktop version (%s) is in maintenance mode. To use the newest Desktop version instead, remove the query parameter 'use-v2-desktop'.",
 
     "ZWED5000W":"RESERVED: Desktop attempted to change instanceId for iframe instance=%s, message=%s",
     "ZWED5001W":"pluginWSUri not implemented yet!",
@@ -99,4 +100,4 @@
     "ZWED5041E":"RESERVED: Plugin type is not present",
     "ZWED5042E":"RESERVED: Plugin type is not a string",
     "ZWED5043E":"RESERVED: %s is not a valid semantic version"
-}
+}
diff --git a/bootstrap/src/bootstrap/bootstrap-manager.ts b/bootstrap/src/bootstrap/bootstrap-manager.ts
@@ -13,7 +13,6 @@
 import { Plugin } from 'zlux-base/plugin-manager/plugin'
 import { PluginManager } from 'zlux-base/plugin-manager/plugin-manager'
 import { ZoweZLUXResources } from './rocket-mvd-resources'
-import { DSMResources } from './dsm-resources'
 
 export class BootstrapManager {
   private static bootstrapPerformed = false;
@@ -22,11 +21,7 @@ export class BootstrapManager {
     const uriBroker = window['GIZA_ENVIRONMENT'];
     console.log("ZWED5004I - bootstrapGlobalResources standaloneContainerRequested flag value: ", standaloneContainerRequested);
     console.log("ZWED5005I - bootstrapGlobalResources GIZA_ENVIRONMENT value: ", uriBroker);
-    if (standaloneContainerRequested && uriBroker && uriBroker.toUpperCase() === 'DSM') {
-      window.ZoweZLUX = DSMResources;
-    } else {
-      window.ZoweZLUX = ZoweZLUXResources;
-    }
+    window.ZoweZLUX = ZoweZLUXResources;
   }
 
   private static bootstrapDesktopPlugin(desktop: ZLUX.Plugin, injectionCallback: (plugin: ZLUX.Plugin) => Promise<void>) {
@@ -61,8 +56,18 @@ export class BootstrapManager {
       console.log(`ZWED5007I - ${desktops.length} desktops available`);
       console.log('ZWED5008I - desktops: ', desktops);
 
+      const searchParams = new URLSearchParams(window.location.search);
+      const v2Desktop = desktops.filter((desktop)=> { desktop.getIdentifier() == "org.zowe.zlux.ng2desktop" });
+      const v3Desktop = desktops.filter((desktop)=> { desktop.getIdentifier() == "org.zowe.zlux.ivydesktop" });
+      const useV2Desktop = v2Desktop.length == 1 && searchParams.has("use-v2-desktop") && (searchParams.get("use-v2-desktop") == 'true'); 
+
       if (desktops.length == 0) {
         console.error("ZWED5012E - No desktops available to bootstrap.");
+      } else if (useV2Desktop) {
+        console.warn("ZWED5324I - The requested Desktop version (V2) is in maintenance mode. To use the newest Desktop version instead, remove the query parameter 'use-v2-desktop'.");
+        BootstrapManager.bootstrapDesktopPlugin(v2Desktop[0], injectionCallback);
+      } else if (v3Desktop.length == 1) {
+        BootstrapManager.bootstrapDesktopPlugin(v3Desktop[0], injectionCallback);
       } else {
         BootstrapManager.bootstrapDesktopPlugin(desktops[0], injectionCallback);
       }

diff --git a/bootstrap/src/bootstrap/dsm-resources.ts b/bootstrap/src/bootstrap/dsm-resources.ts
diff --git a/bootstrap/src/bootstrap/rocket-mvd-resources.ts b/bootstrap/src/bootstrap/rocket-mvd-resources.ts
@@ -18,7 +18,6 @@ import { Logger } from '../../../../zlux-shared/src/logging/logger'
 import { Registry } from 'zlux-base/registry/registry'
 import { ZoweNotificationManager } from 'zlux-base/notification-manager/notification-manager'
 import { SimpleGlobalization } from '../i18n/simple-globalization'
-// import { VirtualDesktopAdapter } from '../abstract-virtual-desktop/virtual-desktop-adapter'
 
 // This is the core logger
 let logger = new Logger();

diff --git a/bootstrap/src/uri/dsm-uri.ts b/bootstrap/src/uri/dsm-uri.ts
diff --git a/system-apps/admin-notification-app/pluginDefinition.json b/system-apps/admin-notification-app/pluginDefinition.json
@@ -1,7 +1,7 @@
 {
   "identifier": "org.zowe.zlux.ng2desktop.admin-notification",
   "apiVersion": "2.0.0",
-  "pluginVersion": "2.0.0",
+  "pluginVersion": "3.0.0",
   "pluginType": "application",
   "license": "EPL-2.0",
   "author": "Zowe",
@@ -12,7 +12,11 @@
     "launchDefinition": {
       "pluginShortNameKey": "Admin Notification",
       "pluginShortNameDefault": "Admin Desktop Notification",
-      "imageSrc": "assets/icon.png"
+      "imageSrc": "assets/v3/icon.png"
+    },
+    "entryPoint": {
+      "2.0": "main.js",
+      "3.0": "v3/main.js"
     },
     "descriptionKey": "notificationDescription",
     "descriptionDefault": "Send admin notifications to users of the Desktop",