Removed duplicate cicsplexes

Signed-off-by: EKhan <[email protected]>

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

@@ -0,0 +1,200 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
+ */
+
+import * as profileUtils from "../../../src/utils/plexUtils";
+
+describe("Profile Utils tests", () => {
+  describe("compareCicsplexes", () => {
+    it("should return 0 as both are the same", () => {
+      const plex1 = {
+        status: "ACTIVE",
+        mpstatus: "YES",
+        accesstype: "LOCAL"
+      };
+
+      const plex2 = {
+        status: "ACTIVE",
+        mpstatus: "YES",
+        accesstype: "LOCAL"
+      };
+
+      const response = profileUtils.compareCicsplexes(plex1, plex2);
+      expect(response).toEqual(0);
+    });
+
+    it("should return -1 as plex1 has INACTIVE status", () => {
+      const plex1 = {
+        status: "INACTIVE",
+        mpstatus: "YES",
+        accesstype: "LOCAL"
+      };
+
+      const plex2 = {
+        status: "ACTIVE",
+        mpstatus: "YES",
+        accesstype: "LOCAL"
+      };
+
+      const response = profileUtils.compareCicsplexes(plex1, plex2);
+      expect(response).toEqual(-1);
+    });
+
+    it("should return -1 as plex1 has mpstatus NO", () => {
+      const plex1 = {
+        status: "ACTIVE",
+        mpstatus: "NO",
+        accesstype: "LOCAL"
+      };
+
+      const plex2 = {
+        status: "ACTIVE",
+        mpstatus: "YES",
+        accesstype: "LOCAL"
+      };
+
+      const response = profileUtils.compareCicsplexes(plex1, plex2);
+      expect(response).toEqual(-1);
+    });
+
+    it("should return -1 as plex1 has accesstype ADJACENT", () => {
+      const plex1 = {
+        status: "ACTIVE",
+        mpstatus: "YES",
+        accesstype: "ADJACENT"
+      };
+
+      const plex2 = {
+        status: "ACTIVE",
+        mpstatus: "YES",
+        accesstype: "LOCAL"
+      };
+
+      const response = profileUtils.compareCicsplexes(plex1, plex2);
+      expect(response).toEqual(-1);
+    });
+
+    it("should return 1 as plex2 has INACTIVE status", () => {
+      const plex1 = {
+        status: "ACTIVE",
+        mpstatus: "YES",
+        accesstype: "LOCAL"
+      };
+
+      const plex2 = {
+        status: "INACTIVE",
+        mpstatus: "YES",
+        accesstype: "LOCAL"
+      };
+
+      const response = profileUtils.compareCicsplexes(plex1, plex2);
+      expect(response).toEqual(1);
+    });
+
+    it("should return 1 as plex2 has mpstatus NO", () => {
+      const plex1 = {
+        status: "ACTIVE",
+        mpstatus: "YES",
+        accesstype: "LOCAL"
+      };
+
+      const plex2 = {
+        status: "ACTIVE",
+        mpstatus: "NO",
+        accesstype: "LOCAL"
+      };
+
+      const response = profileUtils.compareCicsplexes(plex1, plex2);
+      expect(response).toEqual(1);
+    });
+
+    it("should return 1 as plex2 has accesstype ADJACENT", () => {
+      const plex1 = {
+        status: "ACTIVE",
+        mpstatus: "YES",
+        accesstype: "LOCAL"
+      };
+
+      const plex2 = {
+        status: "ACTIVE",
+        mpstatus: "YES",
+        accesstype: "ADJACENT"
+      };
+
+      const response = profileUtils.compareCicsplexes(plex1, plex2);
+      expect(response).toEqual(1);
+    });
+  });
+
+  describe("filterCicsplexByConstraints", () => {
+    it("should return an array of 2 plexes as both are valid", () => {
+      const plexes = [
+        {accesstype: 'LOCAL', mpstatus: 'YES', plexname: 'PLEX1', status: 'ACTIVE'},
+        {accesstype: 'LOCAL', mpstatus: 'YES', plexname: 'PLEX2', status: 'ACTIVE'}
+      ];
+      const allplexes = profileUtils.filterCicsplexByConstraints(plexes);
+      expect(allplexes.size).toEqual(2);
+    });
+
+
+    it("should return an array of 1 plex as one in inactive both are valid", () => {
+      const plexes = [
+        {accesstype: 'LOCAL', mpstatus: 'YES', plexname: 'PLEX1', status: 'INACTIVE'},
+        {accesstype: 'LOCAL', mpstatus: 'YES', plexname: 'PLEX1', status: 'ACTIVE'}
+      ];
+      const allplexes = profileUtils.filterCicsplexByConstraints(plexes);
+      expect(allplexes.size).toEqual(1);
+    });
+
+
+    it("should return an array of 1 plex even though both are inactive", () => {
+      const plexes = [
+        {accesstype: 'LOCAL', mpstatus: 'YES', plexname: 'PLEX1', status: 'INACTIVE'},
+        {accesstype: 'LOCAL', mpstatus: 'YES', plexname: 'PLEX1', status: 'INACTIVE'}
+      ];
+      const allplexes = profileUtils.filterCicsplexByConstraints(plexes);
+      expect(allplexes.size).toEqual(1);
+    });
+
+
+    it("should return an array of 1 plex as one of the plexes has mpstatus NO", () => {
+      const plexes = [
+        {accesstype: 'LOCAL', mpstatus: 'NO', plexname: 'PLEX1', status: 'ACTIVE'},
+        {accesstype: 'LOCAL', mpstatus: 'YES', plexname: 'PLEX1', status: 'ACTIVE'}
+      ];
+      const allplexes = profileUtils.filterCicsplexByConstraints(plexes);
+      expect(allplexes.size).toEqual(1);
+    });
+
+    it("should return an array of 1 plex as one of the plexes has accesstype ADJACENT", () => {
+      const plexes = [
+        {accesstype: 'ADJACENT', mpstatus: 'YES', plexname: 'PLEX1', status: 'ACTIVE'},
+        {accesstype: 'LOCAL', mpstatus: 'YES', plexname: 'PLEX1', status: 'ACTIVE'}
+      ];
+      const allplexes = profileUtils.filterCicsplexByConstraints(plexes);
+      expect(allplexes.size).toEqual(1);
+    });
+
+
+    it("should return an array of 3 plex", () => {
+      const plexes = [
+        {accesstype: 'LOCAL', mpstatus: 'YES', plexname: 'PLEX1', status: 'ACTIVE'},
+        {accesstype: 'LOCAL', mpstatus: 'NO', plexname: 'PLEX2#', status: 'ACTIVE'},
+        {accesstype: 'ADJACENT', mpstatus: 'YES', plexname: 'PLEX2#', status: 'ACTIVE'},
+        {accesstype: 'LOCAL', mpstatus: 'NO', plexname: 'PLEX3#', status: 'ACTIVE'},
+        {accesstype: 'ADJACENT', mpstatus: 'YES', plexname: 'PLEX3#', status: 'ACTIVE'}
+      ];
+
+      const allplexes = profileUtils.filterCicsplexByConstraints(plexes);
+      expect(allplexes.size).toEqual(3);
+    });
+
+  });
+});

