Issue #734: Context menu & menu bar edits

packages/zowe-explorer/README.md

@@ -164,8 +164,8 @@ Review the following use cases to understand how to work with data sets in Zowe
 1. Navigate to the explorer tree.
 2. Open the **DATA SETS** bar.
 3. Select a member you want to copy.
-4. Right-click the member and select the **Copy Data Set** option.
-5. Right-click the data set where the member belongs and select the **Paste Data Set** option.
+4. Right-click the member and select the **Copy Member** option.
+5. Right-click the data set where the member belongs and select the **Paste Member** option.
 6. Enter the name of the copied member.
 
 ![Copy Data Set](../../docs/images/ZE-copy.gif?raw=true "Copy Data Set")

packages/zowe-explorer/__mocks__/mockCreators/uss.ts

@@ -69,8 +69,10 @@ export function createUSSNode(session, profile) {
         false,
         profile.name
     );
-    ussNode.contextValue = globals.USS_SESSION_CONTEXT;
-    ussNode.fullPath = "/u/myuser";
+    mParent.contextValue = globals.USS_SESSION_CONTEXT;
+    ussNode.contextValue = globals.USS_DIR_CONTEXT;
+    mParent.fullPath = "/u/myuser";
+    ussNode.fullPath = "/u/myuser/usstest";
     return ussNode;
 }
 

packages/zowe-explorer/__tests__/__integration__/extension.integration.test.ts

