fix(ESSNTL-4494): Fix group column and filter

Author: gkarat

src/PresentationalComponents/Filters/GroupsFilter.js

@@ -35,8 +35,6 @@ import { useOnSelect, ID_API_ENDPOINTS } from '../../Utilities/useOnSelect';
 import { combineReducers } from 'redux';
 import { systemsColumnsMerger } from '../../Utilities/SystemsHelpers';
 import { useChrome } from '@redhat-cloud-services/frontend-components/useChrome';
-import useGroupsFilter from '../../PresentationalComponents/Filters/GroupsFilter';
-import useFeatureFlag from '../../Utilities/useFeatureFlag';
 
 const Systems = () => {
     const store = useStore();
@@ -85,7 +83,6 @@ const Systems = () => {
         apply(decodedParams);
         return () => dispatch(clearInventoryReducer());
     }, []);
-    const groupsEnabled = useFeatureFlag('hbi.ui.inventory-groups');
 
     const showRemediationModal = useCallback(async (data) => {
         const resolvedData = await data;
@@ -112,8 +109,7 @@ const Systems = () => {
     const [deleteFilters] = useRemoveFilter({ search, ...filter }, apply, systemsListDefaultFilters);
 
     const osFilterConfig = useOsVersionFilter(filter?.os, apply);
-    const groupsFilterConfig = useGroupsFilter(filter?.group_name, apply, groupsEnabled);
-    const filterConfig = buildFilterConfig(search, filter, apply, osFilterConfig, groupsFilterConfig, groupsEnabled);
+    const filterConfig = buildFilterConfig(search, filter, apply, osFilterConfig);
 
     const activeFiltersConfig = buildActiveFiltersConfig(filter, search, deleteFilters);
 
@@ -168,7 +164,7 @@ const Systems = () => {
                         isFullView
                         autoRefresh
                         initialLoading
-                        hideFilters={{ all: true, tags: false }}
+                        hideFilters={{ all: true, tags: false, hostGroupFilter: false }}
                         columns={(defaultColumns) => systemsColumnsMerger(defaultColumns, systemsListColumns)}
                         showTags
                         customFilters={{

src/SmartComponents/Systems/Systems.js

@@ -966,6 +966,7 @@ exports[`Systems.js should match the snapshot 1`] = `
               hideFilters={
                 Object {
                   "all": true,
+                  "hostGroupFilter": false,
                   "tags": false,
                 }
               }

src/SmartComponents/Systems/__snapshots__/System.test.js.snap

@@ -259,9 +259,9 @@ export const encodeParams = (parameters, shouldTranslateKeys) => {
         return result;
     };
 
-    let { filter, systemProfile = {}, ...allParams } = parameters;
+    let { filter, systemProfile = {}, group_name, ...allParams } = parameters;
 
-    allParams = { ...allParams, ...flattenFilters(filter) };
+    allParams = { ...allParams, ...flattenFilters({ ...filter, ...(group_name ? { group_name } : {}) }) };
     let params = [];
     Object.keys(allParams).forEach(key => {
         const argKey = encodeURIComponent(key);

src/Utilities/Helpers.js

@@ -199,6 +199,11 @@ export const useGetEntities = (fetchApi, apply, config, setSearchParams, applyMe
             page,
             perPage,
             ...patchParams,
+            filter: {
+                ...patchParams.filter,
+                ...(Array.isArray(filters.hostGroupFilter) && filters.hostGroupFilter.length > 0
+                    ? { group_name: filters.hostGroupFilter }
+                    : {}) },
             selectedTags: [...activeTags, ...selectedTags],
             sort,
             ...id && { id } || {},

src/Utilities/Hooks.js

@@ -10,7 +10,7 @@ import { defaultCompoundSortValues } from './constants';
 import { patchSetDetailColumns } from '../SmartComponents/PatchSetDetail/PatchSetDetailAssets';
 import { InsightsLink } from '@redhat-cloud-services/frontend-components/InsightsLink';
 
-export const buildFilterConfig = (search, filter, apply, osFilterConfig, groupsFilterConfig, isGroupsEnabled) => {
+export const buildFilterConfig = (search, filter, apply, osFilterConfig) => {
     return {
         items: [
             searchFilter(
@@ -23,8 +23,7 @@ export const buildFilterConfig = (search, filter, apply, osFilterConfig, groupsF
             ),
             staleFilter(apply, filter),
             systemsUpdatableFilter(apply, filter),
-            ...osFilterConfig,
-            ...(isGroupsEnabled  ? [groupsFilterConfig] : [])
+            ...osFilterConfig
         ]
     };
 };