From 305dce068338810a838a016d02b97272c25fe543 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:26:05 -0400 Subject: [PATCH 1/5] move CHANGELOG entries to correct location Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/zowe-explorer-api/CHANGELOG.md | 3 ++- packages/zowe-explorer/CHANGELOG.md | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md index db656dc0aa..3d1f1f8429 100644 --- a/packages/zowe-explorer-api/CHANGELOG.md +++ b/packages/zowe-explorer-api/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t ### New features and enhancements +- Added optional `patternMatches` property to the `IZoweDatasetTreeNode` interface to cache pattern matches from an applied filter search. [#1164](https://github.com/zowe/zowe-explorer-vscode/issues/1164) + ### Bug fixes ## `3.0.0-next.202409091409` @@ -120,7 +122,6 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t - **Breaking:** Removed the `MemberEntry` filesystem class, in favor of using the `DsEntry` class with `isMember` set to `true`. - Changed `TableViewProvider.setTableView` function to be asynchronous for more optimized data updates. - Updated `Table.Conditional` and `Table.Callback` types to support multi-row callbacks. -- Added optional `patternMatches` property to the `IZoweDatasetTreeNode` interface to cache pattern matches from an applied filter search. [#1164](https://github.com/zowe/zowe-explorer-vscode/issues/1164) ### Bug fixes diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md index b556fd0c43..b940d53f28 100644 --- a/packages/zowe-explorer/CHANGELOG.md +++ b/packages/zowe-explorer/CHANGELOG.md @@ -6,6 +6,9 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen ### New features and enhancements +- Implemented support for favoriting a data set search that contains member wildcards. [#1164](https://github.com/zowe/zowe-explorer-vscode/issues/1164) +- Resolved `TypeError: Cannot read properties of undefined (reading 'direction')` error for favorited items. [#3067](https://github.com/zowe/zowe-explorer-vscode/pull/3067) + ### Bug fixes ## `3.0.0-next.202409091409` @@ -62,8 +65,6 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen - Implemented change detection in the Data Sets and USS filesystems, so that changes on the mainframe will be reflected in opened editors for Data Sets and USS files. [#3040](https://github.com/zowe/zowe-explorer-vscode/pull/3040) - Implemented a "Show as Table" option for profile nodes in the Jobs tree, displaying lists of jobs in a tabular view. Jobs can be filtered and sorted within this view, and users can select jobs to cancel, delete or download. [#2258](https://github.com/zowe/zowe-explorer-vscode/issues/2258) - Replaced `lodash` dependency with `es-toolkit` to reduce webview bundle size and add technical currency. [#3060](https://github.com/zowe/zowe-explorer-vscode/pull/3060) -- Implemented support for favoriting a data set search that contains member wildcards. [#1164](https://github.com/zowe/zowe-explorer-vscode/issues/1164) -- Resolved `TypeError: Cannot read properties of undefined (reading 'direction')` error for favorited items. [#3067](https://github.com/zowe/zowe-explorer-vscode/pull/3067) ### Bug fixes From 0185dc0491764872aec5ec6a0bf06a9e31a249e5 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:57:06 -0400 Subject: [PATCH 2/5] add SSH to array of profiles loaded Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/zowe-explorer-api/src/profiles/ProfilesCache.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts index 7bbd38f318..df025e7062 100644 --- a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts +++ b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts @@ -152,6 +152,7 @@ export class ProfilesCache { } const allTypes = this.getAllProfileTypes(apiRegister?.registeredApiTypes() ?? []); allTypes.push("base"); + allTypes.push("ssh"); for (const type of allTypes) { const tmpAllProfiles: imperative.IProfileLoaded[] = []; // Step 1: Get all profiles for each registered type From 89996fee1d83976c8e47be7d7a7a4e946c86a2eb Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:12:55 -0400 Subject: [PATCH 3/5] fix unit tests Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- .../__tests__/__unit__/profiles/ProfilesCache.unit.test.ts | 6 +++--- packages/zowe-explorer-api/src/profiles/ProfilesCache.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts b/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts index 5c31c1c8b3..9669d54699 100644 --- a/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts +++ b/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts @@ -271,7 +271,7 @@ describe("ProfilesCache", () => { expect(profCache.allProfiles.length).toEqual(2); expect(profCache.allProfiles[0]).toMatchObject(lpar1Profile); expect(profCache.allProfiles[1]).toMatchObject(zftpProfile); - expect(profCache.getAllTypes()).toEqual([...profileTypes, "base"]); + expect(profCache.getAllTypes()).toEqual([...profileTypes, "ssh", "base"]); expect(mockLogError).not.toHaveBeenCalled(); }); @@ -285,7 +285,7 @@ describe("ProfilesCache", () => { expect(profCache.allProfiles[0]).toMatchObject(lpar1ProfileWithToken); expect(profCache.allProfiles[1]).toMatchObject(lpar2Profile); // without token expect(profCache.allProfiles[2]).toMatchObject(baseProfileWithToken); - expect(profCache.getAllTypes()).toEqual([...profileTypes, "base"]); + expect(profCache.getAllTypes()).toEqual([...profileTypes, "ssh", "base"]); expect(mockLogError).not.toHaveBeenCalled(); }); @@ -313,7 +313,7 @@ describe("ProfilesCache", () => { expect((profCache as any).profilesByType.size).toBe(0); expect((profCache as any).defaultProfileByType.size).toBe(0); expect((profCache as any).allProfiles.length).toBe(0); - expect((profCache as any).allTypes).toEqual(["base"]); + expect((profCache as any).allTypes).toEqual(["ssh", "base"]); expect(mockLogError).not.toHaveBeenCalled(); }); }); diff --git a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts index df025e7062..1989775f95 100644 --- a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts +++ b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts @@ -151,8 +151,8 @@ export class ProfilesCache { return; } const allTypes = this.getAllProfileTypes(apiRegister?.registeredApiTypes() ?? []); - allTypes.push("base"); allTypes.push("ssh"); + allTypes.push("base"); for (const type of allTypes) { const tmpAllProfiles: imperative.IProfileLoaded[] = []; // Step 1: Get all profiles for each registered type From 2ba157b6d8583f5de8b626b0ff5b2a8513dda952 Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Tue, 10 Sep 2024 13:22:21 -0400 Subject: [PATCH 4/5] add CHANGELOG item for SSH fix Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/zowe-explorer-api/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md index 3d1f1f8429..48684fd822 100644 --- a/packages/zowe-explorer-api/CHANGELOG.md +++ b/packages/zowe-explorer-api/CHANGELOG.md @@ -10,6 +10,8 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t ### Bug fixes +- Fix extender's ability to fetch profile information from ProfilesCache for SSH profile types. + ## `3.0.0-next.202409091409` ### Bug fixes From 776ffbca1609bdd7c7ba15eab84c3a791a3cba9e Mon Sep 17 00:00:00 2001 From: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:55:36 -0400 Subject: [PATCH 5/5] remove changelog entry for 2.18.0 item Signed-off-by: Billie Simmons <49491949+JillieBeanSim@users.noreply.github.com> --- packages/zowe-explorer/CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md index 88d04ae6a5..b940d53f28 100644 --- a/packages/zowe-explorer/CHANGELOG.md +++ b/packages/zowe-explorer/CHANGELOG.md @@ -11,8 +11,6 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen ### Bug fixes -- Fixed JSON errors being ignored when `zowe.config.json` files change on disk and are reloaded. [#3066](https://github.com/zowe/zowe-explorer-vscode/issues/3066) [#3074](https://github.com/zowe/zowe-explorer-vscode/issues/3074) - ## `3.0.0-next.202409091409` ### Bug fixes