@@ -545,7 +545,7 @@ describe("Extension Integration Tests", () => {
                         );
 
                         await dsActions.copyDataSet(fromNode);
-                        await dsActions.pasteDataSet(toNode, testTree);
+                        await dsActions.pasteMember(toNode, testTree);
 
                         contents = await zowe.Get.dataSet(sessionNode.getSession(), fromDataSetName);
                     } catch (err) {
@@ -602,7 +602,7 @@ describe("Extension Integration Tests", () => {
                         inputBoxStub.returns(toMemberName);
 
                         await dsActions.copyDataSet(fromNode);
-                        await dsActions.pasteDataSet(parentNode, testTree);
+                        await dsActions.pasteMember(parentNode, testTree);
 
                         contents = await zowe.Get.dataSet(sessionNode.getSession(), `${dataSetName}(${toMemberName})`);
                     } catch (err) {
@@ -674,7 +674,7 @@ describe("Extension Integration Tests", () => {
                         inputBoxStub.returns(toMemberName);
 
                         await dsActions.copyDataSet(fromNode);
-                        await dsActions.pasteDataSet(toNode, testTree);
+                        await dsActions.pasteMember(toNode, testTree);
 
                         contents = await zowe.Get.dataSet(
                             sessionNode.getSession(),
@@ -753,7 +753,7 @@ describe("Extension Integration Tests", () => {
                         toNode.contextValue = DS_DS_CONTEXT;
 
                         await dsActions.copyDataSet(fromMemberNode);
-                        await dsActions.pasteDataSet(toNode, testTree);
+                        await dsActions.pasteMember(toNode, testTree);
 
                         contents = await zowe.Get.dataSet(sessionNode.getSession(), toDataSetName);
                     } catch (err) {

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

@@ -11,6 +11,7 @@
 
 import * as vscode from "vscode";
 import * as zowe from "@zowe/cli";
+import * as imperative from "@zowe/imperative";
 import { ValidProfileEnum } from "@zowe/zowe-explorer-api";
 import {
     createBasicZosmfSession,
@@ -808,7 +809,7 @@ describe("Dataset Actions Unit Tests - Function enterPattern", () => {
         await dsActions.enterPattern(node, blockMocks.testDatasetTree);
 
         expect(mocked(vscode.window.showInputBox)).toBeCalledWith({
-            prompt: "Search data sets by entering patterns: use a comma to separate multiple patterns",
+            prompt: "Search Data Sets: use a comma to separate multiple patterns",
             value: node.pattern,
         });
         expect(mocked(vscode.window.showInformationMessage)).not.toBeCalled();
@@ -1617,12 +1618,7 @@ describe("Dataset Actions Unit Tests - Function copyDataSet", () => {
 
         await dsActions.copyDataSet(node);
 
-        expect(clipboard.readText()).toBe(
-            JSON.stringify({
-                profileName: "sestest",
-                dataSetName: "HLQ.TEST.DELETE.NODE",
-            })
-        );
+        expect(clipboard.readText()).toBe('{"profileName":"sestest","dataSetName":"HLQ.TEST.DELETE.NODE"}');
     });
     it("Checking copy the label of a favorite node to the clipboard", async () => {
         globals.defineGlobals("");
@@ -1638,12 +1634,7 @@ describe("Dataset Actions Unit Tests - Function copyDataSet", () => {
 
         await dsActions.copyDataSet(node);
 
-        expect(clipboard.readText()).toBe(
-            JSON.stringify({
-                profileName: "sestest",
-                dataSetName: "HLQ.TEST.DELETE.NODE",
-            })
-        );
+        expect(clipboard.readText()).toBe('{"profileName":"sestest","dataSetName":"HLQ.TEST.DELETE.NODE"}');
     });
     it("Checking copy the label of a member to the clipboard", async () => {
         globals.defineGlobals("");
@@ -1661,13 +1652,7 @@ describe("Dataset Actions Unit Tests - Function copyDataSet", () => {
 
         await dsActions.copyDataSet(child);
 
-        expect(clipboard.readText()).toBe(
-            JSON.stringify({
-                profileName: "sestest",
-                dataSetName: "parent",
-                memberName: "child",
-            })
-        );
+        expect(clipboard.readText()).toBe('{"profileName":"sestest","dataSetName":"parent","memberName":"child"}');
     });
     it("Checking copy the label of a favorite member to the clipboard", async () => {
         globals.defineGlobals("");
@@ -1685,17 +1670,11 @@ describe("Dataset Actions Unit Tests - Function copyDataSet", () => {
 
         await dsActions.copyDataSet(child);
 
-        expect(clipboard.readText()).toBe(
-            JSON.stringify({
-                profileName: "sestest",
-                dataSetName: "parent",
-                memberName: "child",
-            })
-        );
+        expect(clipboard.readText()).toBe('{"profileName":"sestest","dataSetName":"parent","memberName":"child"}');
     });
 });
 
-describe("Dataset Actions Unit Tests - Function pasteDataSet", () => {
+describe("Dataset Actions Unit Tests - Function pasteMember", () => {
     function createBlockMocks() {
         const session = createISession();
         const sessionWithoutCredentials = createISessionWithoutCredentials();
@@ -1754,7 +1733,7 @@ describe("Dataset Actions Unit Tests - Function pasteDataSet", () => {
             })
         );
 
-        await dsActions.pasteDataSet(node, blockMocks.testDatasetTree);
+        await dsActions.pasteMember(node, blockMocks.testDatasetTree);
 
         expect(copySpy).toHaveBeenCalledWith(
             { dataSetName: "HLQ.TEST.BEFORE.NODE" },
@@ -1801,7 +1780,7 @@ describe("Dataset Actions Unit Tests - Function pasteDataSet", () => {
             })
         );
 
-        await dsActions.pasteDataSet(node, blockMocks.testDatasetTree);
+        await dsActions.pasteMember(node, blockMocks.testDatasetTree);
 
         expect(copySpy).toHaveBeenCalledWith(
             { dataSetName: "HLQ.TEST.BEFORE.NODE" },
@@ -1833,7 +1812,7 @@ describe("Dataset Actions Unit Tests - Function pasteDataSet", () => {
         });
         clipboard.writeText("INVALID");
 
-        await expect(dsActions.pasteDataSet(node, blockMocks.testDatasetTree)).rejects.toEqual(
+        await expect(dsActions.pasteMember(node, blockMocks.testDatasetTree)).rejects.toEqual(
             Error("Invalid clipboard. Copy from data set first")
         );
         expect(copySpy).not.toBeCalled();
@@ -1864,7 +1843,7 @@ describe("Dataset Actions Unit Tests - Function pasteDataSet", () => {
         mocked(vscode.window.showInputBox).mockResolvedValueOnce("");
         clipboard.writeText(JSON.stringify({ dataSetName: "HLQ.TEST.BEFORE.NODE", profileName: "sestest" }));
 
-        await dsActions.pasteDataSet(node, blockMocks.testDatasetTree);
+        await dsActions.pasteMember(node, blockMocks.testDatasetTree);
         expect(copySpy).not.toBeCalled();
     });
     it("Should call zowe.Copy.dataSet when pasting to partitioned data set", async () => {
@@ -1902,7 +1881,7 @@ describe("Dataset Actions Unit Tests - Function pasteDataSet", () => {
         mocked(vscode.window.showInputBox).mockResolvedValueOnce("mem1");
         clipboard.writeText(JSON.stringify({ dataSetName: "HLQ.TEST.BEFORE.NODE", profileName: "sestest" }));
 
-        await dsActions.pasteDataSet(node, blockMocks.testDatasetTree);
+        await dsActions.pasteMember(node, blockMocks.testDatasetTree);
 
         expect(copySpy).toHaveBeenCalledWith(
             { dataSetName: "HLQ.TEST.BEFORE.NODE" },
@@ -1941,7 +1920,7 @@ describe("Dataset Actions Unit Tests - Function pasteDataSet", () => {
         mocked(vscode.window.showInputBox).mockResolvedValueOnce("mem1");
         clipboard.writeText(JSON.stringify({ dataSetName: "HLQ.TEST.BEFORE.NODE", profileName: "sestest" }));
 
-        await expect(dsActions.pasteDataSet(node, blockMocks.testDatasetTree)).rejects.toEqual(
+        await expect(dsActions.pasteMember(node, blockMocks.testDatasetTree)).rejects.toEqual(
             Error("HLQ.TEST.TO.NODE(mem1) already exists. You cannot replace a member")
         );
         expect(copySpy).not.toBeCalled();
@@ -1993,7 +1972,7 @@ describe("Dataset Actions Unit Tests - Function pasteDataSet", () => {
         mocked(blockMocks.testDatasetTree.findNonFavoritedNode).mockReturnValueOnce(nonFavoritedNode);
         clipboard.writeText(JSON.stringify({ dataSetName: "HLQ.TEST.BEFORE.NODE", profileName: "sestest" }));
 
-        await dsActions.pasteDataSet(favoritedNode, blockMocks.testDatasetTree);
+        await dsActions.pasteMember(favoritedNode, blockMocks.testDatasetTree);
 
         expect(copySpy).toHaveBeenCalledWith(
             { dataSetName: "HLQ.TEST.BEFORE.NODE" },
@@ -2232,6 +2211,7 @@ describe("Dataset Actions Unit Tests - Function createFile", () => {
         const mvsApi = createMvsApi(imperativeProfile);
         const mockCheckCurrentProfile = jest.fn();
         bindMvsApi(mvsApi);
+        mocked(treeView.reveal).mockReturnValue(new Promise((resolve) => resolve(null)));
 
         return {
             session,

packages/zowe-explorer/__tests__/__unit__/extension.unit.test.ts

@@ -123,10 +123,10 @@ async function createGlobalMocks() {
             "zowe.all.profilelink",
             "zowe.createMember",
             "zowe.deleteDataset",
-            "zowe.deletePDS",
             "zowe.allocateLike",
             "zowe.uploadDialog",
             "zowe.deleteMember",
+            "zowe.editDataSet",
             "zowe.editMember",
             "zowe.removeSession",
             "zowe.removeFavorite",
@@ -137,8 +137,8 @@ async function createGlobalMocks() {
             "zowe.submitMember",
             "zowe.showDSAttributes",
             "zowe.renameDataSet",
-            "zowe.copyDataSet",
-            "zowe.pasteDataSet",
+            "zowe.copyMember",
+            "zowe.pasteMember",
             "zowe.renameDataSetMember",
             "zowe.hMigrateDataSet",
             "zowe.hRecallDataSet",
@@ -163,7 +163,6 @@ async function createGlobalMocks() {
             "zowe.uss.text",
             "zowe.uss.renameNode",
             "zowe.uss.uploadDialog",
-            "zowe.uss.createNode",
             "zowe.uss.copyPath",
             "zowe.uss.editFile",
             "zowe.uss.saveSearch",

packages/zowe-explorer/__tests__/__unit__/uss/USSTree.unit.test.ts

@@ -265,18 +265,14 @@ describe("USSTree Unit Tests - Function USSTree.checkDuplicateLabel()", () => {
     it("Tests that checkDuplicateLabel() returns null if passed a unique name", async () => {
         const globalMocks = await createGlobalMocks();
 
-        const returnVal = globalMocks.testTree.checkDuplicateLabel(
-            "totallyNewLabel",
-            [globalMocks.testUSSNode],
-            "file"
-        );
+        const returnVal = globalMocks.testTree.checkDuplicateLabel("totallyNewLabel", [globalMocks.testUSSNode]);
         expect(returnVal).toEqual(null);
     });
     it("Tests that checkDuplicateLabel() returns an error message if passed a name that's already used for an existing folder", async () => {
         const globalMocks = await createGlobalMocks();
 
-        const returnVal = globalMocks.testTree.checkDuplicateLabel("/u/myuser", [globalMocks.testUSSNode], "file");
-        expect(returnVal).toEqual("A file already exists with this name. Please choose a different name.");
+        const returnVal = globalMocks.testTree.checkDuplicateLabel("/u/myuser/usstest", [globalMocks.testUSSNode]);
+        expect(returnVal).toEqual("A folder already exists with this name. Please choose a different name.");
     });
 });