Unable to open a Sequential DS after renaming a favourited Sequential DS

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

@@ -291,7 +291,7 @@ export interface IZoweTree<T> extends vscode.TreeDataProvider<T>, Partial<vscode
      *
      * @param {IZoweTreeNode} node
      */
-    renameFavorite(node: IZoweTreeNode, newLabel: string): void | Promise<void>;
+    renameFavorite(node: IZoweTreeNode, newLabel: string, newUri: vscode.Uri): void | Promise<void>;
 
     /**
      * Renames a node based on the profile and it's label
@@ -331,9 +331,9 @@ export interface IZoweTree<T> extends vscode.TreeDataProvider<T>, Partial<vscode
     /**
      * @param {string} profileLabel
      * @param {string} beforeLabel
-     * @param {string} afterLabel
+     * @param {vscode.Uri} newUri
      */
-    renameNode(profile: string, beforeDataSetName: string, afterDataSetName: string): void | Promise<void>;
+    renameNode(profile: string, beforeDataSetName: string, afterDataSetName: string, newUri: vscode.Uri): void | Promise<void>;
 
     /**
      * Opens an item & reveals it in the tree

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

@@ -2195,7 +2195,6 @@ describe("Dataset Tree Unit Tests - Function renameNode", () => {
             parentNode: datasetSessionNode,
         });
         const testTree = new DatasetTree();
-
         datasetSessionNode.children.push(node);
         testTree.mSessionNodes.push(datasetSessionNode);
         jest.spyOn(datasetSessionNode, "getChildren").mockReturnValue(Promise.resolve([datasetSessionNode]));
@@ -2208,6 +2207,10 @@ describe("Dataset Tree Unit Tests - Function renameNode", () => {
         };
     }
 
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
     it("Checking opening of PS Dataset", async () => {
         createGlobalMocks();
         const blockMocks = createBlockMocks();
@@ -2216,6 +2219,35 @@ describe("Dataset Tree Unit Tests - Function renameNode", () => {
 
         expect(blockMocks.node.label).toEqual("newLabel");
     });
+
+    it("Checking opening of seq ds when rename operation is performed from Favorited seq ds", async () => {
+        createGlobalMocks();
+        const blockMocks = createBlockMocks();
+        jest.spyOn(SharedContext, "isPds").mockReturnValue(false);
+        blockMocks.testTree.mSessionNodes[1].children[0].contextValue = Constants.DS_DS_CONTEXT;
+        await blockMocks.testTree.renameNode(blockMocks.imperativeProfile.name, blockMocks.node.label.toString(), "newLabel");
+        expect(blockMocks.testTree.mSessionNodes[1].children[0].command.command).toBe("vscode.open");
+    });
+
+    it("Checking opening of PDS when rename operation is performed from Favorited PDS", async () => {
+        createGlobalMocks();
+        const blockMocks = createBlockMocks();
+        jest.spyOn(SharedContext, "isPds").mockReturnValue(true);
+        const node = new ZoweDatasetNode({
+            label: "HLQ.TEST.RENAME.NODE",
+            collapsibleState: vscode.TreeItemCollapsibleState.None,
+            parentNode: blockMocks.testTree.mSessionNodes[1],
+            session: blockMocks.session,
+            profile: blockMocks.testTree.mSessionNodes[1].getProfile(),
+        });
+        node.resourceUri = vscode.Uri.from({
+            scheme: ZoweScheme.DS,
+            path: "/sestest/RENAME.PDS",
+        });
+        blockMocks.testTree.mSessionNodes[1].children[0].children = [node];
+        await blockMocks.testTree.renameNode(blockMocks.imperativeProfile.name, blockMocks.node.label.toString(), "newLabel", node.resourceUri);
+        expect(blockMocks.testTree.mSessionNodes[1].children[0].children[0].command.command).toBe("vscode.open");
+    });
 });
 
 describe("Dataset Tree Unit Tests - Function createFilterString", () => {
@@ -2341,7 +2373,15 @@ describe("Dataset Tree Unit Tests - Function rename", () => {
             session: blockMocks.session,
             profile: testTree.mSessionNodes[1].getProfile(),
         });
-
+        const fav_node = new ZoweDatasetNode({
+            label: "HLQ.TEST.RENAME.NODE",
+            collapsibleState: vscode.TreeItemCollapsibleState.None,
+            parentNode: testTree.mSessionNodes[1],
+            session: blockMocks.session,
+            profile: testTree.mSessionNodes[1].getProfile(),
+            contextValue: Constants.DS_FAV_CONTEXT,
+        });
+        jest.spyOn(testTree, "findFavoritedNode").mockReturnValue(fav_node);
         await testTree.rename(node);
         expect(blockMocks.rename).toHaveBeenLastCalledWith(
             { path: "/sestest/HLQ.TEST.RENAME.NODE", scheme: ZoweScheme.DS },
@@ -2552,6 +2592,15 @@ describe("Dataset Tree Unit Tests - Function rename", () => {
         mocked(Gui.showInputBox).mockImplementation((options) => {
             return Promise.resolve("HLQ.TEST.NEWNAME.NODE");
         });
+        const fav_node = new ZoweDatasetNode({
+            label: "HLQ.TEST.RENAME.NODE",
+            collapsibleState: vscode.TreeItemCollapsibleState.None,
+            parentNode: testTree.mSessionNodes[1],
+            session: blockMocks.session,
+            profile: testTree.mSessionNodes[1].getProfile(),
+            contextValue: Constants.DS_FAV_CONTEXT,
+        });
+        jest.spyOn(testTree, "findFavoritedNode").mockReturnValue(fav_node);
         await testTree.rename(parent);
         expect(renameDataSetSpy).toHaveBeenLastCalledWith(parent);
         expect(parent.resourceUri?.path).toBe("/sestest/HLQ.TEST.NEWNAME.NODE");
@@ -2753,6 +2802,38 @@ describe("Dataset Tree Unit Tests - Function rename", () => {
         await testValidDsName("HLQ.TEST.RENAME.NODE.NEW.TEST");
         await testValidDsName("INVALID-DATASET-NAME");
     });
+
+    it("To check if rename of favorited seq ds is performed correctly when the rename operation is performed on the seq ds from the ds tree view ", async () => {
+        createGlobalMocks();
+        const blockMocks = createBlockMocks();
+        mocked(Profiles.getInstance).mockReturnValue(blockMocks.profileInstance);
+        mocked(Gui.showInputBox).mockResolvedValueOnce("HLQ.TEST.RENAME.NODE.NEW");
+        mocked(vscode.window.createTreeView).mockReturnValueOnce(blockMocks.treeView);
+        const testTree = new DatasetTree();
+        testTree.mSessionNodes.push(blockMocks.datasetSessionNode);
+        const node = new ZoweDatasetNode({
+            label: "HLQ.TEST.RENAME.NODE",
+            collapsibleState: vscode.TreeItemCollapsibleState.None,
+            parentNode: testTree.mSessionNodes[1],
+            session: blockMocks.session,
+            profile: testTree.mSessionNodes[1].getProfile(),
+        });
+        const fav_node = new ZoweDatasetNode({
+            label: "HLQ.TEST.RENAME.NODE",
+            collapsibleState: vscode.TreeItemCollapsibleState.None,
+            parentNode: testTree.mSessionNodes[1],
+            session: blockMocks.session,
+            profile: testTree.mSessionNodes[1].getProfile(),
+        });
+        fav_node.contextValue = Constants.DS_FAV_CONTEXT;
+        jest.spyOn(testTree, "findFavoritedNode").mockReturnValue(fav_node);
+        await testTree.rename(node);
+        expect(blockMocks.rename).toHaveBeenLastCalledWith(
+            { path: "/sestest/HLQ.TEST.RENAME.NODE", scheme: ZoweScheme.DS },
+            { path: "/sestest/HLQ.TEST.RENAME.NODE.NEW", scheme: ZoweScheme.DS },
+            { overwrite: false }
+        );
+    });
 });
 
 describe("Dataset Tree Unit Tests - Function checkFilterPattern", () => {

packages/zowe-explorer/src/configuration/Definitions.ts

@@ -67,6 +67,7 @@ export namespace Definitions {
         session?: imperative.Session;
         profile?: imperative.IProfileLoaded;
         contextOverride?: string;
+        contextValue?: string;
     }
     export interface IZoweDatasetTreeOpts extends IZoweTreeOpts {
         encoding?: ZosEncoding;

packages/zowe-explorer/src/trees/ZoweTreeProvider.ts

@@ -176,11 +176,11 @@ export class ZoweTreeProvider<T extends IZoweTreeNode> {
         ZoweLogger.trace("ZoweTreeProvider.findFavoritedNode called.");
         return undefined;
     }
-    public renameFavorite(_node: IZoweTreeNode, _newLabel: string): any {
+    public renameFavorite(_node: IZoweTreeNode, _newLabel: string, _newUri: vscode.Uri): any {
         ZoweLogger.trace("ZoweTreeProvider.renameFavorite called.");
         return undefined;
     }
-    public renameNode(_profile: string, _beforeDataSetName: string, _afterDataSetName: string): any {
+    public renameNode(_profile: string, _beforeDataSetName: string, _afterDataSetName: string, _newUri: vscode.Uri): any {
         ZoweLogger.trace("ZoweTreeProvider.renameNode called.");
         return undefined;
     }

packages/zowe-explorer/src/trees/dataset/DatasetTree.ts

@@ -721,17 +721,38 @@
      * @param profileLabel
      * @param beforeLabel
      * @param afterLabel
+     * @param newUri
      */
 
