fix(OperatingSystemFilter): RHINENG-2912 - Fix OS inventory filter co…

…nversion
RedHatInsights · Jul 22, 2024 · ebb148e · ebb148e
1 parent bafe7f7
commit ebb148e
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 3 deletions.
diff --git a/src/Helpers/Hooks.js b/src/Helpers/Hooks.js
@@ -51,12 +51,24 @@ export const getSortValue = (orderBy, orderDirection) => {
     return `${orderDirection === 'ASC' ? '' : '-'}${orderBy === 'group_name' ? 'inventory_group' : orderBy}`;
 };
 
+export const getOsValue = (osFilter) => {
+    return osFilter && Object.entries(osFilter).flatMap(([majorVersionKey, versions]) => {
+        return Object.entries(versions)
+            .filter(([osKey, value]) => value === true && osKey !== majorVersionKey)
+            .map(([osKey]) => {
+                const osKeyParts = osKey.split('-');
+                return osKeyParts[osKeyParts.length - 1];
+            });
+    }).sort();
+};
+
 export const useGetEntities = (fetchApi, { id, setUrlParams, createRows }) => {
 
     const getEntities = async (
         _items,
         { orderBy, orderDirection, page, per_page: perPage, vulnerabilityParams, filters }
     ) => {
+        const osFilter = getOsValue(filters?.osFilter);
         const params = {
             ...vulnerabilityParams,
             page,
@@ -65,8 +77,8 @@ export const useGetEntities = (fetchApi, { id, setUrlParams, createRows }) => {
             ...filters?.hostGroupFilter ? {
                 group_names: filters.hostGroupFilter.join(',')
             } : {},
-            ...filters?.osFilter?.length > 0 ? {
-                rhel_version: filters.osFilter.map(({ value }) => value).join(',')
+            ...osFilter?.length > 0 ? {
+                rhel_version: osFilter.join(',')
             } : {}
         };
 

diff --git a/src/Helpers/Hooks.test.js b/src/Helpers/Hooks.test.js
@@ -0,0 +1,27 @@
+import {getOsValue} from './Hooks';
+
+describe('getOsValue', function () {
+  it('returns a proper api osFilter when passed', () => {
+     expect(
+       getOsValue({
+           'RHEL-9': {
+             'RHEL-9': true,
+             'RHEL-9-9.5': true,
+             'RHEL-9-9.4': true,
+             'RHEL-9-9.3': true,
+             'RHEL-9-9.2': true,
+             'RHEL-9-9.1': true,
+             'RHEL-9-9.0': true,
+           },
+           'RHEL-8': {
+             'RHEL-8': null,
+             'RHEL-8-8.4': true,
+             'RHEL-8-8.0': true,
+           },
+        })
+     ).toEqual(['8.0', '8.4', '9.5', '9.4', '9.3', '9.2', '9.1', '9.0'].sort());
+   });
+})
+
+// TODO Add test for useGetEntities hook
+
diff --git a/src/Helpers/TableToolbarHelper.js b/src/Helpers/TableToolbarHelper.js
@@ -121,7 +121,7 @@ export const removeFilters = (chips, apply, reset = false, defaultFilters = {})
             obj.cvss_from = undefined;
             obj.cvss_to = undefined;
         }
-        else {
+        else if (item.multiValue) {
             obj[item.key] = item.multiValue.filter(value => !item.chips.some(chip => chip.value === value)).join(',');
         }
 

diff --git a/src/Helpers/TableToolbarHelper.test.js b/src/Helpers/TableToolbarHelper.test.js
@@ -159,6 +159,24 @@ describe('TableToolbarHelper', () => {
         expect(mockApply).toHaveBeenCalledWith({ rule_presence: 'true', page: 1, reset: true });
     });
 
+    it('Should not fail if no key matches or it\'s not a multivalue filter', () => {
+        removeFilters([{
+          "category": "Operating System",
+          "type": "operating_system",
+          "chips": [
+            {
+              "name": "RHEL 9.3",
+              "type": "checkbox",
+              "value": "RHEL-9-9.3",
+              "major": 9,
+              "minor": 3,
+              "groupKey": "RHEL-9"
+            }
+          ]
+        }], mockApply);
+        expect(mockApply).toHaveBeenCalledWith({ page: 1 });
+    });
+
     it('Should remove search filters and multi value filters with only one value safely', () => {
         const mockSingleValueChips = [
             {