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

…nversion
RedHatInsights · Jan 19, 2024 · 30e68b1 · 30e68b1
1 parent 5e9c2cc
commit 30e68b1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Components/SmartComponents/SystemsPage/SystemsPage.js b/src/Components/SmartComponents/SystemsPage/SystemsPage.js
@@ -110,7 +110,7 @@ const SystemsPage = () => {
     };
 
     const doOptOut = useOptOutSystems(onRefreshInventory);
-    const getEntities = useGetEntities(APIHelper.getSystems, {});
+    const getEntities = useGetEntities(APIHelper.getSystems, { setUrlParams });
 
     const [columnCounter, setColumnCount] = useState(0);
     useEffect(() => setColumnCount(columnCounter + 1), [columns]);
@@ -184,7 +184,7 @@ const SystemsPage = () => {
 
                 <Header title={intl.formatMessage(messages.vulnerabilitySystemsHeader)} showBreadcrumb={false} />
                 <Main>
-                    <EdgeDevicesWarning/>
+                    <EdgeDevicesWarning />
                     {isLoadingInventory ? <Spinner centered /> :
                         hasError && !canReadHostsInventory
                             ? <ErrorHandler code={errorCode} />

diff --git a/src/Helpers/Hooks.js b/src/Helpers/Hooks.js
@@ -57,6 +57,16 @@ export const useGetEntities = (fetchApi, { id, setUrlParams, createRows }) => {
         _items,
         { orderBy, orderDirection, page, per_page: perPage, vulnerabilityParams, filters }
     ) => {
+        const osFilter = filters?.osFilter &&
+            Object.entries(filters.osFilter).flatMap(([, versions]) => {
+                // TODO This is very naive
+                return Object.entries(versions)
+                    .filter(([, value]) => value === true)
+                    .map(([osKey]) => {
+                        const osKeyParts = osKey.split('-');
+                        return osKeyParts[osKeyParts.length - 1];
+                    });
+            });
         const params = {
             ...vulnerabilityParams,
             page,
@@ -65,8 +75,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(',')
             } : {}
         };