From d50895ef4082cc49f325302a24cd98344b2252ca Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Thu, 18 Apr 2024 14:15:37 -0400 Subject: [PATCH 1/4] chore: update lerna.json version to 2.15.3 Signed-off-by: Trae Yelovich --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index ac640fd6e1..fac0fd1f85 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.16.0-SNAPSHOT", + "version": "2.15.3", "command": { "version": { "forcePublish": true, From ae03bf9d9bbf55e3cd3c36e4dd67f213e5f44d26 Mon Sep 17 00:00:00 2001 From: Sergei Osadchuk Date: Tue, 9 Apr 2024 19:29:04 +0200 Subject: [PATCH 2/4] - added additional return type to Profiles.createZoweSchema() - fixed duplicated profile schema writing on repeated init call Signed-off-by: Sergei Osadchuk --- packages/zowe-explorer/src/Profiles.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/zowe-explorer/src/Profiles.ts b/packages/zowe-explorer/src/Profiles.ts index 94de23de41..b5acd669fe 100644 --- a/packages/zowe-explorer/src/Profiles.ts +++ b/packages/zowe-explorer/src/Profiles.ts @@ -626,7 +626,7 @@ export class Profiles extends ProfilesCache { return profileType; } - public async createZoweSchema(_zoweFileProvider: IZoweTree): Promise { + public async createZoweSchema(_zoweFileProvider: IZoweTree): Promise { ZoweLogger.trace("Profiles.createZoweSchema called."); try { let user = false; @@ -669,12 +669,19 @@ export class Profiles extends ProfilesCache { const impConfig: zowe.imperative.IImperativeConfig = zowe.getImperativeConfig(); const knownCliConfig: zowe.imperative.ICommandProfileTypeConfiguration[] = impConfig.profiles; + const knownProfileTypes = knownCliConfig.map((item) => item.type); + const extenderinfo = this.getConfigArray(); extenderinfo.forEach((item) => { - knownCliConfig.push(item); + if (!knownProfileTypes.includes(item.type)) { + knownCliConfig.push(item); + } }); - knownCliConfig.push(impConfig.baseProfile); + if (impConfig.baseProfile && !knownProfileTypes.includes(impConfig.baseProfile.type)) { + knownCliConfig.push(impConfig.baseProfile); + } + config.setSchema(zowe.imperative.ConfigSchema.buildSchema(knownCliConfig)); // Note: IConfigBuilderOpts not exported From 00f33568bef96a1308d462aa971441473be025d8 Mon Sep 17 00:00:00 2001 From: Sergei Osadchuk Date: Fri, 19 Apr 2024 18:33:52 +0200 Subject: [PATCH 3/4] updated the CHANGELOG Signed-off-by: Sergei Osadchuk Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/zowe-explorer/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md index 937d5290db..165a55babd 100644 --- a/packages/zowe-explorer/CHANGELOG.md +++ b/packages/zowe-explorer/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen - Fixed error that could occur when listing data set members that contain control characters in the name [#2807](https://github.com/zowe/zowe-explorer-vscode/pull/2807) - Fixed issue where saving changes to favorited data set or USS file could fail when it is opened outside of favorites. [#2820](https://github.com/zowe/vscode-extension-for-zowe/pull/2820) - Moved schema warnings into the log file (rather than a UI message) to minimize end-user disruption. [#2860](https://github.com/zowe/zowe-explorer-vscode/pull/2860) +- Duplicated profile schema writing on repeated Team Config file initialization. [#2828](https://github.com/zowe/zowe-explorer-vscode/pull/2828) ## `2.15.2` From 56c0d8e43545fa6fc5d7272431b238b9d9c476ef Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Fri, 19 Apr 2024 14:24:48 -0400 Subject: [PATCH 4/4] clean CHANGELOGs Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/eslint-plugin-zowe-explorer/CHANGELOG.md | 12 ------------ packages/zowe-explorer-api/CHANGELOG.md | 2 -- packages/zowe-explorer-ftp-extension/CHANGELOG.md | 12 ------------ packages/zowe-explorer/CHANGELOG.md | 8 +++----- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/packages/eslint-plugin-zowe-explorer/CHANGELOG.md b/packages/eslint-plugin-zowe-explorer/CHANGELOG.md index 978c6fe664..df11dc01f0 100644 --- a/packages/eslint-plugin-zowe-explorer/CHANGELOG.md +++ b/packages/eslint-plugin-zowe-explorer/CHANGELOG.md @@ -2,22 +2,10 @@ All notable changes to the "eslint-plugin-zowe-explorer" package will be documen ## TBD Release -### New features and enhancements - -### Bug fixes - ## `2.15.2` -### New features and enhancements - -### Bug fixes - ## `2.15.1` -### New features and enhancements - -### Bug fixes - ## `2.15.0` ## `2.14.1` diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md index 627c40a845..54fadba94c 100644 --- a/packages/zowe-explorer-api/CHANGELOG.md +++ b/packages/zowe-explorer-api/CHANGELOG.md @@ -4,8 +4,6 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t ## TBD Release -### New features and enhancements - ### Bug fixes - Fixed an issue where `ProfilesCache` may return missing or incorrect profile values when multiple extensions call it during activation. [#2831](https://github.com/zowe/zowe-explorer-vscode/issues/2831) diff --git a/packages/zowe-explorer-ftp-extension/CHANGELOG.md b/packages/zowe-explorer-ftp-extension/CHANGELOG.md index cbe38024b3..45e9760530 100644 --- a/packages/zowe-explorer-ftp-extension/CHANGELOG.md +++ b/packages/zowe-explorer-ftp-extension/CHANGELOG.md @@ -2,22 +2,10 @@ All notable changes to the "zowe-explorer-ftp-extension" extension will be docum ## TBD Release -### New features and enhancements - -### Bug fixes - ## `2.15.2` -### New features and enhancements - -### Bug fixes - ## `2.15.1` -### New features and enhancements - -### Bug fixes - ## `2.15.0` ## `2.14.1` diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md index 165a55babd..c25bcc50a4 100644 --- a/packages/zowe-explorer/CHANGELOG.md +++ b/packages/zowe-explorer/CHANGELOG.md @@ -4,14 +4,12 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen ## TBD Release -### New features and enhancements - ### Bug fixes -- Fixed error that could occur when listing data set members that contain control characters in the name [#2807](https://github.com/zowe/zowe-explorer-vscode/pull/2807) -- Fixed issue where saving changes to favorited data set or USS file could fail when it is opened outside of favorites. [#2820](https://github.com/zowe/vscode-extension-for-zowe/pull/2820) +- Fixed error that could occur when listing data set members that contain control characters in the name. [#2807](https://github.com/zowe/zowe-explorer-vscode/pull/2807) +- Fixed issue where saving changes to a favorited data set or USS file could fail when it is opened outside of favorites. [#2820](https://github.com/zowe/vscode-extension-for-zowe/pull/2820) - Moved schema warnings into the log file (rather than a UI message) to minimize end-user disruption. [#2860](https://github.com/zowe/zowe-explorer-vscode/pull/2860) -- Duplicated profile schema writing on repeated Team Config file initialization. [#2828](https://github.com/zowe/zowe-explorer-vscode/pull/2828) +- Fixed duplicated profile schema writing with repeated Team Config file initialization. [#2828](https://github.com/zowe/zowe-explorer-vscode/pull/2828) ## `2.15.2`