Merge pull request #325 from zowe/bugfix/openInEditor2TheRedo

Fix App2App Timing Issues With File Tree Operations
zowe · Apr 12, 2023 · 194fd6d · 194fd6d
2 parents cae7cba + 86e7c41
commit 194fd6d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/webClient/package-lock.json b/webClient/package-lock.json
diff --git a/webClient/package.json b/webClient/package.json
@@ -36,7 +36,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.5.0-RC1",
+    "@zowe/zlux-angular-file-tree": "1.6.0-RC1",
     "angular2-template-loader": "~0.6.2",
     "codelyzer": "~5.1.0",
     "compression-webpack-plugin": "~6.1.1",

diff --git a/webClient/src/app/editor/project-tree/project-tree.component.ts b/webClient/src/app/editor/project-tree/project-tree.component.ts
@@ -90,7 +90,9 @@ export class ProjectTreeComponent {
     private codeEditorService: EditorService,
     @Inject(Angular2InjectionTokens.LOGGER) private log: ZLUX.ComponentLogger,
     @Inject(Angular2InjectionTokens.PLUGIN_DEFINITION) private pluginDefinition: ZLUX.ContainerPluginDefinition) {
+  }
 
+  ngOnInit(){
     this.editorControl.projectNode.subscribe((nodes) => {
       this.nodes = nodes;
     });
@@ -126,8 +128,10 @@ export class ProjectTreeComponent {
             this.editorControl.initProjectContext(projectName, this.nodes);
           });
       }
-    });
+    });    
+  }
 
+  ngAfterViewInit(){
     this.editorControl.openDirectory.subscribe(dirName => {
       if(dirName) {
         if (dirName.startsWith('/')) {
@@ -136,10 +140,9 @@ export class ProjectTreeComponent {
         } else {
           let dsName = this.utils.getDatasetName(dirName);
           this.fileExplorer.updateDSList(dsName);
-        } 
+        }
       }
     });
-
     this.editorControl.openDataset.subscribe(datasetInfo => {
       console.log('Dataset Info: ', datasetInfo);
       let dirName = datasetInfo.datasetName;