fix: THEEDGE-3298 - Remove edge host_type filter from conventional tab (

RedHatInsights#1962) * add host_type filter to remove edge from conventional tab * add validation to systemUpdate filter * move the validation to useUpdateMethodFilter * fix lint * feat(RHIF-254) Add Zero State to Inventory (RedHatInsights#1951) * add feature flag to useUpdateMethod and update test snapshot * update snapshots * move from splice to filter when value not rpm-ostree --------- Co-authored-by: Adonis Puente <[email protected]>
LiorKGOW · Aug 11, 2023 · 3bbe66d · 3bbe66d
1 parent a02e399
commit 3bbe66d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/Utilities/constants.js b/src/Utilities/constants.js
@@ -86,12 +86,14 @@ export const rhcdOptions = [
   { label: 'Inactive', value: 'nil' },
 ];
 
-export const updateMethodOptions = [
+const initUpdateMethodOptions = [
   { label: 'yum', value: 'yum' },
   { label: 'dnf', value: 'dnf' },
   { label: 'rpm-ostree', value: 'rpm-ostree' },
 ];
 
+export const updateMethodOptions = initUpdateMethodOptions;
+
 export function filterToGroup(filter = [], valuesKey = 'values') {
   return filter.reduce(
     (accGroup, group) => ({

diff --git a/src/components/filters/useUpdateMethod.test.js b/src/components/filters/useUpdateMethod.test.js
@@ -4,6 +4,10 @@ import { useUpdateMethodFilter } from './useUpdateMethodFilter';
 import { UPDATE_METHOD_KEY, updateMethodOptions } from '../../Utilities';
 import { mount } from 'enzyme';
 
+jest.mock('../../Utilities/useFeatureFlag', () => ({
+  __esModule: true,
+  default: () => false,
+}));
 const HookRender = ({ hookAccessor, hookNotify }) => {
   const [filter, chip, value, setValue] = useUpdateMethodFilter();
   useEffect(() => {

diff --git a/src/components/filters/useUpdateMethodFilter.js b/src/components/filters/useUpdateMethodFilter.js
@@ -1,5 +1,9 @@
-import { useState } from 'react';
-import { UPDATE_METHOD_KEY, updateMethodOptions } from '../../Utilities/index';
+import { useMemo, useState } from 'react';
+import {
+  UPDATE_METHOD_KEY,
+  updateMethodOptions as defaultUpdateMethodOptions,
+} from '../../Utilities/index';
+import useFeatureFlag from '../../Utilities/useFeatureFlag';
 
 export const updateMethodFilterState = { updateMethodFilter: null };
 export const UPDATE_METHOD_FILTER = 'UPDATE_METHOD_FILTER';
@@ -12,6 +16,15 @@ export const updateMethodFilterReducer = (_state, { type, payload }) => ({
 export const useUpdateMethodFilter = (
   [state, dispatch] = [updateMethodFilterState]
 ) => {
+  const EdgeParityFilterDeviceEnabled = useFeatureFlag(
+    'edgeParity.inventory-list-filter'
+  );
+  const updateMethodOptions = useMemo(() => {
+    return EdgeParityFilterDeviceEnabled
+      ? defaultUpdateMethodOptions.filter(({ value }) => value !== 'rpm-ostree')
+      : defaultUpdateMethodOptions;
+  }, [EdgeParityFilterDeviceEnabled]);
+
   let [filterStateValue, setStateValue] = useState([]);
   const updateMethodValue = dispatch
     ? state.updateMethodFilter

diff --git a/src/routes/InventoryTable.js b/src/routes/InventoryTable.js
@@ -220,7 +220,9 @@ const Inventory = ({
   };
 
   const EdgeParityEnabled = useFeatureFlag('edgeParity.inventory-list');
-
+  const EdgeParityFilterDeviceEnabled = useFeatureFlag(
+    'edgeParity.inventory-list-filter'
+  );
   useEffect(() => {
     chrome.updateDocumentTitle('Systems | Red Hat Insights');
     chrome?.hideGlobalFilter?.(false);
@@ -242,6 +244,7 @@ const Inventory = ({
             ...(workloads?.['Microsoft SQL']?.isSelected && {
               mssql: 'not_nil',
             }),
+            ...(EdgeParityFilterDeviceEnabled && { host_type: 'nil' }),
             ...(SID?.length > 0 && { sap_sids: SID }),
           },
         },