Merge pull request #3106 from zowe/pre-release/sept-week2

v3 pre-release Sept week 2
zowe · Sep 13, 2024 · 3838594 · 3838594
2 parents 8146202 + f5c675a
commit 3838594
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md
@@ -6,9 +6,11 @@ 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
 
-- Fixed errors being logged silently rather than thrown in `ProfilesCache.refresh` method. [#3066](https://github.com/zowe/zowe-explorer-vscode/issues/3066)
+- Fix extender's ability to fetch profile information from ProfilesCache for SSH profile types.
 
 ## `3.0.0-next.202409091409`
 
@@ -122,7 +124,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-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts b/packages/zowe-explorer-api/__tests__/__unit__/profiles/ProfilesCache.unit.test.ts
@@ -270,7 +270,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"]);
  });
 
  it("should refresh profile data for and merge tokens with base profile", async () => {
@@ -283,7 +283,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"]);
  });
 
  it("should handle error when refreshing profile data", async () => {
@@ -309,7 +309,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"]);
  });
  });
 

diff --git a/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts b/packages/zowe-explorer-api/src/profiles/ProfilesCache.ts
@@ -150,6 +150,7 @@ export class ProfilesCache {
  return;
  }
  const allTypes = this.getAllProfileTypes(apiRegister?.registeredApiTypes() ?? []);
+ allTypes.push("ssh");
  allTypes.push("base");
  for (const type of allTypes) {
  const tmpAllProfiles: imperative.IProfileLoaded[] = [];

diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md
@@ -6,9 +6,11 @@ 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
 
-- 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)
 - Fix issue with outdated SSH credentials stored securely in the SSH profile causing errors. [#2901](https://github.com/zowe/zowe-explorer-vscode/issues/2901)
 
 ## `3.0.0-next.202409091409`
@@ -65,8 +67,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