-    public renameNode(profileLabel: string, beforeLabel: string, afterLabel: string): void {
+    public renameNode(profileLabel: string, beforeLabel: string, afterLabel: string, newUri: vscode.Uri): void {
         ZoweLogger.trace("DatasetTree.renameNode called.");
         const sessionNode = this.mSessionNodes.find((session) => session.label.toString() === profileLabel.trim());
         if (sessionNode) {
             const matchingNode = sessionNode.children.find((node) => node.label === beforeLabel);
             if (matchingNode) {
                 matchingNode.label = afterLabel;
                 matchingNode.tooltip = afterLabel;
+                matchingNode.resourceUri = newUri;
                 this.refreshElement(matchingNode);
+                if (SharedContext.isPds(matchingNode)) {
+                    for (const child of matchingNode.children) {
+                        child.resourceUri = child.resourceUri.with({
+                            path: path.posix.join(newUri.path, child.resourceUri.path.substring(child.resourceUri.path.lastIndexOf("/") + 1)),
+                        });
+                        child.command = {
+                            title: "",
+                            command: "vscode.open",
+                            arguments: [child.resourceUri],
+                        };
+                    }
+                } else if (matchingNode.contextValue.includes(Constants.DS_DS_CONTEXT)) {
+                    matchingNode.command = {
+                        title: "",
+                        command: "vscode.open",
+                        arguments: [matchingNode.resourceUri],
+                    };
+                }
+                this.refreshElement(matchingNode.getParent() as IZoweDatasetTreeNode);
             }
         }
     }
@@ -740,14 +761,25 @@
      * Renames a node from the favorites list
      *
      * @param node
+     * @param newLabel
+     * @param newUri
      */
-    public renameFavorite(node: IZoweDatasetTreeNode, newLabel: string): void {
+    public renameFavorite(node: IZoweDatasetTreeNode, newLabel: string, newUri: vscode.Uri): void {
         ZoweLogger.trace("DatasetTree.renameFavorite called.");
         const matchingNode = this.findFavoritedNode(node);
         if (matchingNode) {
             matchingNode.label = newLabel;
             matchingNode.tooltip = newLabel;
+            matchingNode.resourceUri = newUri;
             this.refreshElement(matchingNode as IZoweDatasetTreeNode);
+            if (matchingNode.contextValue.includes(Constants.DS_DS_CONTEXT)) {
+                matchingNode.command = {
+                    title: "",
+                    command: "vscode.open",
+                    arguments: [matchingNode.resourceUri],
+                };
+            }
+            this.refreshElement(matchingNode.getParent() as IZoweDatasetTreeNode);
         }
     }
 
@@ -1399,9 +1431,9 @@
             // Rename corresponding node in Sessions or Favorites section (whichever one Rename wasn't called from)
             if (SharedContext.isFavorite(node)) {
                 const profileName = node.getProfileName();
-                this.renameNode(profileName, beforeDataSetName, afterDataSetName);
+                this.renameNode(profileName, beforeDataSetName, afterDataSetName, newUri);
             } else {
-                this.renameFavorite(node, afterDataSetName);
+                this.renameFavorite(node, afterDataSetName, newUri);
             }
             // Rename the node that was clicked on
             node.resourceUri = newUri;
@@ -1419,7 +1451,7 @@
                         arguments: [child.resourceUri],
                     };
                 }
-            } else if (node.contextValue === Constants.DS_DS_CONTEXT || node.contextValue === Constants.DS_FAV_CONTEXT) {
+            } else if (node.contextValue.includes(Constants.DS_DS_CONTEXT)) {
                 node.command = {
                     title: "",
                     command: "vscode.open",