From 3ae748682a29393d2135aeee72cfe5ad490ef1b2 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Thu, 12 Sep 2024 15:45:36 -0400 Subject: [PATCH 1/5] Add entrhyPoint for v3 Signed-off-by: Timothy Gerstel --- system-apps/app-prop-viewer/pluginDefinition.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system-apps/app-prop-viewer/pluginDefinition.json b/system-apps/app-prop-viewer/pluginDefinition.json index 8777451c..11793d7e 100644 --- a/system-apps/app-prop-viewer/pluginDefinition.json +++ b/system-apps/app-prop-viewer/pluginDefinition.json @@ -9,6 +9,9 @@ "isSystemPlugin":true, "webContent": { "framework": "angular", + "entryPoint": { + "3.0": "main.js" + }, "launchDefinition": { "pluginShortNameKey": "Zowe Viewer", "pluginShortNameDefault": "Zowe Viewer", From 53d94cdc8c013e9776f4886d2b13bffb4f99b455 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Thu, 12 Sep 2024 17:42:51 -0400 Subject: [PATCH 2/5] How did this even render before fr Signed-off-by: Timothy Gerstel --- system-apps/app-prop-viewer/webClient/src/app/app.component.ts | 2 +- system-apps/app-prop-viewer/webClient/src/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index 4a5aff1b..9d153d1b 100644 --- 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 index 4e305d7a..60e01a66 100644 --- a/system-apps/app-prop-viewer/webClient/src/index.html +++ b/system-apps/app-prop-viewer/webClient/src/index.html @@ -21,7 +21,7 @@ - + From fc6b1b27303fa5e7c4b4efe4cff78ecf262958d7 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Mon, 16 Sep 2024 16:03:17 -0400 Subject: [PATCH 3/5] maintain v2 compat while fixing v3 Signed-off-by: Timothy Gerstel --- system-apps/app-prop-viewer/webClient/webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system-apps/app-prop-viewer/webClient/webpack.config.js b/system-apps/app-prop-viewer/webClient/webpack.config.js index 0016f25f..f16de3b4 100644 --- a/system-apps/app-prop-viewer/webClient/webpack.config.js +++ b/system-apps/app-prop-viewer/webClient/webpack.config.js @@ -21,7 +21,7 @@ var config = { path.resolve(__dirname, './src/plugin.ts') ], 'output': { - 'path': path.resolve(__dirname, '../web'), + 'path': path.resolve(__dirname, '../web/v3'), 'filename': 'main.js', }, 'plugins': [ @@ -29,7 +29,7 @@ var config = { patterns: [ { from: path.resolve(__dirname, './src/assets'), - to: path.resolve(__dirname, '../web/assets') + to: path.resolve(__dirname, '../web/v3/assets') }, ], }), From ea1b90b63b9662c2a0a3adfc7698f14a488cdb39 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Mon, 16 Sep 2024 16:03:34 -0400 Subject: [PATCH 4/5] bump version Signed-off-by: Timothy Gerstel --- system-apps/app-prop-viewer/webClient/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system-apps/app-prop-viewer/webClient/package.json b/system-apps/app-prop-viewer/webClient/package.json index 071d832c..f24a2fc9 100644 --- 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", From 4c890253d7d20fb253305c1628f2cefef12faab5 Mon Sep 17 00:00:00 2001 From: Timothy Gerstel Date: Mon, 16 Sep 2024 16:04:11 -0400 Subject: [PATCH 5/5] bump version, add entryPoint values for 2.0 and 3.0. Signed-off-by: Timothy Gerstel --- system-apps/app-prop-viewer/pluginDefinition.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/system-apps/app-prop-viewer/pluginDefinition.json b/system-apps/app-prop-viewer/pluginDefinition.json index 11793d7e..11cb8610 100644 --- a/system-apps/app-prop-viewer/pluginDefinition.json +++ b/system-apps/app-prop-viewer/pluginDefinition.json @@ -1,7 +1,7 @@ { "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", @@ -10,12 +10,13 @@ "webContent": { "framework": "angular", "entryPoint": { - "3.0": "main.js" + "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",