From 359ece034aed044326bbc1080bd8635722645c70 Mon Sep 17 00:00:00 2001 From: Leonty Chudinov Date: Wed, 29 Jul 2020 20:22:38 +0500 Subject: [PATCH 1/9] Handle migrated datsets properly Signed-off-by: Leonty Chudinov --- .../project-tree/project-tree.component.ts | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/webClient/src/app/editor/project-tree/project-tree.component.ts b/webClient/src/app/editor/project-tree/project-tree.component.ts index 66e31dba..4351e349 100644 --- a/webClient/src/app/editor/project-tree/project-tree.component.ts +++ b/webClient/src/app/editor/project-tree/project-tree.component.ts @@ -15,7 +15,7 @@ import { OpenProjectComponent } from '../../shared/dialog/open-project/open-proj import { OpenFolderComponent } from '../../shared/dialog/open-folder/open-folder.component'; import { HttpService } from '../../shared/http/http.service'; import { ENDPOINTS } from '../../../environments/environment'; -import { ProjectStructure } from '../../shared/model/editor-project'; +import { ProjectStructure, DatasetAttributes } from '../../shared/model/editor-project'; import { EditorControlService } from '../../shared/editor-control/editor-control.service'; import { EditorService } from '../editor.service'; import { UtilsService } from '../../shared/utils.service'; @@ -23,6 +23,8 @@ import { DataAdapterService } from '../../shared/http/http.data.adapter.service' import { SnackBarService } from '../../shared/snack-bar.service'; import { Angular2InjectionTokens } from 'pluginlib/inject-resources'; import { FileTreeComponent as ZluxFileTreeComponent } from '@zowe/zlux-angular-file-tree'; +import { catchError, switchMap, map } from 'rxjs/operators'; +import { of, Observable } from 'rxjs'; function getDatasetName(dirName) { let lParenIndex = dirName.indexOf('('); @@ -220,6 +222,16 @@ export class ProjectTreeComponent { }); } else if($event.data.isDataset){ let data: ProjectStructure = ($event.data as ProjectStructure); + const isMigrated = data.datasetAttrs && data.datasetAttrs.volser === 'MIGRAT'; + if (isMigrated) { + const datasetName = data.path.trim(); + this.log.debug(`Dataset ${datasetName} is migrated`); + this.recallDataset(datasetName).subscribe( + datasetAttrs => this.log.info(`dataset ${datasetName} recalled, attrs ${JSON.stringify(datasetAttrs)}, update tree here`), + _err => this.log.warn(`unable to recall dataset ${datasetName}`) + ); + return; + } if($event.type == 'file'){ this.editorControl.openFile('', (data)).subscribe(x => { this.log.debug(`Dataset loaded through File Explorer.`); @@ -229,6 +241,17 @@ export class ProjectTreeComponent { } } + private recallDataset(datasetName: string): Observable { + const contentsURI = ZoweZLUX.uriBroker.datasetContentsUri(datasetName); + const metadataURI = ZoweZLUX.uriBroker.datasetMetadataUri(datasetName, undefined, undefined, true); + return this.httpService.get(contentsURI) + .pipe( + catchError(_err => of({})), + switchMap(() => this.httpService.get(metadataURI)), + map(data => data.datasets[0]), + ); + } + onPathChanged($event: any) { this.editorControl.activeDirectory = $event; } From 7bc47981cc5a6d5592bd2e0df5f027f1b0000f35 Mon Sep 17 00:00:00 2001 From: Nakul Manchanda Date: Mon, 28 Sep 2020 16:53:08 -0400 Subject: [PATCH 2/9] add .npmrc to set @zowe registry Signed-off-by: Nakul Manchanda --- README.md | 4 +-- webClient/.npmrc | 1 + webClient/package-lock.json | 64 ++++++++++++++++++------------------- 3 files changed, 34 insertions(+), 35 deletions(-) create mode 100644 webClient/.npmrc diff --git a/README.md b/README.md index 0acd972e..24bf7e62 100644 --- a/README.md +++ b/README.md @@ -15,11 +15,9 @@ This is a Monaco-powered editor of remote files and datasets that are accessible There is an Angular module in "webClient" folder. -Go to this folder -Configure your npm registry to pickup Zowe dependencies +Go to this folder and install dependencies ``` -npm config set registry https://zowe.jfrog.io/zowe/api/npm/npm-release/ npm install ``` diff --git a/webClient/.npmrc b/webClient/.npmrc new file mode 100644 index 00000000..ce0c9121 --- /dev/null +++ b/webClient/.npmrc @@ -0,0 +1 @@ +@zowe:registry=https://zowe.jfrog.io/zowe/api/npm/npm-release/ \ No newline at end of file diff --git a/webClient/package-lock.json b/webClient/package-lock.json index 65975772..50c22c5e 100644 --- a/webClient/package-lock.json +++ b/webClient/package-lock.json @@ -1545,21 +1545,21 @@ }, "dependencies": { "browserslist": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.3.tgz", - "integrity": "sha512-GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ==", + "version": "4.14.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz", + "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001131", - "electron-to-chromium": "^1.3.570", + "caniuse-lite": "^1.0.30001135", + "electron-to-chromium": "^1.3.571", "escalade": "^3.1.0", "node-releases": "^1.1.61" } }, "caniuse-lite": { - "version": "1.0.30001131", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001131.tgz", - "integrity": "sha512-4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw==", + "version": "1.0.30001137", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz", + "integrity": "sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==", "dev": true }, "semver": { @@ -1668,21 +1668,21 @@ }, "dependencies": { "browserslist": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.3.tgz", - "integrity": "sha512-GcZPC5+YqyPO4SFnz48/B0YaCwS47Q9iPChRGi6t7HhflKBcINzFrJvRfC+jp30sRMKxF+d4EHGs27Z0XP1NaQ==", + "version": "4.14.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz", + "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001131", - "electron-to-chromium": "^1.3.570", + "caniuse-lite": "^1.0.30001135", + "electron-to-chromium": "^1.3.571", "escalade": "^3.1.0", "node-releases": "^1.1.61" } }, "caniuse-lite": { - "version": "1.0.30001131", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001131.tgz", - "integrity": "sha512-4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw==", + "version": "1.0.30001137", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz", + "integrity": "sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==", "dev": true }, "semver": { @@ -4724,12 +4724,12 @@ } }, "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.1.2" } }, "decamelize": { @@ -5012,9 +5012,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.570", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.570.tgz", - "integrity": "sha512-Y6OCoVQgFQBP5py6A/06+yWxUZHDlNr/gNDGatjH8AZqXl8X0tE4LfjLJsXGz/JmWJz8a6K7bR1k+QzZ+k//fg==", + "version": "1.3.574", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.574.tgz", + "integrity": "sha512-kF8Bfe1h8X1pPwlw6oRoIXj0DevowviP6fl0wcljm+nZjy/7+Fos4THo1N/7dVGEJlyEqK9C8qNnbheH+Eazfw==", "dev": true }, "elliptic": { @@ -6916,9 +6916,9 @@ "dev": true }, "is-callable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.1.tgz", - "integrity": "sha512-wliAfSzx6V+6WfMOmus1xy0XvSgf/dlStkvTfq7F0g4bOIW0PSUbnyse3NhDwdyYS1ozfUtAAySqTws3z9Eqgg==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", "dev": true }, "is-data-descriptor": { @@ -7824,9 +7824,9 @@ "integrity": "sha512-wOoEVAoZtrarDRcQC32Fp0ocacpQd6/Nb0FmUZOHeD3swZuPZhDLOxTyoNLjKq3d+h/6g+IARBLnDaLT5OQD4g==" }, "monaco-editor-webpack-plugin": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.0.tgz", - "integrity": "sha512-tOiiToc94E1sb50BgZ8q8WK/bxus77SRrwCqIpAB5er3cpX78SULbEBY4YPOB8kDolOzKRt30WIHG/D6gz69Ww==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/monaco-editor-webpack-plugin/-/monaco-editor-webpack-plugin-1.9.1.tgz", + "integrity": "sha512-x7fx1w3i/uwZERIgztHAAK3VQMsL8+ku0lFXXbO81hKDg8IieACqjGEa2mqEueg0c/fX+wd0oI+75wB19KJAsA==", "dev": true, "requires": { "loader-utils": "^1.2.3" @@ -8936,9 +8936,9 @@ } }, "postcss-load-config": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.1.tgz", - "integrity": "sha512-D2ENobdoZsW0+BHy4x1CAkXtbXtYWYRIxL/JbtRBqrRGOPtJ2zoga/bEZWhV/ShWB5saVxJMzbMdSyA/vv4tXw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz", + "integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==", "dev": true, "requires": { "cosmiconfig": "^5.0.0", From 3b2233bd5deb20b447eda702926dac18b6fb3c1d Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 13 Oct 2020 13:38:54 -0400 Subject: [PATCH 3/9] update editor version and file tree version Signed-off-by: 1000TurquoisePogs --- CHANGELOG.md | 5 ++ pluginDefinition.json | 2 +- webClient/package-lock.json | 155 ++++++++++++++++-------------------- webClient/package.json | 4 +- 4 files changed, 75 insertions(+), 91 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c002875..43e07d4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Zlux Editor Changelog +## `2.3.0` + +- Added ability to change owner and permissions of files and folders similar to the commands `chown` and `chmod` +- Added ability to change tagging of a file or folder of files similar to the command `chtag` + ## `2.2.3` - Bugfix: Fixed missing fonts used for icons diff --git a/pluginDefinition.json b/pluginDefinition.json index 0c6478aa..3069a184 100644 --- a/pluginDefinition.json +++ b/pluginDefinition.json @@ -1,7 +1,7 @@ { "identifier": "org.zowe.editor", "apiVersion": "1.0.0", - "pluginVersion": "2.2.3", + "pluginVersion": "2.3.0", "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 index 50c22c5e..9b6382b4 100644 --- a/webClient/package-lock.json +++ b/webClient/package-lock.json @@ -1557,9 +1557,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001137", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz", - "integrity": "sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==", + "version": "1.0.30001148", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz", + "integrity": "sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==", "dev": true }, "semver": { @@ -1680,9 +1680,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001137", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz", - "integrity": "sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==", + "version": "1.0.30001148", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz", + "integrity": "sha512-E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw==", "dev": true }, "semver": { @@ -2642,9 +2642,9 @@ "dev": true }, "@types/lodash": { - "version": "4.14.161", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz", - "integrity": "sha512-EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==" + "version": "4.14.162", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.162.tgz", + "integrity": "sha512-alvcho1kRUnnD1Gcl4J+hK0eencvzq9rmzvFPRmP5rPHx9VVsJj6bKLTATPVf9ktgv4ujzh7T+XWKp+jhuODig==" }, "@types/minimatch": { "version": "3.0.3", @@ -2906,9 +2906,9 @@ } }, "@zowe/zlux-angular-file-tree": { - "version": "0.2.0-RC3", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/@zowe/zlux-angular-file-tree/-/@zowe/zlux-angular-file-tree-0.2.0-RC3.tgz", - "integrity": "sha1-ctUXwU67gy/FO6nmcDZwaxwPYPw=", + "version": "0.4.0-RC1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/@zowe/zlux-angular-file-tree/-/@zowe/zlux-angular-file-tree-0.4.0-RC1.tgz", + "integrity": "sha1-LOAhkXHRoEYiwrt0YIxXaJ5YEk0=", "dev": true, "requires": { "@angular/animations": "~6.0.9", @@ -2945,9 +2945,9 @@ } }, "acorn": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", - "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", "dev": true }, "agent-base": { @@ -3862,9 +3862,9 @@ } }, "chokidar": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz", - "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz", + "integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==", "dev": true, "requires": { "anymatch": "~3.1.1", @@ -3874,7 +3874,7 @@ "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", "normalize-path": "~3.0.0", - "readdirp": "~3.4.0" + "readdirp": "~3.5.0" } }, "chownr": { @@ -5012,9 +5012,9 @@ "dev": true }, "electron-to-chromium": { - "version": "1.3.574", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.574.tgz", - "integrity": "sha512-kF8Bfe1h8X1pPwlw6oRoIXj0DevowviP6fl0wcljm+nZjy/7+Fos4THo1N/7dVGEJlyEqK9C8qNnbheH+Eazfw==", + "version": "1.3.578", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz", + "integrity": "sha512-z4gU6dA1CbBJsAErW5swTGAaU2TBzc2mPAonJb00zqW1rOraDo2zfBMDRvaz9cVic+0JEZiYbHWPw/fTaZlG2Q==", "dev": true }, "elliptic": { @@ -5123,21 +5123,21 @@ } }, "es-abstract": { - "version": "1.18.0-next.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz", - "integrity": "sha512-elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ==", + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", + "is-callable": "^1.2.2", "is-negative-zero": "^2.0.0", "is-regex": "^1.1.1", "object-inspect": "^1.8.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.0", + "object.assign": "^4.1.1", "string.prototype.trimend": "^1.0.1", "string.prototype.trimstart": "^1.0.1" } @@ -5179,9 +5179,9 @@ } }, "escalade": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz", - "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true }, "escape-html": { @@ -8252,34 +8252,13 @@ "dev": true }, "object-is": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", - "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz", + "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==", "dev": true, "requires": { "define-properties": "^1.1.3", - "es-abstract": "^1.17.5" - }, - "dependencies": { - "es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", - "dev": true, - "requires": { - "es-to-primitive": "^1.2.1", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", - "object-keys": "^1.1.1", - "object.assign": "^4.1.0", - "string.prototype.trimend": "^1.0.1", - "string.prototype.trimstart": "^1.0.1" - } - } + "es-abstract": "^1.18.0-next.1" } }, "object-keys": { @@ -9400,9 +9379,9 @@ } }, "readdirp": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", - "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", "dev": true, "requires": { "picomatch": "^2.2.1" @@ -9511,20 +9490,20 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.0", + "object.assign": "^4.1.1", "string.prototype.trimend": "^1.0.1", "string.prototype.trimstart": "^1.0.1" } @@ -9824,9 +9803,9 @@ }, "dependencies": { "ajv": { - "version": "6.12.5", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", - "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -10625,20 +10604,20 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.0", + "object.assign": "^4.1.1", "string.prototype.trimend": "^1.0.1", "string.prototype.trimstart": "^1.0.1" } @@ -10656,20 +10635,20 @@ }, "dependencies": { "es-abstract": { - "version": "1.17.6", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz", - "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==", + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", "dev": true, "requires": { "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", "has-symbols": "^1.0.1", - "is-callable": "^1.2.0", - "is-regex": "^1.1.0", - "object-inspect": "^1.7.0", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", "object-keys": "^1.1.1", - "object.assign": "^4.1.0", + "object.assign": "^4.1.1", "string.prototype.trimend": "^1.0.1", "string.prototype.trimstart": "^1.0.1" } @@ -10924,9 +10903,9 @@ "dev": true }, "jest-worker": { - "version": "26.3.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.3.0.tgz", - "integrity": "sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==", + "version": "26.5.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz", + "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==", "dev": true, "requires": { "@types/node": "*", @@ -11291,9 +11270,9 @@ } }, "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "tslint": { "version": "5.10.0", diff --git a/webClient/package.json b/webClient/package.json index d13b4cf2..27fbc679 100644 --- a/webClient/package.json +++ b/webClient/package.json @@ -1,6 +1,6 @@ { "name": "org.zowe.editor.webclient", - "version": "2.2.0", + "version": "2.3.0", "license": "EPL-2.0", "scripts": { "start": "webpack --config ./webpack.build.config.js --watch --progress", @@ -36,7 +36,7 @@ "@angular/router": "~6.0.9", "@types/node": "^6.0.112", "@zlux/widgets": "git+https://github.com:zowe/zlux-widgets.git", - "@zowe/zlux-angular-file-tree": "0.2.0-RC3", + "@zowe/zlux-angular-file-tree": "0.4.0-RC1", "angular2-template-loader": "~0.6.2", "codelyzer": "~4.4.2", "compression-webpack-plugin": "~3.1.0", From e97de97a67a3c1e59ce36a03bcc925c6a54e6bcb Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Tue, 13 Oct 2020 17:03:55 -0400 Subject: [PATCH 4/9] Update module refs Signed-off-by: 1000TurquoisePogs --- webClient/src/app/editor/editor.module.ts | 2 +- webClient/src/app/editor/project-tree/project-tree.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webClient/src/app/editor/editor.module.ts b/webClient/src/app/editor/editor.module.ts index 43b59f9e..6f3142ad 100644 --- a/webClient/src/app/editor/editor.module.ts +++ b/webClient/src/app/editor/editor.module.ts @@ -19,7 +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 { FileTreeModule } from '@zowe/zlux-angular-file-tree'; +import { FileTreeModule } from '@zowe/zlux-angular-file-tree/src/plugin'; import { CodeEditorModule } from './code-editor/code-editor.module'; @NgModule({ diff --git a/webClient/src/app/editor/project-tree/project-tree.component.ts b/webClient/src/app/editor/project-tree/project-tree.component.ts index 66e31dba..e61278d2 100644 --- 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 { FileTreeComponent as ZluxFileTreeComponent } from '@zowe/zlux-angular-file-tree'; +import { FileTreeComponent as ZluxFileTreeComponent } from '@zowe/zlux-angular-file-tree/src/plugin'; function getDatasetName(dirName) { let lParenIndex = dirName.indexOf('('); From cd04ee34f1f9a17ca3fd5f6050cf088894e41ed7 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Fri, 16 Oct 2020 11:39:50 -0400 Subject: [PATCH 5/9] Git history clean-up Signed-off-by: Leanid Astrakou --- config/recognizers/RIGHT HERE.txt | 0 config/recognizers/com.rs.om - Copy.webportal | 16 ++++++++++++ config/recognizers/com.rs.om.webportal | 16 ++++++++++++ config/recognizers/org.zowe.editor | 17 +++++++++++++ .../project-tree/project-tree.component.ts | 25 +------------------ 5 files changed, 50 insertions(+), 24 deletions(-) create mode 100644 config/recognizers/RIGHT HERE.txt create mode 100644 config/recognizers/com.rs.om - Copy.webportal create mode 100644 config/recognizers/com.rs.om.webportal create mode 100644 config/recognizers/org.zowe.editor diff --git a/config/recognizers/RIGHT HERE.txt b/config/recognizers/RIGHT HERE.txt new file mode 100644 index 00000000..e69de29b diff --git a/config/recognizers/com.rs.om - Copy.webportal b/config/recognizers/com.rs.om - Copy.webportal new file mode 100644 index 00000000..446e2cb2 --- /dev/null +++ b/config/recognizers/com.rs.om - Copy.webportal @@ -0,0 +1,16 @@ +{ + "recognizers":[ + { + "id":"com.rs.om.webportal.example", + "capabilities": [ + "com.ibm.iuw.extension.menu" + ], + "clause": { + "op": "AND", + "args": [ + {"prop":["primaryApplicationName","KS3"]} + ] + } + } + ] +} \ No newline at end of file diff --git a/config/recognizers/com.rs.om.webportal b/config/recognizers/com.rs.om.webportal new file mode 100644 index 00000000..446e2cb2 --- /dev/null +++ b/config/recognizers/com.rs.om.webportal @@ -0,0 +1,16 @@ +{ + "recognizers":[ + { + "id":"com.rs.om.webportal.example", + "capabilities": [ + "com.ibm.iuw.extension.menu" + ], + "clause": { + "op": "AND", + "args": [ + {"prop":["primaryApplicationName","KS3"]} + ] + } + } + ] +} \ No newline at end of file diff --git a/config/recognizers/org.zowe.editor b/config/recognizers/org.zowe.editor new file mode 100644 index 00000000..10b0dd59 --- /dev/null +++ b/config/recognizers/org.zowe.editor @@ -0,0 +1,17 @@ +{ + "recognizers":[ + { + "id":"com.rs.iuw.mq.openapp.forward", + "capabilities": [ + "com.ibm.iuw.extension.menu" + ], + "clause": { + "op": "AND", + "args": [ + {"prop":["primaryApplicationName","KMQ"]}, + {"prop":["primaryTableName","QMMSG_SUM"]} + ] + } + } + ] +} \ No newline at end of file diff --git a/webClient/src/app/editor/project-tree/project-tree.component.ts b/webClient/src/app/editor/project-tree/project-tree.component.ts index 5572cf8e..dd0ac8de 100644 --- a/webClient/src/app/editor/project-tree/project-tree.component.ts +++ b/webClient/src/app/editor/project-tree/project-tree.component.ts @@ -15,7 +15,7 @@ import { OpenProjectComponent } from '../../shared/dialog/open-project/open-proj import { OpenFolderComponent } from '../../shared/dialog/open-folder/open-folder.component'; import { HttpService } from '../../shared/http/http.service'; import { ENDPOINTS } from '../../../environments/environment'; -import { ProjectStructure, DatasetAttributes } from '../../shared/model/editor-project'; +import { ProjectStructure } from '../../shared/model/editor-project'; import { EditorControlService } from '../../shared/editor-control/editor-control.service'; import { EditorService } from '../editor.service'; import { UtilsService } from '../../shared/utils.service'; @@ -23,8 +23,6 @@ import { DataAdapterService } from '../../shared/http/http.data.adapter.service' import { SnackBarService } from '../../shared/snack-bar.service'; import { Angular2InjectionTokens } from 'pluginlib/inject-resources'; import { FileTreeComponent as ZluxFileTreeComponent } from '@zowe/zlux-angular-file-tree/src/plugin'; -import { catchError, switchMap, map } from 'rxjs/operators'; -import { of, Observable } from 'rxjs'; function getDatasetName(dirName) { let lParenIndex = dirName.indexOf('('); @@ -206,16 +204,6 @@ export class ProjectTreeComponent { }); } else if($event.data.isDataset){ let data: ProjectStructure = ($event.data as ProjectStructure); - const isMigrated = data.datasetAttrs && data.datasetAttrs.volser === 'MIGRAT'; - if (isMigrated) { - const datasetName = data.path.trim(); - this.log.debug(`Dataset ${datasetName} is migrated`); - this.recallDataset(datasetName).subscribe( - datasetAttrs => this.log.info(`dataset ${datasetName} recalled, attrs ${JSON.stringify(datasetAttrs)}, update tree here`), - _err => this.log.warn(`unable to recall dataset ${datasetName}`) - ); - return; - } if($event.type == 'file'){ this.editorControl.openFile('', (data)).subscribe(x => { this.log.debug(`Dataset loaded through File Explorer.`); @@ -225,17 +213,6 @@ export class ProjectTreeComponent { } } - private recallDataset(datasetName: string): Observable { - const contentsURI = ZoweZLUX.uriBroker.datasetContentsUri(datasetName); - const metadataURI = ZoweZLUX.uriBroker.datasetMetadataUri(datasetName, undefined, undefined, true); - return this.httpService.get(contentsURI) - .pipe( - catchError(_err => of({})), - switchMap(() => this.httpService.get(metadataURI)), - map(data => data.datasets[0]), - ); - } - onPathChanged($event: any) { this.editorControl.activeDirectory = $event; } From 1c349257c92cbae46a8949838b35a9243d738131 Mon Sep 17 00:00:00 2001 From: 1000TurquoisePogs Date: Mon, 19 Oct 2020 10:26:45 -0400 Subject: [PATCH 6/9] Updated readme info Signed-off-by: 1000TurquoisePogs --- README.md | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 24bf7e62..229a60a8 100644 --- a/README.md +++ b/README.md @@ -11,24 +11,15 @@ 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 Dependencies +## Building -There is an Angular module in "webClient" folder. +This repo uses the zlux angular file tree component, which is hosted on Zowe's artifactory. +To install that as a prereq, you must first do: -Go to this folder and install dependencies +`npm config set @zowe:registry https://zowe.jfrog.io/zowe/api/npm/npm-release/` -``` -npm install -``` +Afterwards, read this wiki on building: https://github.com/zowe/zlux/wiki/Building-Plugins -## Build +## Installing -Run ```npm run build``` and you will find a folder named "web" in root directory. Then this application is able to run in a zLUX environment. - -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. +Read this wiki on installing: https://github.com/zowe/zlux/wiki/Installing-Plugins From 7826e9a8f12ee1dbb6cecac0bacd8cd675fc2fff Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Fri, 23 Oct 2020 08:59:37 -0400 Subject: [PATCH 7/9] Removed accidentally committed files Signed-off-by: Leanid Astrakou --- config/recognizers/RIGHT HERE.txt | 0 config/recognizers/com.rs.om - Copy.webportal | 16 ---------------- config/recognizers/com.rs.om.webportal | 16 ---------------- config/recognizers/org.zowe.editor | 17 ----------------- 4 files changed, 49 deletions(-) delete mode 100644 config/recognizers/RIGHT HERE.txt delete mode 100644 config/recognizers/com.rs.om - Copy.webportal delete mode 100644 config/recognizers/com.rs.om.webportal delete mode 100644 config/recognizers/org.zowe.editor diff --git a/config/recognizers/RIGHT HERE.txt b/config/recognizers/RIGHT HERE.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/config/recognizers/com.rs.om - Copy.webportal b/config/recognizers/com.rs.om - Copy.webportal deleted file mode 100644 index 446e2cb2..00000000 --- a/config/recognizers/com.rs.om - Copy.webportal +++ /dev/null @@ -1,16 +0,0 @@ -{ - "recognizers":[ - { - "id":"com.rs.om.webportal.example", - "capabilities": [ - "com.ibm.iuw.extension.menu" - ], - "clause": { - "op": "AND", - "args": [ - {"prop":["primaryApplicationName","KS3"]} - ] - } - } - ] -} \ No newline at end of file diff --git a/config/recognizers/com.rs.om.webportal b/config/recognizers/com.rs.om.webportal deleted file mode 100644 index 446e2cb2..00000000 --- a/config/recognizers/com.rs.om.webportal +++ /dev/null @@ -1,16 +0,0 @@ -{ - "recognizers":[ - { - "id":"com.rs.om.webportal.example", - "capabilities": [ - "com.ibm.iuw.extension.menu" - ], - "clause": { - "op": "AND", - "args": [ - {"prop":["primaryApplicationName","KS3"]} - ] - } - } - ] -} \ No newline at end of file diff --git a/config/recognizers/org.zowe.editor b/config/recognizers/org.zowe.editor deleted file mode 100644 index 10b0dd59..00000000 --- a/config/recognizers/org.zowe.editor +++ /dev/null @@ -1,17 +0,0 @@ -{ - "recognizers":[ - { - "id":"com.rs.iuw.mq.openapp.forward", - "capabilities": [ - "com.ibm.iuw.extension.menu" - ], - "clause": { - "op": "AND", - "args": [ - {"prop":["primaryApplicationName","KMQ"]}, - {"prop":["primaryTableName","QMMSG_SUM"]} - ] - } - } - ] -} \ No newline at end of file From 4c61a277a2b949aa7fa4bd9f6eb8c0ad42f874f6 Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Fri, 23 Oct 2020 09:31:24 -0400 Subject: [PATCH 8/9] Updated package & lock to include File Explorer changes Signed-off-by: Leanid Astrakou --- webClient/package-lock.json | 19 +++++-------------- webClient/package.json | 2 +- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/webClient/package-lock.json b/webClient/package-lock.json index 9b6382b4..d5186752 100644 --- a/webClient/package-lock.json +++ b/webClient/package-lock.json @@ -1,6 +1,6 @@ { "name": "org.zowe.editor.webclient", - "version": "2.2.0", + "version": "2.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2906,9 +2906,9 @@ } }, "@zowe/zlux-angular-file-tree": { - "version": "0.4.0-RC1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/@zowe/zlux-angular-file-tree/-/@zowe/zlux-angular-file-tree-0.4.0-RC1.tgz", - "integrity": "sha1-LOAhkXHRoEYiwrt0YIxXaJ5YEk0=", + "version": "0.5.0-RC1", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/@zowe/zlux-angular-file-tree/-/@zowe/zlux-angular-file-tree-0.5.0-RC1.tgz", + "integrity": "sha1-6h0Vpy+6x/uF8TDjR+kVY5/EV2M=", "dev": true, "requires": { "@angular/animations": "~6.0.9", @@ -4228,8 +4228,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "constants-browserify": { "version": "1.0.0", @@ -11779,7 +11778,6 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, - "optional": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -11798,7 +11796,6 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, - "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -11831,7 +11828,6 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, - "optional": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -11844,7 +11840,6 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, - "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -11896,7 +11891,6 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, - "optional": true, "requires": { "kind-of": "^3.0.2" }, @@ -11906,7 +11900,6 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, - "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -11918,7 +11911,6 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, - "optional": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -11952,7 +11944,6 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, - "optional": true, "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" diff --git a/webClient/package.json b/webClient/package.json index 27fbc679..96bbdc65 100644 --- a/webClient/package.json +++ b/webClient/package.json @@ -36,7 +36,7 @@ "@angular/router": "~6.0.9", "@types/node": "^6.0.112", "@zlux/widgets": "git+https://github.com:zowe/zlux-widgets.git", - "@zowe/zlux-angular-file-tree": "0.4.0-RC1", + "@zowe/zlux-angular-file-tree": "0.5.0-RC1", "angular2-template-loader": "~0.6.2", "codelyzer": "~4.4.2", "compression-webpack-plugin": "~3.1.0", From 2eb1699f17419f768e251387170a2aa1c8fde92f Mon Sep 17 00:00:00 2001 From: Leanid Astrakou Date: Fri, 6 Nov 2020 15:33:01 -0500 Subject: [PATCH 9/9] Update package-lock Signed-off-by: Leanid Astrakou --- webClient/package-lock.json | 6 +++--- webClient/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webClient/package-lock.json b/webClient/package-lock.json index d5186752..8f1eb8c5 100644 --- a/webClient/package-lock.json +++ b/webClient/package-lock.json @@ -2906,9 +2906,9 @@ } }, "@zowe/zlux-angular-file-tree": { - "version": "0.5.0-RC1", - "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/@zowe/zlux-angular-file-tree/-/@zowe/zlux-angular-file-tree-0.5.0-RC1.tgz", - "integrity": "sha1-6h0Vpy+6x/uF8TDjR+kVY5/EV2M=", + "version": "0.5.0-RC2", + "resolved": "https://zowe.jfrog.io/zowe/api/npm/npm-release/@zowe/zlux-angular-file-tree/-/@zowe/zlux-angular-file-tree-0.5.0-RC2.tgz", + "integrity": "sha1-3o5Qga1Z/aJgKjjHm/fr0ZEU4lI=", "dev": true, "requires": { "@angular/animations": "~6.0.9", diff --git a/webClient/package.json b/webClient/package.json index 96bbdc65..ac81d981 100644 --- a/webClient/package.json +++ b/webClient/package.json @@ -36,7 +36,7 @@ "@angular/router": "~6.0.9", "@types/node": "^6.0.112", "@zlux/widgets": "git+https://github.com:zowe/zlux-widgets.git", - "@zowe/zlux-angular-file-tree": "0.5.0-RC1", + "@zowe/zlux-angular-file-tree": "0.5.0-RC2", "angular2-template-loader": "~0.6.2", "codelyzer": "~4.4.2", "compression-webpack-plugin": "~3.1.0",