Merge pull request #2863 from zowe/release/2.15.3

v2.15.3 Release
zowe · Apr 23, 2024 · 0171df0 · 0171df0
2 parents e82af6b + 9e50906
commit 0171df0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 34 deletions.
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.16.0-SNAPSHOT",
+  "version": "2.15.3",
   "command": {
     "version": {
       "forcePublish": true,

diff --git 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
@@ -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
@@ -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
@@ -4,13 +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)
+- Fixed duplicated profile schema writing with repeated Team Config file initialization. [#2828](https://github.com/zowe/zowe-explorer-vscode/pull/2828)
 
 ## `2.15.2`
 

diff --git 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<IZoweTreeNode>): Promise<string> {
+    public async createZoweSchema(_zoweFileProvider: IZoweTree<IZoweTreeNode>): Promise<string | undefined> {
         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