Re-add checks filtering (#1231)

trento-project · Apr 26, 2023 · 9903c7d · 9903c7d
1 parent b4b1ad0
commit 9903c7d
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 27 deletions.
diff --git a/assets/js/components/ExecutionResults/ExecutionResults.jsx b/assets/js/components/ExecutionResults/ExecutionResults.jsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import Table from '@components/Table';
 
 import ReactMarkdown from 'react-markdown';
@@ -90,6 +90,8 @@ function ExecutionResults({
   onLastExecutionUpdate = () => {},
   onStartExecution = () => {},
 }) {
+  const [predicates, setPredicates] = useState([]);
+
   const hosts = hostnames.map((item) => item.id);
 
   if (catalogLoading) {
@@ -122,22 +124,30 @@ function ExecutionResults({
     );
   }
 
-  const tableData = getCheckResults(executionData).map(
-    ({
-      check_id: checkID,
-      result,
-      expectation_results: expectationResults,
-      agents_check_results: agentsCheckResults,
-    }) => ({
-      checkID,
-      result,
-      clusterName,
-      executionState: executionData?.status,
-      description: getCheckDescription(catalog, checkID),
-      expectationResults,
-      agentsCheckResults: addHostnameToTargets(agentsCheckResults, hostnames),
+  const tableData = getCheckResults(executionData)
+    .filter((check) => {
+      if (predicates.length === 0) {
+        return true;
+      }
+
+      return predicates.some((predicate) => predicate(check));
     })
-  );
+    .map(
+      ({
+        check_id: checkID,
+        result,
+        expectation_results: expectationResults,
+        agents_check_results: agentsCheckResults,
+      }) => ({
+        checkID,
+        result,
+        clusterName,
+        executionState: executionData?.status,
+        description: getCheckDescription(catalog, checkID),
+        expectationResults,
+        agentsCheckResults: addHostnameToTargets(agentsCheckResults, hostnames),
+      })
+    );
 
   return (
     <>
@@ -146,6 +156,7 @@ function ExecutionResults({
         clusterName={clusterName}
         cloudProvider={cloudProvider}
         clusterScenario={clusterScenario}
+        onFilterChange={(newPredicates) => setPredicates(newPredicates)}
       />
       <ResultsContainer
         catalogError={false}

diff --git a/assets/js/components/ExecutionResults/ExecutionResults.test.jsx b/assets/js/components/ExecutionResults/ExecutionResults.test.jsx
@@ -285,17 +285,16 @@ describe('ExecutionResults', () => {
       { route: `/clusters/${clusterID}/executions/last?health=passing` }
     );
 
-    expect(screen.getByText('test-cluster')).toBeTruthy();
+    expect(screen.getAllByText('test-cluster')).toHaveLength(2);
     expect(screen.getByText('HANA scale-up')).toBeTruthy();
     expect(screen.getByText('Azure')).toBeTruthy();
     expect(screen.getByText(hostnames[0].hostname)).toBeTruthy();
     expect(screen.getByText(hostnames[1].hostname)).toBeTruthy();
-    expect(screen.getAllByText(checkID1)).toHaveLength(2);
+    expect(screen.getAllByText(checkID1)).toHaveLength(1);
     expect(screen.queryByText(checkID2)).toBeNull();
-    expect(screen.getAllByText('2/2 expectations passed')).toBeTruthy();
   });
 
-  it("should render ExecutionResults with successfully filtered 'passing' and 'ciritcal' results", async () => {
+  it("should render ExecutionResults with successfully filtered 'passing' and 'critical' results", async () => {
     const {
       clusterID,
       hostnames,
@@ -330,15 +329,13 @@ describe('ExecutionResults', () => {
       }
     );
 
-    expect(screen.getByText('test-cluster')).toBeTruthy();
+    expect(screen.getAllByText('test-cluster')).toHaveLength(2);
     expect(screen.getByText('HANA scale-up')).toBeTruthy();
     expect(screen.getByText('Azure')).toBeTruthy();
-    expect(screen.getByText(hostnames[0].hostname)).toBeTruthy();
-    expect(screen.getByText(hostnames[1].hostname)).toBeTruthy();
-    expect(screen.getAllByText(checkID1)).toHaveLength(2);
-    expect(screen.getAllByText(checkID2)).toHaveLength(2);
-    expect(screen.getAllByText('2/2 expectations passed')).toBeTruthy();
-    expect(screen.getAllByText('1/2 expectations failed')).toBeTruthy();
+    expect(screen.getAllByText(hostnames[0].hostname)).toHaveLength(2);
+    expect(screen.getAllByText(hostnames[1].hostname)).toHaveLength(2);
+    expect(screen.getAllByText(checkID1)).toHaveLength(1);
+    expect(screen.getAllByText(checkID2)).toHaveLength(1);
   });
 
   it('given provider is VMware, should render ExecutionResults with warning banner', async () => {