Web Browser App: Use launchMetadata.data

Signed-off-by: Leonty Chudinov <lchudinov@rocketsoftware.com>
zowe · Mar 23, 2020 · 3c24c1d · 3c24c1d
1 parent a27161f
commit 3c24c1d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/system-apps/web-browser-app/webClient/src/app/browser/address-bar/address-bar.component.ts b/system-apps/web-browser-app/webClient/src/app/browser/address-bar/address-bar.component.ts
@@ -36,7 +36,7 @@ export class AddressBarComponent implements OnInit, OnDestroy {
     @Optional() @Inject(Angular2InjectionTokens.LAUNCH_METADATA)
     launchMetadata: Partial<LaunchMetadata>,
   ) {
-    if (launchMetadata && launchMetadata.hideControls) {
+    if (launchMetadata && launchMetadata.data && launchMetadata.data.hideControls) {
       this.isHidden = true;
     }
     this.urlControl = new FormControl(navigation.startURL);

diff --git a/system-apps/web-browser-app/webClient/src/app/browser/services/navigation.service.ts b/system-apps/web-browser-app/webClient/src/app/browser/services/navigation.service.ts
@@ -30,8 +30,9 @@ export class NavigationService {
     launchMetadata: Partial<LaunchMetadata>,
     private proxy: ProxyService
   ) {
-    if (launchMetadata && typeof launchMetadata.url === 'string') {
-      this.startURL = launchMetadata.url;
+    console.log(`navigation service got launch metadata:\n${JSON.stringify(launchMetadata, null, 2)}`);
+    if (launchMetadata && launchMetadata.data && typeof launchMetadata.data.url === 'string') {
+      this.startURL = launchMetadata.data.url;
     }
     this.url$ = this.urlSubject.pipe(switchMap(url => this.proxy.process(url)));
     this.navigateInternal(this.startURL);

diff --git a/system-apps/web-browser-app/webClient/src/app/browser/services/proxy.service.ts b/system-apps/web-browser-app/webClient/src/app/browser/services/proxy.service.ts
@@ -36,7 +36,7 @@ export class ProxyService {
     launchMetadata: Partial<LaunchMetadata>,
   ) {
     this.proxyServiceURL = ZoweZLUX.uriBroker.pluginRESTUri(this.pluginDefinition.getBasePlugin(), 'proxy', '');
-    if (launchMetadata && launchMetadata.enableProxy) {
+    if (launchMetadata && launchMetadata.data && launchMetadata.data.enableProxy) {
       this.enabled = true;
     }
   }

diff --git a/system-apps/web-browser-app/webClient/src/app/browser/shared/launch-metadata.ts b/system-apps/web-browser-app/webClient/src/app/browser/shared/launch-metadata.ts
@@ -9,9 +9,13 @@
 */
 
 export interface LaunchMetadata {
+  data: Partial<WebBrowserLaunchMetadata>;
+}
+
+export interface WebBrowserLaunchMetadata {
   url: string;
-  hideControls?: boolean;
-  enableProxy?: boolean;
+  hideControls: boolean;
+  enableProxy: boolean;
 }