Zowe Suite v3.0.0

zowe · Sep 17, 2024 · 6200c93 · 6200c93
2 parents 221e345 + 583cbc0
commit 6200c93
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/system-apps/app-prop-viewer/pluginDefinition.json b/system-apps/app-prop-viewer/pluginDefinition.json
@@ -1,18 +1,22 @@
 {
   "identifier": "org.zowe.zlux.appmanager.app.propview",
   "apiVersion": "2.0.0",
-  "pluginVersion": "2.0.0",
+  "pluginVersion": "3.0.0",
   "pluginType": "application",
   "license": "EPL-2.0",
   "author": "Zowe",
   "homepage": "https://github.com/zowe/zlux-app-manager",
   "isSystemPlugin":true,
   "webContent": {
     "framework": "angular",
+    "entryPoint": {
+      "2.0": "main.js",
+      "3.0": "v3/main.js"
+    },
     "launchDefinition": {
       "pluginShortNameKey": "Zowe Viewer",
       "pluginShortNameDefault": "Zowe Viewer",
-      "imageSrc": "assets/icon.png"
+      "imageSrc": "assets/v3/icon.png"
     },
     "descriptionKey": "Zowe Viewer",
     "descriptionDefault": "Zowe Viewer",

diff --git a/system-apps/app-prop-viewer/webClient/package.json b/system-apps/app-prop-viewer/webClient/package.json
@@ -1,6 +1,6 @@
 {
   "name": "org.zowe.zlux.appmanager.app.propview.webclient",
-  "version": "2.0.0",
+  "version": "3.0.0",
   "scripts": {
     "start": "webpack --progress --watch",
     "build": "set NODE_OPTIONS=--openssl-legacy-provider && webpack --progress",

diff --git a/system-apps/app-prop-viewer/webClient/src/app/app.component.ts b/system-apps/app-prop-viewer/webClient/src/app/app.component.ts
@@ -12,7 +12,7 @@ import { Component ,Inject} from '@angular/core';
 import { Angular2InjectionTokens } from 'pluginlib/inject-resources';
 
 @Component({
-  selector: 'app-root',
+  selector: 'app-prop',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.css']
 })

diff --git a/system-apps/app-prop-viewer/webClient/src/index.html b/system-apps/app-prop-viewer/webClient/src/index.html
@@ -21,7 +21,7 @@
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
 <body>
-  <app-root></app-root>
+  <app-root><app-prop></app-prop></app-root>
 </body>
 </html>
 

diff --git a/system-apps/app-prop-viewer/webClient/webpack.config.js b/system-apps/app-prop-viewer/webClient/webpack.config.js
@@ -21,15 +21,15 @@ var config = {
     path.resolve(__dirname, './src/plugin.ts')
   ],
   'output': {
-    'path': path.resolve(__dirname, '../web'),
+    'path': path.resolve(__dirname, '../web/v3'),
     'filename': 'main.js',
   },
   'plugins': [
     new CopyWebpackPlugin({
       patterns: [
         {
           from: path.resolve(__dirname, './src/assets'),
-          to: path.resolve(__dirname, '../web/assets')
+          to: path.resolve(__dirname, '../web/v3/assets')
         },
       ],
     }),

diff --git a/virtual-desktop/src/app/plugin-manager/plugin-factory/angular2/angular2-plugin-factory.ts b/virtual-desktop/src/app/plugin-manager/plugin-factory/angular2/angular2-plugin-factory.ts
@@ -81,8 +81,8 @@ export class Angular2PluginFactory extends PluginFactory {
     let pluginDefBase = pluginDefinition.getBasePlugin();
     let pluginDefAny:any = (pluginDefBase as any);
     let entryPoint = 'main.js';
-    if (pluginDefAny.getWebEntryPoint) {
-      entryPoint = pluginDefAny.getWebEntryPoint() || 'main.js';
+    if (pluginDefAny.getWebEntrypoint) {
+      entryPoint = pluginDefAny.getWebEntrypoint() || 'main.js';
     }
     return ZoweZLUX.uriBroker.pluginResourceUri(pluginDefBase, entryPoint);
   }

diff --git a/virtual-desktop/src/app/plugin-manager/plugin-factory/react/react-plugin-factory.ts b/virtual-desktop/src/app/plugin-manager/plugin-factory/react/react-plugin-factory.ts
@@ -30,8 +30,8 @@ export class ReactPluginFactory extends PluginFactory {
     let pluginDefBase = pluginDefinition.getBasePlugin();
     let pluginDefAny:any = (pluginDefBase as any);
     let entryPoint = 'main.js';
-    if (pluginDefAny.getWebEntryPoint) {
-      entryPoint = pluginDefAny.getWebEntryPoint() || 'main.js';
+    if (pluginDefAny.getWebEntrypoint) {
+      entryPoint = pluginDefAny.getWebEntrypoint() || 'main.js';
     }
     return ZoweZLUX.uriBroker.pluginResourceUri(pluginDefBase, entryPoint);
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
       <link rel="icon" type="image/x-icon" href="favicon.ico">
     </head>
     <body>
-      <app-root></app-root>
+      <app-root><app-prop></app-prop></app-root>
     </body>
     </html>
@@ Expand Down @@