Change orderBy status in clusterList (#142)

Author: KaliszWiktoria

apps/cluster-orch/src/components/organism/ClusterList/ClusterList.cy.tsx

@@ -55,3 +55,48 @@ describe("<ClusterList/>", () => {
       });
   });
 });
+
+describe("<ClusterList/> - Sorting by Status", () => {
+  beforeEach(() => {
+    pom.interceptApis([pom.api.clusterMocked]);
+    cy.mount(
+      <ClusterList
+        onSelect={cy.stub().as("onSelectStub")}
+        onShowDetails={cy.stub().as("onShowDetailsStub")}
+        isForm={true}
+      />,
+    );
+    pom.waitForApis();
+  });
+
+  it("should sort by lifecyclePhase when clicking on the Status column header", () => {
+    cy.get("th:contains('Status') .caret.caret-up").click({ force: true });
+    cy.wait(`@${pom.api.clusterMocked}`).then(({ request }) => {
+      expect(request.url).to.include("orderBy=lifecyclePhase");
+      expect(request.url).to.include("asc");
+    });
+
+    cy.get("th:contains('Status') .caret.caret-down").click({ force: true });
+    cy.wait(`@${pom.api.clusterMocked}`).then(({ request }) => {
+      expect(request.url).to.include("orderBy=lifecyclePhase");
+      expect(request.url).to.include("desc");
+    });
+  });
+
+  it("should NOT sort by a wrong field when clicking Status column", () => {
+    cy.get("th:contains('Status') .caret.caret-up").click({ force: true });
+    cy.get(`@${pom.api.clusterMocked}`)
+      .its("request.url")
+      .then((url: string) => {
+        expect(url).not.to.include("orderBy=status");
+        expect(url).not.to.include("orderBy=name");
+      });
+  });
+
+  it("should not trigger sort if Status column is missing", () => {
+    cy.get("th:contains('Status')").invoke("remove");
+    cy.get("th:contains('Status') .caret.caret-up").should("not.exist");
+    cy.get("body").click();
+    cy.get(`@${pom.api.clusterMocked}`).should("exist");
+  });
+});

apps/cluster-orch/src/components/organism/ClusterList/ClusterList.tsx

@@ -63,7 +63,7 @@ const ClusterList = ({
           clusterToStatuses(item as cm.ClusterInfoRead),
           "lifecyclePhase",
         ).message,
-      apiName: "status",
+      apiName: "lifecyclePhase",
       Cell: (table) => (
         <AggregatedStatuses<AggregatedStatusesMap>
           statuses={clusterToStatuses(table.row.original)}

apps/cluster-orch/src/components/organism/cluster/ClusterList.cy.tsx

@@ -209,3 +209,50 @@ describe("<ClusterList />", () => {
     });
   });
 });
+
+describe("<ClusterList /> - Sorting by Cluster Status", () => {
+  const pom = new ClusterListPom("clusterList");
+
+  beforeEach(() => {
+    pom.interceptApis([pom.api.clusterListSuccess]);
+    cy.mount(<ClusterList hasPermission={true} />, { runtimeConfig });
+    pom.waitForApis();
+  });
+
+  it("should sort by lifecyclePhase when clicking on the Cluster Status column header", () => {
+    cy.get("th:contains('Cluster Status') .caret.caret-up").click({
+      force: true,
+    });
+    cy.wait(`@${pom.api.clusterListSuccess}`).then(({ request }) => {
+      expect(request.url).to.include("orderBy=lifecyclePhase");
+      expect(request.url).to.include("asc");
+    });
+
+    cy.get("th:contains('Cluster Status') .caret.caret-down").click({
+      force: true,
+    });
+    cy.wait(`@${pom.api.clusterListSuccess}`).then(({ request }) => {
+      expect(request.url).to.include("orderBy=lifecyclePhase");
+      expect(request.url).to.include("desc");
+    });
+  });
+
+  it("should NOT sort by a wrong field when clicking Cluster Status column", () => {
+    cy.get("th:contains('Cluster Status') .caret.caret-up").click({
+      force: true,
+    });
+    cy.get(`@${pom.api.clusterListSuccess}`)
+      .its("request.url")
+      .then((url: string) => {
+        expect(url).not.to.include("orderBy=status");
+        expect(url).not.to.include("orderBy=name");
+      });
+  });
+
+  it("should not trigger sort if Cluster Status column is missing", () => {
+    cy.get("th:contains('Cluster Status')").invoke("remove");
+    cy.get("th:contains('Cluster Status') .caret.caret-up").should("not.exist");
+    cy.get("body").click();
+    cy.get(`@${pom.api.clusterListSuccess}`).should("exist");
+  });
+});

apps/cluster-orch/src/components/organism/cluster/ClusterList.tsx

@@ -240,7 +240,7 @@ export default function ClusterList({ hasPermission }: ClusterListProps) {
       Header: "Cluster Status",
       accessor: (item) =>
         aggregateStatuses(clusterToStatuses(item), "lifecyclePhase").message,
-      apiName: "status",
+      apiName: "lifecyclePhase",
       Cell: (table) => {
         return (
           <AggregatedStatuses<AggregatedStatusesMap>