Zowe Suite v1.12.0

zowe · May 22, 2020 · 28923d2 · 28923d2
2 parents c0e6b1c + 71b4553
commit 28923d2
Show file tree

Hide file tree

Showing 17 changed files with 2,381 additions and 2,661 deletions.
diff --git a/README.md b/README.md
@@ -11,9 +11,17 @@ This is a Monaco-powered editor of remote files and datasets that are accessible
 
 **To request features or report bugs, please use the issues page at the [zlux repo](https://github.com/zowe/zlux/issues) with the editor or app tags**
 
-## Install
+## Install Dependencies
 
-There is an Angular module in "webClient" folder. Go to this folder and run ```npm install```.
+There is an Angular module in "webClient" folder. 
+
+Go to this folder 
+Configure your npm registry to pickup Zowe dependencies
+
+```
+npm config set registry https://zowe.jfrog.io/zowe/api/npm/npm-release/
+npm install
+```
 
 ## Build
 

diff --git a/pluginDefinition.json b/pluginDefinition.json
@@ -1,7 +1,10 @@
 {
   "identifier": "org.zowe.editor",
   "apiVersion": "1.0.0",
-  "pluginVersion": "2.1.0",
+  "pluginVersion": "2.1.1",
+  "license": "EPL-2.0",
+  "author": "Zowe",
+  "homepage": "https://github.com/zowe/zlux-editor",
   "pluginType": "application",
   "webContent": {
     "framework": "angular",
@@ -20,23 +23,14 @@
   },
   "configurationData": {
     "resources": {
-
       "ui": {
-
         "aggregationPolicy": "override",
-
         "subResources": {
-
           "history": {
-
             "aggregationPolicy": "override"
-
           }
-
         }
-
       }
-
     }
   }
-}
+}
diff --git a/webClient/package-lock.json b/webClient/package-lock.json
diff --git a/webClient/package.json b/webClient/package.json
@@ -24,9 +24,9 @@
     "@angular-devkit/core": "~0.8.9",
     "@angular/animations": "~6.0.9",
     "@angular/cli": "~6.2.9",
-    "@angular/compiler-cli": "~6.0.9",
     "@angular/common": "~6.0.9",
     "@angular/compiler": "~6.0.9",
+    "@angular/compiler-cli": "~6.0.9",
     "@angular/core": "~6.0.9",
     "@angular/forms": "~6.0.9",
     "@angular/http": "~6.0.9",
@@ -36,7 +36,7 @@
     "@angular/platform-browser-dynamic": "~6.0.9",
     "@angular/router": "~6.0.9",
     "@types/node": "^6.0.112",
-    "@zlux/file-explorer": "git+ssh://[email protected]:zowe/zlux-file-explorer.git#staging",
+    "@zowe/zlux-angular-file-tree": "0.0.3-staging-6-20200521223819",
     "angular2-template-loader": "~0.6.2",
     "codelyzer": "~4.4.2",
     "compression-webpack-plugin": "~2.0.0",
@@ -60,6 +60,7 @@
     "webpack": "~4.9.0",
     "webpack-cli": "~3.0.0",
     "webpack-config": "~7.5.0",
+    "@zlux/widgets": "git+https://github.com:zowe/zlux-widgets.git",
     "zone.js": "~0.8.26"
   }
 }
diff --git a/webClient/src/app/editor/editor.module.ts b/webClient/src/app/editor/editor.module.ts
@@ -19,8 +19,7 @@ import { EditorService } from './editor.service';
 import { FrameComponent } from './frame/frame.component';
 import { ProjectTreeComponent } from './project-tree/project-tree.component';
 import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
