fix(RecsListTable): Fixing the category sorting (#263)

* fix(RecsListTable): Fixing the category sorting * added a test to check sorting * Refactored the compare function * Refactored the code Updated the test * Enchance rule data * [RecsListTable] Fix category test * Updated the test after the discussion with Iker Added a comment that was requested by PM Co-authored-by: Iker Reyes <[email protected]>
RedHatInsights · May 13, 2022 · 41a5c09 · 41a5c09
1 parent c5355c0
commit 41a5c09
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/cypress/fixtures/api/insights-results-aggregator/v2/rule.json b/cypress/fixtures/api/insights-results-aggregator/v2/rule.json
@@ -21,7 +21,7 @@
       "total_risk": 2,
       "impact": 2,
       "likelihood": 2,
-      "tags": ["openshift", "configuration", "service_availability"],
+      "tags": ["openshift", "configuration", "service_availability", "performance"],
       "disabled": false,
       "risk_of_change": 0,
       "impacted_clusters_count": 42
@@ -47,7 +47,7 @@
       "total_risk": 2,
       "impact": 1,
       "likelihood": 4,
-      "tags": ["service_availability", "vsphere", "disk"],
+      "tags": ["service_availability", "vsphere", "disk", "security"],
       "disabled": false,
       "risk_of_change": 0,
       "impacted_clusters_count": 0

diff --git a/src/Components/RecsListTable/RecsListTable.js b/src/Components/RecsListTable/RecsListTable.js
@@ -239,15 +239,18 @@ const RecsListTable = ({ query }) => {
         },
       ]);
   };
-
+  /* the category sorting compares only the first element of the array.
+   Could be refactored later when we assign a priority numbers to each of the category
+   and sort them in the array based on the priority.
+*/
   const buildDisplayedRows = (rows, index, direction) => {
     const sortingRows = [...rows].sort((firstItem, secondItem) => {
       const d = direction === SortByDirection.asc ? 1 : -1;
       const fst = firstItem[0].rule[RECS_LIST_COLUMNS_KEYS[index]];
       const snd = secondItem[0].rule[RECS_LIST_COLUMNS_KEYS[index]];
       if (index === 3) {
-        return extractCategories(fst)[0].localeCompare(
-          extractCategories(snd)[0]
+        return (
+          d * extractCategories(fst)[0].localeCompare(extractCategories(snd)[0])
         );
       }
       return fst > snd ? d : snd > fst ? -d : 0;

diff --git a/src/Components/RecsListTable/RecsListTable.spec.ct.js b/src/Components/RecsListTable/RecsListTable.spec.ct.js
@@ -28,7 +28,7 @@ import {
   itemsPerPage,
 } from '../../../cypress/utils/pagination';
 import { TOTAL_RISK, CATEGORIES } from '../../../cypress/utils/globals';
-import { RECS_LIST_COLUMNS } from '../../AppConstants';
+import { RECS_LIST_COLUMNS, RULE_CATEGORIES } from '../../AppConstants';
 import {
   checkRowCounts,
   columnName2UrlParam,
@@ -368,10 +368,15 @@ describe('successful non-empty recommendations list table', () => {
   });
 
   describe('sorting', () => {
-    // TODO implement category sorting
     _.zip(
-      ['description', 'publish_date', 'total_risk', 'impacted_clusters_count'],
-      ['Name', 'Modified', 'Total risk', 'Clusters'] // TODO use TABLE_HEADERS
+      [
+        'description',
+        'publish_date',
+        'tags',
+        'total_risk',
+        'impacted_clusters_count',
+      ],
+      TABLE_HEADERS
     ).forEach(([category, label]) => {
       SORTING_ORDERS.forEach((order) => {
         it(`${order} by ${label}`, () => {
@@ -399,13 +404,21 @@ describe('successful non-empty recommendations list table', () => {
                 )
               );
           }
-
+          let orderIteratee = category;
+          if (category === 'tags') {
+            orderIteratee = (it) =>
+              _.first(
+                it.tags.filter((string) =>
+                  Object.keys(RULE_CATEGORIES).includes(string)
+                )
+              );
+          }
           // add property name to clusters
           let sortedData = _.map(
             // all tables must preserve original ordering
             _.orderBy(
               _.cloneDeep(filterData(DEFAULT_FILTERS)),
-              [category],
+              [orderIteratee],
               [order === 'ascending' ? 'asc' : 'desc']
             ),
             'description'