Merge pull request #629 from zowe/bugfix/app-prop-viewer

Add app-prop-viewer entryPoint for v3, change build path for v3 to web/v3
zowe · Sep 16, 2024 · ddaac09 · ddaac09
2 parents 2d8f07b + 4c89025
commit ddaac09
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 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')
         },
       ],
     }),
-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 @@