Merge branch 'v2.x/staging' into v2.x/rc

zowe · Nov 17, 2022 · 7d3f1bc · 7d3f1bc
2 parents 18fc39d + 44af443
commit 7d3f1bc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## `3.0.1`
 - Bugfix: Added a few rules for JCL syntax highlighter
+- Bugfix: Set USS path to correct directory, when opening the directory or file in new browser tab respectively
 
 ## `3.0.0`
 

diff --git a/pluginDefinition.json b/pluginDefinition.json
@@ -1,7 +1,7 @@
 {
   "identifier": "org.zowe.editor",
   "apiVersion": "2.0.0",
-  "pluginVersion": "3.0.0",
+  "pluginVersion": "3.0.1",
   "license": "EPL-2.0",
   "author": "Zowe",
   "homepage": "https://github.com/zowe/zlux-editor",

diff --git a/webClient/package-lock.json b/webClient/package-lock.json
diff --git a/webClient/package.json b/webClient/package.json
@@ -35,7 +35,7 @@
     "@angular/router": "~12.0.0",
     "@types/node": "~8.10.59",
     "@zlux/widgets": "git+https://github.com/zowe/zlux-widgets.git#feature/upgrade-angular",
-    "@zowe/zlux-angular-file-tree": "1.1.0-RC3",
+    "@zowe/zlux-angular-file-tree": "1.2.0-RC2",
     "angular2-template-loader": "~0.6.2",
     "codelyzer": "~5.1.0",
     "compression-webpack-plugin": "~6.1.1",

diff --git a/webClient/src/app/app.component.ts b/webClient/src/app/app.component.ts
@@ -42,15 +42,17 @@ export class AppComponent {
   }
 
   ngOnInit() {
-    if (this.launchMetadata && this.launchMetadata.data && this.launchMetadata.data.type) {
-      this.handleLaunchOrMessageObject(this.launchMetadata.data);
-    }
-
     const editorheaderElement = this.editorheaderElementRef.nativeElement;
     this.appKeyboard.registerKeyUpEvent(editorheaderElement);
     this.appKeyboard.registerKeyDownEvent(editorheaderElement);
   }
 
+  ngAfterViewInit() {
+    if (this.launchMetadata && this.launchMetadata.data && this.launchMetadata.data.type) {
+      this.handleLaunchOrMessageObject(this.launchMetadata.data);
+    }
+  }
+
   handleLaunchOrMessageObject(data: any) {
     switch (data.type) {
     case 'test-language':
@@ -87,7 +89,8 @@ export class AppComponent {
               if (nodes[i].fileName == fileName) {
                 this.editorControl.openFile('', nodes[i]).subscribe(x => {
                   this.log.debug(`file loaded through app2app.`);
-                });                
+                });
+                this.editorControl.loadDirectory(nodes[i].path ? nodes[i].path : '/'); 
               }
             }
           }, e => {