Merge pull request #349 from zowe/safe_save_by_default

Safe save by default
zowe · Dec 5, 2019 · 9d2b794 · 9d2b794
2 parents 6ab3ef8 + 1f2356f
commit 9d2b794
Show file tree

Hide file tree

Showing 12 changed files with 507 additions and 412 deletions.
diff --git a/__tests__/__unit__/ZoweUSSNode.unit.test.ts b/__tests__/__unit__/ZoweUSSNode.unit.test.ts
@@ -199,4 +199,22 @@ describe("Unit Tests (Jest)", () => {
  utils.labelHack(rootNode);
  expect(rootNode.label === "gappy");
  });
+
+ /*************************************************************************************************************
+ * Checks that getEtag() returns a value
+ *************************************************************************************************************/
+ it("Checks that getEtag() returns a value", async () => {
+ const rootNode = new ZoweUSSNode("gappy", vscode.TreeItemCollapsibleState.Collapsed, null, session, null, null, null, "123");
+ expect(rootNode.getEtag() === "123");
+ });
+
+ /*************************************************************************************************************
+ * Checks that setEtag() assigns a value
+ *************************************************************************************************************/
+ it("Checks that setEtag() assigns a value", async () => {
+ const rootNode = new ZoweUSSNode("gappy", vscode.TreeItemCollapsibleState.Collapsed, null, session, null, null, null, "123");
+ expect(rootNode.getEtag() === "123");
+ rootNode.setEtag("ABC");
+ expect(rootNode.getEtag() === "ABC");
+ });
 });
diff --git a/__tests__/__unit__/__snapshots__/ZoweUSSNode.unit.test.ts.snap b/__tests__/__unit__/__snapshots__/ZoweUSSNode.unit.test.ts.snap
@@ -8,6 +8,7 @@ ZoweUSSNode {
  "collapsibleState": 0,
  "contextValue": "textFile",
  "dirty": false,
+ "etag": "",
  "fullPath": "",
  "iconPath": "Ref: 'document.svg'",
  "label": "testFile",
@@ -18,6 +19,7 @@ ZoweUSSNode {
  "collapsibleState": 1,
  "contextValue": "directory",
  "dirty": false,
+ "etag": "",
  "fullPath": "",
  "iconPath": "Ref: 'folder.svg'",
  "label": "testDir",
@@ -28,6 +30,7 @@ ZoweUSSNode {
  "collapsibleState": 1,
  "contextValue": "uss_session",
  "dirty": true,
+ "etag": "",
  "fullPath": "",
  "iconPath": "Ref: 'folder.svg'",
  "label": "root",

diff --git a/__tests__/__unit__/__snapshots__/extension.unit.test.ts.snap b/__tests__/__unit__/__snapshots__/extension.unit.test.ts.snap
@@ -37,21 +37,11 @@ Array [
  "group": "inline",
  "when": "view == zowe.uss.explorer && viewItem != favorite && viewItem != uss_session && viewItem != directory && viewItem != directory_fav && viewItem != uss_session_fav",
  },
- Object {
- "command": "zowe.uss.safeSaveUSS",
- "group": "inline",
- "when": "view == zowe.uss.explorer && viewItem != favorite && viewItem != uss_session && viewItem != directory && viewItem != directory_fav && viewItem != uss_session_fav",
- },
  Object {
  "command": "zowe.uss.refreshUSS",
  "group": "0_mainframeInteraction",
  "when": "view == zowe.uss.explorer && viewItem != favorite && viewItem != uss_session && viewItem != directory && viewItem != directory_fav && viewItem != uss_session_fav",
  },
- Object {
- "command": "zowe.uss.safeSaveUSS",
- "group": "0_mainframeInteraction",
- "when": "view == zowe.uss.explorer && viewItem != favorite && viewItem != uss_session && viewItem != directory && viewItem != directory_fav && viewItem != uss_session_fav",
- },
  Object {
  "command": "zowe.uss.deleteNode",
  "group": "6_modification@2",
@@ -132,21 +122,11 @@ Array [
  "group": "inline",
  "when": "view == zowe.explorer && viewItem == member",
  },
- Object {
- "command": "zowe.safeSave",
- "group": "inline",
- "when": "view == zowe.explorer && viewItem == member",
- },
  Object {
  "command": "zowe.refreshNode",
  "group": "0_mainframeInteraction",
  "when": "view == zowe.explorer && viewItem == member",
  },
- Object {
- "command": "zowe.safeSave",
- "group": "0_mainframeInteraction",
- "when": "view == zowe.explorer && viewItem == member",
- },
  Object {
  "command": "zowe.deleteMember",
  "group": "6_modification@2",
@@ -173,7 +153,7 @@ Array [
  "when": "view == zowe.explorer && viewItem == member_fav",
  },
  Object {
- "command": "zowe.safeSave",
+ "command": "zowe.refreshNode",
  "group": "inline",
  "when": "view == zowe.explorer && viewItem == member_fav",
  },
@@ -182,11 +162,6 @@ Array [
  "group": "0_mainframeInteraction",
  "when": "view == zowe.explorer && viewItem == member_fav",
  },
- Object {
- "command": "zowe.safeSave",
- "group": "0_mainframeInteraction",
- "when": "view == zowe.explorer && viewItem == member_fav",
- },
  Object {
  "command": "zowe.deleteMember",
  "group": "6_modification@2",
@@ -213,17 +188,17 @@ Array [
  "when": "view == zowe.explorer && viewItem == ds",
  },
  Object {
- "command": "zowe.safeSave",
- "group": "inline",
- "when": "view == zowe.explorer && viewItem == ds",
+ "command": "zowe.renameDataSetMember",
+ "group": "6_modification@2",
+ "when": "view == zowe.explorer && viewItem == member_fav",
  },
  Object {
  "command": "zowe.refreshNode",
- "group": "0_mainframeInteraction",
+ "group": "inline",
  "when": "view == zowe.explorer && viewItem == ds",
  },
  Object {
- "command": "zowe.safeSave",
+ "command": "zowe.refreshNode",
  "group": "0_mainframeInteraction",
  "when": "view == zowe.explorer && viewItem == ds",
  },
@@ -268,17 +243,22 @@ Array [
  "when": "view == zowe.explorer && viewItem == ds_fav",
  },
  Object {
- "command": "zowe.safeSave",
- "group": "inline",
- "when": "view == zowe.explorer && viewItem == ds_fav",
+ "command": "zowe.copyDataSet",
+ "group": "9_cutcopypaste",
+ "when": "view == zowe.explorer && viewItem == ds",
+ },
+ Object {
+ "command": "zowe.pasteDataSet",
+ "group": "9_cutcopypaste",
+ "when": "view == zowe.explorer && viewItem == ds",
  },
  Object {
  "command": "zowe.refreshNode",
- "group": "0_mainframeInteraction",
+ "group": "inline",
  "when": "view == zowe.explorer && viewItem == ds_fav",
  },
  Object {
- "command": "zowe.safeSave",
+ "command": "zowe.refreshNode",
  "group": "0_mainframeInteraction",
  "when": "view == zowe.explorer && viewItem == ds_fav",
  },