-import { FileExplorerModule } from '@zlux/file-explorer/src/plugin';
-import { TreeModule } from 'angular-tree-component';
+import { FileTreeModule } from '@zowe/zlux-angular-file-tree';
 import { CodeEditorModule } from './code-editor/code-editor.module';
 
 @NgModule({
@@ -33,9 +32,8 @@ import { CodeEditorModule } from './code-editor/code-editor.module';
     MatExpansionModule,
     MatSnackBarModule,
     MatInputModule,
-    FileExplorerModule,
+    FileTreeModule,
     // EditorRoutingModule,
-    TreeModule,
     PerfectScrollbarModule,
     CodeEditorModule,
   ],

diff --git a/webClient/src/app/editor/project-tree/project-tree.component.html b/webClient/src/app/editor/project-tree/project-tree.component.html
@@ -10,7 +10,7 @@
 -->
 
 <div class="file-explorer-container">
-  <zlux-file-explorer #fileExplorer
+  <zlux-file-tree #fileExplorer
   (nodeClick)="onNodeClick($event)"
   (newFileClick)="onNewFileClick($event)"
   (newFolderClick)="onNewFolderClick($event)"
@@ -19,7 +19,7 @@
   (pathChanged)="onPathChanged($event)"
   [style]="{'height': '100%', 'padding-bottom': '100px'}"
   >
-  </zlux-file-explorer>
+  </zlux-file-tree>
 </div>
 
 

diff --git a/webClient/src/app/editor/project-tree/project-tree.component.ts b/webClient/src/app/editor/project-tree/project-tree.component.ts
@@ -22,7 +22,7 @@ import { UtilsService } from '../../shared/utils.service';
 import { DataAdapterService } from '../../shared/http/http.data.adapter.service';
 import { SnackBarService } from '../../shared/snack-bar.service';
 import { Angular2InjectionTokens } from 'pluginlib/inject-resources';
-import { ZluxFileExplorerComponent } from '@zlux/file-explorer/src/app/components/zlux-file-explorer/zlux-file-explorer.component';
+import { FileTreeComponent as ZluxFileTreeComponent } from '@zowe/zlux-angular-file-tree';
 
 function getDatasetName(dirName) {
   let lParenIndex = dirName.indexOf('(');
@@ -37,12 +37,12 @@ function getDatasetName(dirName) {
 @Component({
   selector: 'app-project-tree',
   templateUrl: './project-tree.component.html',
-  styleUrls: ['./project-tree.component.scss',  '../../../styles.scss']
+  styleUrls: ['./project-tree.component.scss',  '../../../styles.scss'],
 })
 export class ProjectTreeComponent {
 
-  @ViewChild(ZluxFileExplorerComponent)
-  private fileExplorer: ZluxFileExplorerComponent;
+  @ViewChild(ZluxFileTreeComponent)
+  private fileExplorer: ZluxFileTreeComponent;
 
   nodes: ProjectStructure[];
   options = {

diff --git a/webClient/src/app/shared/dialog/delete-file/delete-file.component.html b/webClient/src/app/shared/dialog/delete-file/delete-file.component.html
@@ -8,6 +8,7 @@
   
   Copyright Contributors to the Zowe Project.
 -->
+<zlux-tab-trap></zlux-tab-trap>
 <h2 mat-dialog-title>Delete File</h2>
 <mat-dialog-content>
   Absolute File Path (ex. /u/000/doc1):

diff --git a/webClient/src/app/shared/dialog/dialog.module.ts b/webClient/src/app/shared/dialog/dialog.module.ts
@@ -21,6 +21,8 @@ import { NewFileComponent } from './new-file/new-file.component';
 import { SaveToComponent } from './save-to/save-to.component';
 import { LanguageServerComponent } from './language-server/language-server.component';
 import { TagComponent } from './tag/tag.component';
+import { ZluxTabbingModule } from '@zlux/widgets';
+
 @NgModule({
     imports: [
         CommonModule,
@@ -31,6 +33,7 @@ import { TagComponent } from './tag/tag.component';
         MatDialogModule,
         MatSelectModule,
         MatButtonModule,
+        ZluxTabbingModule,
     ],
     declarations: [
         OpenProjectComponent,
@@ -40,7 +43,7 @@ import { TagComponent } from './tag/tag.component';
         NewFileComponent,
         SaveToComponent,
         LanguageServerComponent,
-        TagComponent
+        TagComponent,
     ],
     providers: [HttpService],
     entryComponents: [
@@ -51,7 +54,7 @@ import { TagComponent } from './tag/tag.component';
         NewFileComponent,
         SaveToComponent,
         LanguageServerComponent,
-        TagComponent
+        TagComponent,
     ]
 })
 export class DialogModule { }

diff --git a/webClient/src/app/shared/dialog/language-server/language-server.component.html b/webClient/src/app/shared/dialog/language-server/language-server.component.html
@@ -8,6 +8,7 @@
   
   Copyright Contributors to the Zowe Project.
 -->
+<zlux-tab-trap></zlux-tab-trap>
 <h2 mat-dialog-title>Language Server Setting</h2>
 <mat-dialog-content>
   <mat-form-field>

diff --git a/webClient/src/app/shared/dialog/new-file/new-file.component.html b/webClient/src/app/shared/dialog/new-file/new-file.component.html
@@ -8,6 +8,7 @@
   
   Copyright Contributors to the Zowe Project.
 -->
+<zlux-tab-trap></zlux-tab-trap>
 <h2 mat-dialog-title>New File</h2>
 <mat-dialog-content>
   File Name:

diff --git a/webClient/src/app/shared/dialog/open-dataset/open-dataset.component.html b/webClient/src/app/shared/dialog/open-dataset/open-dataset.component.html
@@ -8,12 +8,13 @@
   
   Copyright Contributors to the Zowe Project.
 -->
+<zlux-tab-trap hiddenIds="open-dataset-clear" hiddenPos="2"></zlux-tab-trap>
 <h2 mat-dialog-title>Open Dataset</h2>
 <mat-dialog-content>
 
   <mat-form-field>
-      <input matInput type="text" placeholder="Dataset" [(ngModel)]="value">
-      <button mat-button *ngIf="value" matSuffix mat-icon-button aria-label="Clear" (click)="value=''">
+      <input matInput tabindex="2" type="text" placeholder="Dataset" [(ngModel)]="value">
+      <button tabindex="1" mat-button *ngIf="value" matSuffix mat-icon-button aria-label="Clear" (click)="value=''" id="open-dataset-clear">
         <mat-icon>close</mat-icon>
       </button>
   </mat-form-field>

diff --git a/webClient/src/app/shared/dialog/open-folder/open-folder.component.html b/webClient/src/app/shared/dialog/open-folder/open-folder.component.html
@@ -8,13 +8,14 @@
   
   Copyright Contributors to the Zowe Project.
 -->
+<zlux-tab-trap></zlux-tab-trap>
 <h2 mat-dialog-title>Open Directory</h2>
 <mat-dialog-content>
 
   <mat-form-field>
-      <input matInput type="text" placeholder="Directory" [(ngModel)]="value">
-      <button mat-button *ngIf="value" matSuffix mat-icon-button aria-label="Clear" (click)="value=''">
-        <mat-icon>close</mat-icon>
+      <input matInput type="text" tabindex="2" placeholder="Directory" [(ngModel)]="value">
+      <button tabindex="1"  mat-button *ngIf="value" matSuffix mat-icon-button aria-label="Clear" (click)="value=''" id="open-dir-clear">
+        <mat-icon tabindex="-1">close</mat-icon>
       </button>
   </mat-form-field>
 </mat-dialog-content>

diff --git a/webClient/src/app/shared/dialog/open-project/open-project.component.html b/webClient/src/app/shared/dialog/open-project/open-project.component.html
@@ -8,6 +8,7 @@
   
   Copyright Contributors to the Zowe Project.
 -->
+<zlux-tab-trap></zlux-tab-trap>
 <h2 mat-dialog-title>Open Project</h2>
 <mat-dialog-content>
   Choose a project:

diff --git a/webClient/src/app/shared/dialog/save-to/save-to.component.html b/webClient/src/app/shared/dialog/save-to/save-to.component.html
@@ -8,6 +8,7 @@
   
   Copyright Contributors to the Zowe Project.
 -->
+<zlux-tab-trap></zlux-tab-trap>
 <h2 mat-dialog-title>Save As</h2>
 <mat-dialog-content>
   File Name:
@@ -22,7 +23,7 @@ <h2 mat-dialog-title>Save As</h2>
   <p></p>
   Encoding:
   <mat-form-field>
-    <mat-select placeholder="Select An Encoding" [(ngModel)]="results.encoding">
+    <mat-select tabindex="0" placeholder="Select An Encoding" [(ngModel)]="results.encoding">
       <mat-option *ngFor="let option of options" [value]="option">
       {{option}}</mat-option>
     </mat-select>

diff --git a/webClient/src/app/shared/dialog/save-to/save-to.component.scss b/webClient/src/app/shared/dialog/save-to/save-to.component.scss
@@ -9,14 +9,14 @@
   Copyright Contributors to the Zowe Project.
 */
 mat-dialog-actions {
-    justify-content: flex-end;
+  justify-content: flex-end;
 }
 /*
-  This program and the accompanying materials are
-  made available under the terms of the Eclipse Public License v2.0 which accompanies
-  this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
-  
-  SPDX-License-Identifier: EPL-2.0
-  
-  Copyright Contributors to the Zowe Project.
+This program and the accompanying materials are
+made available under the terms of the Eclipse Public License v2.0 which accompanies
+this distribution, and is available at https://www.eclipse.org/legal/epl-v20.html
+
+SPDX-License-Identifier: EPL-2.0
+
+Copyright Contributors to the Zowe Project.
 */
diff --git a/webClient/src/app/shared/dialog/tag/tag.component.html b/webClient/src/app/shared/dialog/tag/tag.component.html
@@ -8,6 +8,7 @@
   
   Copyright Contributors to the Zowe Project.
 -->
+<zlux-tab-trap></zlux-tab-trap>
 <h2 mat-dialog-title>Untagged File Found</h2>
 <mat-dialog-content>
   <p> <b>{{data.fileName}}</b> is currently untagged. Please select a tag for it in USS. </p>