packages/vsce/src/utils/plexUtils.ts

@@ -0,0 +1,46 @@
+/**
+ * This program and the accompanying materials are made available under the terms of the
+ * Eclipse Public License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Copyright Contributors to the Zowe Project.
+ *
+ */
+
+export function compareCicsplexes(plex1: any, plex2: any): number {
+  const compare = function(val1: boolean, val2: boolean): Number {
+    return Number(val1) - Number(val2);
+  };
+
+  let result = (compare(plex1["status"] === "ACTIVE", plex2["status"] === "ACTIVE"));
+  if (result != 0) {
+    return result.valueOf();
+  }
+  result = (compare(plex1["mpstatus"] === "YES", plex2["mpstatus"] == "YES"));
+  if (result != 0) {
+    return result.valueOf();
+  }
+  result = (compare(plex1["accesstype"] === "LOCAL", plex2["accesstype"] === "LOCAL"));
+  return result.valueOf();
+}
+
+export function filterCicsplexByConstraints(cicscicsplex: any[]) {
+
+  let allcicsplexes = new Map<string, {}>();
+
+  for (const plex of cicscicsplex) {
+    let plexname: string = plex["plexname"];
+
+    let old = allcicsplexes.get(plexname);
+    if (old) {
+      if (compareCicsplexes(plex, old) > 0) {
+        allcicsplexes.set(plexname, plex);
+      }
+    } else {
+      allcicsplexes.set(plexname, plex);
+    }
+  }
+  return allcicsplexes;
+}

packages/vsce/src/utils/profileManagement.ts

@@ -17,6 +17,7 @@ import { CICSPlexTree } from "../trees/CICSPlexTree";
 import { toArray } from "./commandUtils";
 import constants from "./constants";
 import cicsProfileMeta from "./profileDefinition";
+import { filterCicsplexByConstraints } from "./plexUtils";
 
 export class ProfileManagement {
   private static zoweExplorerAPI = ZoweVsCodeExtension.getZoweExplorerApi();
@@ -98,6 +99,7 @@ export class ProfileManagement {
           nodiscard: true,
         }
       });
+
       return response.resultsummary.api_response1_alt === "OK" ?
         response.resultsummary.cachetoken : null;
     } catch (error) {
@@ -216,13 +218,15 @@ export class ProfileManagement {
       try {
         const { response } = await getCache(session, { cacheToken: isPlex, nodiscard: false });
         if (response.records.cicscicsplex) {
-          for (const plex of toArray(response.records.cicscicsplex)) {
+          let cicscicsplexs = filterCicsplexByConstraints(toArray(response.records.cicscicsplex));
+
+          cicscicsplexs.forEach((value: {}, key: string) => {
             infoLoaded.push({
-              plexname: plex.plexname,
+              plexname: key,
               regions: [],
               group: false,
             });
-          }
+          });
         }
       } catch (error) {
         window.showErrorMessage(