Fix 401 error when opening PDS members after cred change

packages/zowe-explorer-api/CHANGELOG.md

@@ -8,6 +8,8 @@ All notable changes to the "zowe-explorer-api" extension will be documented in t
 
 ### Bug fixes
 
+- Updated the `ZoweTreeNode.setProfileToChoice` function so that it propagates profile changes to its child nodes. [#3150](https://github.com/zowe/zowe-explorer-vscode/issues/3150)
+
 ## `3.0.0`
 
 ### New features and enhancements

packages/zowe-explorer-api/__tests__/__unit__/tree/ZoweTreeNode.unit.test.ts

@@ -94,6 +94,7 @@ describe("ZoweTreeNode", () => {
 
  it("setProfileToChoice should update profile for associated FSProvider entry", () => {
  const node = makeNode("test", vscode.TreeItemCollapsibleState.None, undefined);
+ node.resourceUri = vscode.Uri.file(__dirname);
  const fsEntry = {
  metadata: {
  profile: { name: "oldProfile" },
@@ -108,4 +109,23 @@ describe("ZoweTreeNode", () => {
  expect(node.getProfileName()).toBe("newProfile");
  expect(fsEntry.metadata.profile.name).toBe("newProfile");
  });
+
+ it("setProfileToChoice should update child nodes with the new profile", () => {
+ const node = makeNode("test", vscode.TreeItemCollapsibleState.Expanded, undefined);
+ const nodeChild = makeNode("child", vscode.TreeItemCollapsibleState.None, undefined);
+ node.children = [nodeChild as any];
+ const setProfileToChoiceChildMock = jest.spyOn(nodeChild, "setProfileToChoice").mockImplementation();
+ const fsEntry = {
+ metadata: {
+ profile: { name: "oldProfile" },
+ },
+ };
+ const mockNewProfile = { name: "newProfile" } as unknown as imperative.IProfileLoaded;
+ const mockProvider = {
+ lookup: jest.fn().mockReturnValue(fsEntry),
+ } as unknown as BaseProvider;
+ node.setProfileToChoice(mockNewProfile, mockProvider);
+ expect(node.getProfileName()).toBe("newProfile");
+ expect(setProfileToChoiceChildMock).toHaveBeenCalledWith(mockNewProfile, mockProvider);
+ });
 });

packages/zowe-explorer-api/src/fs/types/abstract.ts

@@ -68,7 +68,6 @@ export type ConflictData = {
 export interface IFileSystemEntry extends vscode.FileStat {
  name: string;
  metadata: EntryMetadata;
- type: vscode.FileType;
  wasAccessed: boolean;
  data?: Uint8Array;
 }

packages/zowe-explorer-api/src/tree/IZoweTreeNode.ts

@@ -181,6 +181,11 @@ export interface IZoweDatasetTreeNode extends IZoweTreeNode {
  */
  encoding?: string;
 
+ /**
+ * Use Dataset-specific tree node for children.
+ */
+ children?: IZoweDatasetTreeNode[];
+
  /**
  * Retrieves child nodes of this IZoweDatasetTreeNode
  *
@@ -296,6 +301,11 @@ export interface IZoweUSSTreeNode extends IZoweTreeNode {
  */
  onUpdateEmitter?: vscode.EventEmitter<IZoweUSSTreeNode>;
 
+ /**
+ * Use USS-specific tree node for children.
+ */
+ children?: IZoweUSSTreeNode[];
+
  /**
  * Event that fires whenever an existing node is updated.
  */

packages/zowe-explorer-api/src/tree/ZoweTreeNode.ts

@@ -107,9 +107,14 @@ export class ZoweTreeNode extends vscode.TreeItem {
  // Don't reassign profile, we want to keep object reference shared across nodes
  this.profile.profile = aProfile.profile;
  }
- const fsEntry = fsProvider?.lookup(this.resourceUri, true);
- if (fsEntry != null) {
- fsEntry.metadata.profile = aProfile;
+ if (this.resourceUri != null) {
+ const fsEntry = fsProvider?.lookup(this.resourceUri, true);
+ if (fsEntry != null) {
+ fsEntry.metadata.profile = aProfile;
+ }
+ }
+ for (const child of this.children) {
+ (child as unknown as ZoweTreeNode).setProfileToChoice(aProfile, fsProvider);
  }
  }
  /**

packages/zowe-explorer/CHANGELOG.md

@@ -11,6 +11,7 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 - Fixed an issue where opening sequential data sets within favorited searches resulted in an error. [#3163](https://github.com/zowe/zowe-explorer-vscode/pull/3163)
 - Fixed an issue where Zowe Explorer displayed a "No Zowe client configurations" prompt when a project user configuration existed but no global configuration was present. [#3168](https://github.com/zowe/zowe-explorer-vscode/issues/3168)
 - Fixed an issue where the `ProfilesUtils.getProfileInfo` function returned a new `ProfileInfo` instance that ignored the `ZOWE_CLI_HOME` environment variable and workspace paths. [#3168](https://github.com/zowe/zowe-explorer-vscode/issues/3168)
+- Fixed an issue where a 401 error could occur when opening PDS members after updating credentials within the same user session. [#3150](https://github.com/zowe/zowe-explorer-vscode/issues/3150)
 
 ## `3.0.0`
 

packages/zowe-explorer/__tests__/__mocks__/@zowe/imperative.ts

@@ -17,6 +17,10 @@ import * as os from "os";
 import * as path from "path";
 const log4js = require("log4js");
 
+export class EventProcessor {
+ public emitZoweEvent(eventName: string): void {}
+}
+
 export enum ProfLocType {
  OLD_PROFILE = 0, // an old-school profile
  TEAM_CONFIG = 1, // a team configuration

packages/zowe-explorer/__tests__/__mocks__/mockCreators/jobs.ts

@@ -160,8 +160,8 @@ export function createJobInfoNode(session: any, profile: imperative.IProfileLoad
  collapsibleState: vscode.TreeItemCollapsibleState.None,
  parentNode: session.getSessionNode(),
  profile,
+ contextOverride: Constants.INFORMATION_CONTEXT,
  });
- jobNode.contextValue = Constants.INFORMATION_CONTEXT;
  return jobNode;
 }
 

packages/zowe-explorer/__tests__/__unit__/trees/ZoweTreeProvider.unit.test.ts

@@ -276,7 +276,7 @@ describe("Tree Provider unit tests, function getTreeItem", () => {
  });
 });
 
-describe("Tree Provider unit tests, function getTreeItem", () => {
+describe("Tree Provider unit tests, function flipState", () => {
  it("Testing that expand tree is executed successfully", async () => {
  const globalMocks = await createGlobalMocks();
  const spy = jest.spyOn(ZoweLogger, "trace");
@@ -287,14 +287,17 @@ describe("Tree Provider unit tests, function getTreeItem", () => {
  session: globalMocks.testSession,
  });
  folder.contextValue = Constants.USS_DIR_CONTEXT;
+ folder.dirty = false;
 
  // Testing flipState to open
  await globalMocks.testUSSTree.flipState(folder, true);
  expect(JSON.stringify(folder.iconPath)).toContain("folder-open.svg");
+ expect(folder.dirty).toBe(false);
 
  // Testing flipState to closed
  await globalMocks.testUSSTree.flipState(folder, false);
  expect(JSON.stringify(folder.iconPath)).toContain("folder-closed.svg");
+ expect(folder.dirty).toBe(true);
  expect(spy).toHaveBeenCalled();
  spy.mockClear();
  });

packages/zowe-explorer/__tests__/__unit__/trees/dataset/DatasetActions.unit.test.ts

@@ -871,57 +871,6 @@ describe("Dataset Actions Unit Tests - Function deleteDataset", () => {
  });
 });
 
-describe("Dataset Actions Unit Tests - Function enterPattern", () => {
- afterAll(() => jest.restoreAllMocks());
-
- it("Checking common dataset filter action", async () => {
- createGlobalMocks();
- const blockMocks = createBlockMocksShared();
- const node = new ZoweDatasetNode({
- label: "node",
- collapsibleState: vscode.TreeItemCollapsibleState.None,
- parentNode: blockMocks.datasetSessionNode,
- });
- node.pattern = "TEST";
- node.contextValue = Constants.DS_SESSION_CONTEXT;
-
- const mySpy = mocked(vscode.window.showInputBox).mockResolvedValue("test");
- await DatasetActions.enterPattern(node, blockMocks.testDatasetTree);
-
- expect(mySpy).toHaveBeenCalledWith(
- expect.objectContaining({
- prompt: "Search Data Sets: use a comma to separate multiple patterns",
- value: node.pattern,
- })
- );
- expect(mocked(Gui.showMessage)).not.toHaveBeenCalled();
- });
- it("Checking common dataset filter failed attempt", async () => {
- createGlobalMocks();
- const blockMocks = createBlockMocksShared();
- const node = new ZoweDatasetNode({
- label: "node",
- collapsibleState: vscode.TreeItemCollapsibleState.None,
- parentNode: blockMocks.datasetSessionNode,
- });
- node.pattern = "TEST";
- node.contextValue = Constants.DS_SESSION_CONTEXT;
-
- mocked(vscode.window.showInputBox).mockResolvedValueOnce("");
- await DatasetActions.enterPattern(node, blockMocks.testDatasetTree);
-
- expect(mocked(Gui.showMessage)).toHaveBeenCalledWith("You must enter a pattern.");
- });
- it("Checking favorite dataset filter action", async () => {
- createGlobalMocks();
- const blockMocks = createBlockMocksShared();
- const favoriteSample = new ZoweDatasetNode({ label: "[sestest]: HLQ.TEST", collapsibleState: vscode.TreeItemCollapsibleState.None });
-
- await DatasetActions.enterPattern(favoriteSample, blockMocks.testDatasetTree);
- expect(blockMocks.testDatasetTree.addSession).toHaveBeenCalledWith({ sessionName: "sestest" });
- });
-});
-
 describe("Dataset Actions Unit Tests - Function showAttributes", () => {
  function createBlockMocks() {
  const session = createISession();

packages/zowe-explorer/__tests__/__unit__/trees/dataset/DatasetTree.unit.test.ts

@@ -549,30 +549,6 @@ describe("Dataset Tree Unit Tests - Function getChildren", () => {
 
  expect(loadProfilesForFavoritesSpy).toHaveBeenCalledWith(log, favProfileNode);
  });
-
- it("returns 'No data sets found' if there are no children", async () => {
- createGlobalMocks();
- const blockMocks = createBlockMocks();
-
- mocked(Profiles.getInstance).mockReturnValue(blockMocks.profile);
- mocked(vscode.window.createTreeView).mockReturnValueOnce(blockMocks.treeView);
- const testTree = new DatasetTree();
- testTree.mSessionNodes.push(blockMocks.datasetSessionNode);
- const parent = new ZoweDatasetNode({
- label: "BRTVS99.PUBLIC",
- collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
- parentNode: testTree.mSessionNodes[1],
- });
- parent.dirty = true;
- jest.spyOn(parent, "getChildren").mockResolvedValueOnce([]);
-
- const children = await testTree.getChildren(parent);
-
- // This function should never return undefined.
- expect(children).toBeDefined();
- expect(children).toHaveLength(1);
- expect(children[0].label).toBe("No data sets found");
- });
 });
 describe("Dataset Tree Unit Tests - Function loadProfilesForFavorites", () => {
  function createBlockMocks() {
@@ -3338,7 +3314,6 @@ describe("Dataset Tree Unit Tests - Function applyPatternsToChildren", () => {
  const withProfileMock = jest.spyOn(SharedContext, "withProfile").mockImplementation((child) => String(child.contextValue));
  testTree.applyPatternsToChildren(fakeChildren as any[], [{ dsn: "HLQ.PROD.PDS", member: "A*" }], fakeSessionNode as any);
  expect(SharedContext.isFilterFolder(fakeChildren[0])).toBe(true);
- expect(fakeSessionNode.dirty).toBe(true);
  withProfileMock.mockRestore();
  });
  it("applies a closed filter folder icon to the PDS if collapsed", () => {