Updating icons for disabled and closed statuses resources

packages/vsce/CHANGELOG.md

@@ -2,10 +2,14 @@
 
 All notable changes to the "cics-extension-for-zowe" extension will be documented in this file.
 
+## Recent Changes
+
+- Updated status icons for local transactions, local files, tasks and programs. [#203](https://github.com/zowe/cics-for-zowe-client/issues/203)
+
 ## `3.3.0`
 
 - Added `Manage Profile` option for CICS profiles. [#179](https://github.com/zowe/cics-for-zowe-client/issues/179)
-
+  
 ## `3.2.6`
 
 - BugFix: Inform user no resources found when filtering trees. [#200](https://github.com/zowe/cics-for-zowe-client/issues/200)

packages/vsce/__tests__/__unit__/trees/CICSProgramTree.unit.test.ts

@@ -9,7 +9,7 @@
  *
  */
 
-const getIconOpenMock = jest.fn();
+const getFolderIconMock = jest.fn();
 
 import { imperative } from "@zowe/zowe-explorer-api";
 import { CICSRegionTree } from "../../../src/trees/CICSRegionTree";
@@ -22,8 +22,8 @@ import CustomError from "../../__utils__/CustomError";
 jest.mock("@zowe/cics-for-zowe-sdk");
 const zoweSdk = require("@zowe/cics-for-zowe-sdk");
 
-jest.mock("../../../src/utils/profileUtils", () => {
-  return { getIconOpen: getIconOpenMock };
+jest.mock("../../../src/utils/iconUtils", () => {
+  return { getFolderIcon: getFolderIconMock };
 });
 jest.mock("../../../src/trees/treeItems/CICSProgramTreeItem");
 
@@ -63,9 +63,9 @@ describe("Test suite for CICSProgramTree", () => {
   let sut: CICSProgramTree;
 
   beforeEach(() => {
-    getIconOpenMock.mockReturnValue(iconPath);
+    getFolderIconMock.mockReturnValue(iconPath);
     sut = new CICSProgramTree(cicsRegionTreeMock as any as CICSRegionTree);
-    expect(getIconOpenMock).toHaveBeenCalledWith(false);
+    expect(getFolderIconMock).toHaveBeenCalledWith(false);
   });
 
   afterEach(() => {
@@ -98,7 +98,7 @@ describe("Test suite for CICSProgramTree", () => {
       expect(getDefaultProgramFilter).toHaveBeenCalled();
       expect(sut.activeFilter).toBeUndefined();
       expect(sut.children.length).toBeGreaterThanOrEqual(1);
-      expect(getIconOpenMock).toHaveBeenCalledWith(true);
+      expect(getFolderIconMock).toHaveBeenCalledWith(true);
     });
 
     it("Should add newProgramItem into the addProgram() and invoke toEscapedCriteriaString when activeFilter is defined", async () => {
@@ -110,7 +110,7 @@ describe("Test suite for CICSProgramTree", () => {
       expect(toEscapedCriteriaString).toHaveBeenCalled();
       expect(sut.activeFilter).toBeDefined();
       expect(sut.children.length).toBeGreaterThanOrEqual(1);
-      expect(getIconOpenMock).toHaveBeenCalledWith(true);
+      expect(getFolderIconMock).toHaveBeenCalledWith(true);
     });
 
     it("Should throw exception when error.mMessage includes {exceeded a resource limit}", async () => {

packages/vsce/__tests__/__unit__/utils/iconUtils.unit.test.ts

@@ -0,0 +1,118 @@
+import { getIconByStatus, getFolderIcon, getIconFilePathFromName, getIconRootName } from "../../../src/utils/iconUtils";
+
+const iconPath = {
+  light: "program-dark.svg",
+  dark: "program-light.svg",
+};
+
+describe("Test suite for iconUtils", () => {
+  describe("Test suite for getIconPathResources", () => {
+    it("Should return icon path for dark and light theme", () => {
+      const result = getIconFilePathFromName("program");
+      expect(result.dark).toContain(iconPath.dark);
+      expect(result.light).toContain(iconPath.light);
+    });
+  });
+
+  describe("Test suite for getFolderIcon", () => {
+    it("Should return icon path for folder open when true", () => {
+      const result = getFolderIcon(true);
+      expect(result.dark).toContain("folder-open-light");
+      expect(result.light).toContain("folder-open-dark");
+    });
+    it("Should return icon path for folder closed when false", () => {
+      const result = getFolderIcon(false);
+      expect(result.dark).toContain("folder-closed-light");
+      expect(result.light).toContain("folder-closed-dark");
+    });
+  });
+
+  describe("Test suite for getIconRootName", () => {
+    //  Using the common object for resourcesTreeItem
+    const resourceTreeItem = {
+      status: "",
+      openstatus: "",
+      enablestatus: "",
+      runstatus: "",
+      isActive: true,
+    };
+    it("Should return program-disabled for PROGRAM resource with DISABLED status", () => {
+      resourceTreeItem.status = "DISABLED";
+      const result = getIconRootName("PROGRAM", resourceTreeItem);
+      expect(result).toBe("program-disabled");
+    });
+    it("Should return program for PROGRAM resource with ENABLED status", () => {
+      resourceTreeItem.status = "ENABLED";
+      const result = getIconRootName("PROGRAM", resourceTreeItem);
+      expect(result).toBe("program");
+    });
+    it("Should return local-transaction-disabled for TRANSACTION resource with DISABLED status", () => {
+      resourceTreeItem.status = "DISABLED";
+      const result = getIconRootName("TRANSACTION", resourceTreeItem);
+      expect(result).toBe("local-transaction-disabled");
+    });
+    it("Should return local-transaction for TRANSACTION resource with ENABLED status", () => {
+      resourceTreeItem.status = "ENABLED";
+      const result = getIconRootName("TRANSACTION", resourceTreeItem);
+      expect(result).toBe("local-transaction");
+    });
+    it("Should return local-file-disabled-closed for LOCAL_FILE resource with openstatus as CLOSED and enablestatus as CLOSED", () => {
+      resourceTreeItem.openstatus = "CLOSED";
+      resourceTreeItem.enablestatus = "DISABLED";
+      const result = getIconRootName("LOCAL_FILE", resourceTreeItem);
+      expect(result).toBe("local-file-disabled-closed");
+    });
+    it("Should return local-file-closed for LOCAL_FILE resource with openstatus as CLOSED", () => {
+      resourceTreeItem.enablestatus = "ENABLED";
+      resourceTreeItem.openstatus = "CLOSED";
+      const result = getIconRootName("LOCAL_FILE", resourceTreeItem);
+      expect(result).toBe("local-file-closed");
+    });
+    it("Should return local-file-disabled for LOCAL_FILE resource with enablestatus as DISABLED", () => {
+      resourceTreeItem.openstatus = "OPEN";
+      resourceTreeItem.enablestatus = "DISABLED";
+      const result = getIconRootName("LOCAL_FILE", resourceTreeItem);
+      expect(result).toBe("local-file-disabled");
+    });
+    it("Should return local-file for LOCAL_FILE resource with enablestatus as ENABLED and openstatus as OPEM", () => {
+      resourceTreeItem.enablestatus = "ENABLED";
+      resourceTreeItem.openstatus = "OPEN";
+      const result = getIconRootName("LOCAL_FILE", resourceTreeItem);
+      expect(result).toBe("local-file");
+    });
+    it("Should return task-running for TASK resource with runstatus as RUNNING", () => {
+      resourceTreeItem.runstatus = "RUNNING";
+      const result = getIconRootName("TASK", resourceTreeItem);
+      expect(result).toBe("task-running");
+    });
+    it("Should return task-suspended for TASK resource with runstatus as SUSPENDED", () => {
+      resourceTreeItem.runstatus = "SUSPENDED";
+      const result = getIconRootName("TASK", resourceTreeItem);
+      expect(result).toBe("task-suspended");
+    });
+    it("Should return task-dispatched for TASK resource with runstatus as DISPATCHED", () => {
+      resourceTreeItem.runstatus = "DISPATCHED";
+      const result = getIconRootName("TASK", resourceTreeItem);
+      expect(result).toBe("task-dispatched");
+    });
+    it("Should return region for REGION resource with isActive as true", () => {
+      const result = getIconRootName("REGION", resourceTreeItem);
+      expect(result).toBe("region");
+    });
+    it("Should return region-disabled for REGION resource with isActive as false", () => {
+      resourceTreeItem.isActive = false;
+      const result = getIconRootName("REGION", resourceTreeItem);
+      expect(result).toBe("region-disabled");
+    });
+  });
+
+  describe("Test suite for getIconByStatus", () => {
+    const resource = {
+      status: "DISABLED",
+    };
+    it("Should return icon based on resource status", () => {
+      const result = getIconByStatus("PROGRAM", resource);
+      expect(result.dark).toContain("program-disabled");
+    });
+  });
+});