refactor(rhsmConstants): sw-690 remove rhsmApiTypes (#1002)

RedHatInsights · Nov 18, 2022 · e780a6d · e780a6d
1 parent 736aa33
commit e780a6d
Show file tree

Hide file tree

Showing 29 changed files with 166 additions and 164 deletions.
diff --git a/src/common/__tests__/dateHelpers.test.js b/src/common/__tests__/dateHelpers.test.js
@@ -5,7 +5,7 @@ import {
   getRangedDateTime,
   getRangedMonthDateTime
 } from '../dateHelpers';
-import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES } from '../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES } from '../../services/rhsm/rhsmConstants';
 
 describe('DateHelpers', () => {
   it('should have specific functions', () => {

diff --git a/src/common/dateHelpers.js b/src/common/dateHelpers.js
@@ -1,6 +1,6 @@
 import moment from 'moment/moment';
 import { helpers } from './helpers';
-import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES } from '../types/rhsmApiTypes';
+import { RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES } from '../services/rhsm/rhsmConstants';
 import { translate } from '../components/i18n/i18n';
 
 /**

diff --git a/src/components/authentication/__tests__/authentication.test.js b/src/components/authentication/__tests__/authentication.test.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { helpers } from '../../../common';
 import { Authentication } from '../authentication';
-import { rhsmApiTypes } from '../../../types';
+import { rhsmConstants } from '../../../services/rhsm/rhsmConstants';
 
 describe('Authentication Component', () => {
   it('should render a basic component', async () => {
@@ -76,7 +76,7 @@ describe('Authentication Component', () => {
         pending: false,
         data: {
           authorized: {},
-          errorCodes: [rhsmApiTypes.RHSM_API_RESPONSE_ERROR_DATA_CODE_TYPES.OPTIN],
+          errorCodes: [rhsmConstants.RHSM_API_RESPONSE_ERRORS_CODE_TYPES.OPTIN],
           errorStatus: 403
         }
       })

diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
@@ -448,27 +448,27 @@ exports[`I18n Component should generate a predictable locale key output snapshot
     "keys": [
       {
         "key": "curiosity-toolbar.category",
-        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.GRANULARITY })",
+        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.GRANULARITY })",
       },
       {
         "key": "curiosity-toolbar.category",
         "match": "translate('curiosity-toolbar.category', { context: 'rangedMonthly' })",
       },
       {
         "key": "curiosity-toolbar.category",
-        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.UOM })",
+        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.UOM })",
       },
       {
         "key": "curiosity-toolbar.category",
-        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.BILLING_PROVIDER })",
+        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.BILLING_PROVIDER })",
       },
       {
         "key": "curiosity-toolbar.category",
-        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.SLA })",
+        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.SLA })",
       },
       {
         "key": "curiosity-toolbar.category",
-        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_TYPES.USAGE })",
+        "match": "translate('curiosity-toolbar.category', { context: RHSM_API_QUERY_SET_TYPES.USAGE })",
       },
       {
         "key": "curiosity-toolbar.placeholder_filter",

diff --git a/src/components/inventoryCard/__tests__/inventoryCardHelpers.test.js b/src/components/inventoryCard/__tests__/inventoryCardHelpers.test.js
@@ -7,9 +7,9 @@ import {
   parseRowCellsListData
 } from '../inventoryCardHelpers';
 import {
-  RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
-  RHSM_API_QUERY_TYPES
-} from '../../../types/rhsmApiTypes';
+  RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
+  RHSM_API_QUERY_SET_TYPES
+} from '../../../services/rhsm/rhsmConstants';
 
 describe('InventoryListHelpers', () => {
   it('should have specific functions', () => {
@@ -188,12 +188,12 @@ describe('InventoryListHelpers', () => {
       ascending: applySortFilters({
         filter,
         onSort: () => {},
-        query: { [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING }
+        query: { [RHSM_API_QUERY_SET_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING }
       }),
       descending: applySortFilters({
         filter,
         onSort: () => {},
-        query: { [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.DESCENDING }
+        query: { [RHSM_API_QUERY_SET_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.DESCENDING }
       })
     }).toMatchSnapshot('sortable, direction');
 
@@ -202,8 +202,8 @@ describe('InventoryListHelpers', () => {
         filter,
         onSort: () => {},
         query: {
-          [RHSM_API_QUERY_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,
-          [RHSM_API_QUERY_TYPES.SORT]: 'lorem'
+          [RHSM_API_QUERY_SET_TYPES.DIRECTION]: SORT_DIRECTION_TYPES.ASCENDING,
+          [RHSM_API_QUERY_SET_TYPES.SORT]: 'lorem'
         }
       })
     ).toMatchSnapshot('sortable, active column');

diff --git a/src/components/inventoryCard/inventoryCardHelpers.js b/src/components/inventoryCard/inventoryCardHelpers.js
@@ -5,9 +5,9 @@ import _isPlainObject from 'lodash/isPlainObject';
 import { Tooltip } from '../tooltip/tooltip';
 import { translate } from '../i18n/i18n';
 import {
-  RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
-  RHSM_API_QUERY_TYPES
-} from '../../types/rhsmApiTypes';
+  RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
+  RHSM_API_QUERY_SET_TYPES
+} from '../../services/rhsm/rhsmConstants';
 import { helpers } from '../../common';
 
 /**
@@ -188,15 +188,16 @@ const applySortFilters = ({ filter = {}, onSort, query = {} } = {}) => {
   if (
     hasSort &&
     typeof updatedFilter.sortActive !== 'boolean' &&
-    query?.[RHSM_API_QUERY_TYPES.SORT] &&
-    (query?.[RHSM_API_QUERY_TYPES.SORT] === updatedId || _camelCase(query?.[RHSM_API_QUERY_TYPES.SORT]) === updatedId)
+    query?.[RHSM_API_QUERY_SET_TYPES.SORT] &&
+    (query?.[RHSM_API_QUERY_SET_TYPES.SORT] === updatedId ||
+      _camelCase(query?.[RHSM_API_QUERY_SET_TYPES.SORT]) === updatedId)
   ) {
     updatedFilter.sortActive = true;
   }
 
   // set sort direction
-  if (hasSort && !updatedFilter.sortDirection && query?.[RHSM_API_QUERY_TYPES.DIRECTION]) {
-    switch (query?.[RHSM_API_QUERY_TYPES.DIRECTION]) {
+  if (hasSort && !updatedFilter.sortDirection && query?.[RHSM_API_QUERY_SET_TYPES.DIRECTION]) {
+    switch (query?.[RHSM_API_QUERY_SET_TYPES.DIRECTION]) {
       case SORT_DIRECTION_TYPES.DESCENDING:
         updatedFilter.sortDirection = SortByDirection.desc;
         break;
@@ -209,7 +210,7 @@ const applySortFilters = ({ filter = {}, onSort, query = {} } = {}) => {
   if (
     hasSort &&
     !updatedFilter.sortActive &&
-    !query?.[RHSM_API_QUERY_TYPES.SORT] &&
+    !query?.[RHSM_API_QUERY_SET_TYPES.SORT] &&
     updatedFilter.isSortDefault === true
   ) {
     updatedFilter.sortActive = true;

diff --git a/src/components/productView/__tests__/productViewContext.test.js b/src/components/productView/__tests__/productViewContext.test.js
@@ -14,7 +14,7 @@ import {
   useProductInventorySubscriptionsConfig,
   useProductToolbarConfig
 } from '../productViewContext';
-import { rhsmApiTypes } from '../../../types/rhsmApiTypes';
+import { rhsmConstants } from '../../../services/rhsm/rhsmConstants';
 import { config as openshiftContainerConfig } from '../../../config/product.openshiftContainer';
 
 describe('ProductViewContext', () => {
@@ -39,10 +39,10 @@ describe('ProductViewContext', () => {
   it('should apply hooks for retrieving specific api queries', () => {
     const mockContextValue = {
       query: { lorem: 'ipsum' },
-      graphTallyQuery: { [rhsmApiTypes.RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES.GRANULARITY]: 'testGranularity' },
-      inventoryGuestsQuery: { [rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_GUESTS_TYPES.OFFSET]: 'testOffset' },
-      inventoryHostsQuery: { [rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_TYPES.LIMIT]: 'testLimit' },
-      inventorySubscriptionsQuery: { [rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_SUBSCRIPTIONS_TYPES.SLA]: 'testSla' },
+      graphTallyQuery: { [rhsmConstants.RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES.GRANULARITY]: 'testGranularity' },
+      inventoryGuestsQuery: { [rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES.OFFSET]: 'testOffset' },
+      inventoryHostsQuery: { [rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES.LIMIT]: 'testLimit' },
+      inventorySubscriptionsQuery: { [rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES.SLA]: 'testSla' },
       productId: 'lorem',
       viewId: 'viewIpsum'
     };
@@ -89,7 +89,7 @@ describe('ProductViewContext', () => {
     const { result: openshiftUomCores } = shallowHook(() =>
       useProductContext({
         useProductQuery: () => ({
-          [rhsmApiTypes.RHSM_API_QUERY_TYPES.UOM]: rhsmApiTypes.RHSM_API_QUERY_UOM_TYPES.CORES
+          [rhsmConstants.RHSM_API_QUERY_SET_TYPES.UOM]: rhsmConstants.RHSM_API_QUERY_UOM_TYPES.CORES
         }),
         useProductViewContext: () => openshiftContainerConfig
       })
@@ -99,7 +99,7 @@ describe('ProductViewContext', () => {
     const { result: openshiftUomSockets } = shallowHook(() =>
       useProductContext({
         useProductQuery: () => ({
-          [rhsmApiTypes.RHSM_API_QUERY_TYPES.UOM]: rhsmApiTypes.RHSM_API_QUERY_UOM_TYPES.SOCKETS
+          [rhsmConstants.RHSM_API_QUERY_SET_TYPES.UOM]: rhsmConstants.RHSM_API_QUERY_UOM_TYPES.SOCKETS
         }),
         useProductViewContext: () => openshiftContainerConfig
       })

diff --git a/src/components/productView/productViewContext.js b/src/components/productView/productViewContext.js
@@ -1,8 +1,7 @@
 import React, { useCallback, useContext } from 'react';
 import { reduxHelpers } from '../../redux/common';
 import { storeHooks } from '../../redux/hooks';
-import { RHSM_API_QUERY_TYPES, rhsmApiTypes } from '../../types/rhsmApiTypes';
-import { RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants';
+import { rhsmConstants, RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants';
 import { helpers } from '../../common/helpers';
 
 /**
@@ -68,7 +67,7 @@ const useProductQuery = ({ queryType = 'query', options } = {}) => useProductQue
  */
 const useProductGraphTallyQuery = ({
   queryType = 'graphTallyQuery',
-  schemaCheck = rhsmApiTypes.RHSM_API_QUERY_SET_REPORT_CAPACITY_TYPES,
+  schemaCheck = rhsmConstants.RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES,
   options
 } = {}) =>
   reduxHelpers.setApiQuery(
@@ -94,7 +93,7 @@ const useProductInventoryGuestsQuery = ({
   defaultLimit = 100,
   defaultOffset = 0,
   queryType = 'inventoryGuestsQuery',
-  schemaCheck = rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_GUESTS_TYPES,
+  schemaCheck = rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES,
   options
 } = {}) =>
   reduxHelpers.setApiQuery(
@@ -118,7 +117,7 @@ const useProductInventoryGuestsQuery = ({
  */
 const useProductInventoryHostsQuery = ({
   queryType = 'inventoryHostsQuery',
-  schemaCheck = rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_TYPES,
+  schemaCheck = rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES,
   options
 } = {}) =>
   reduxHelpers.setApiQuery(
@@ -140,7 +139,7 @@ const useProductInventoryHostsQuery = ({
  */
 const useProductInventorySubscriptionsQuery = ({
   queryType = 'inventorySubscriptionsQuery',
-  schemaCheck = rhsmApiTypes.RHSM_API_QUERY_SET_INVENTORY_TYPES,
+  schemaCheck = rhsmConstants.RHSM_API_QUERY_SET_INVENTORY_TYPES,
   options
 } = {}) =>
   reduxHelpers.setApiQuery(
@@ -163,7 +162,7 @@ const useProductContext = ({
   useProductQuery: useAliasProductQuery = useProductQuery,
   useProductViewContext: useAliasProductViewContext = useProductViewContext
 } = {}) => {
-  const { [RHSM_API_QUERY_TYPES.UOM]: uomFilter } = useAliasProductQuery();
+  const { [RHSM_API_QUERY_SET_TYPES.UOM]: uomFilter } = useAliasProductQuery();
   const {
     initialGraphFilters = [],
     initialInventoryFilters = [],

diff --git a/src/components/toolbar/__tests__/toolbar.test.js b/src/components/toolbar/__tests__/toolbar.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { ToolbarFilter } from '@patternfly/react-core';
 import { Toolbar } from '../toolbar';
-import { RHSM_API_QUERY_SLA_TYPES, RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SLA_TYPES, RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants';
 import { toolbarFieldOptions as selectCategoryOptions } from '../toolbarFieldSelectCategory';
 
 describe('Toolbar Component', () => {
@@ -48,7 +48,7 @@ describe('Toolbar Component', () => {
   it('should handle updating toolbar chips', () => {
     const props = {
       useSelectCategoryOptions: () => ({ options: [selectCategoryOptions[4]] }),
-      useToolbarFieldQueries: () => ({ [RHSM_API_QUERY_TYPES.SLA]: RHSM_API_QUERY_SLA_TYPES.PREMIUM })
+      useToolbarFieldQueries: () => ({ [RHSM_API_QUERY_SET_TYPES.SLA]: RHSM_API_QUERY_SLA_TYPES.PREMIUM })
     };
     const component = shallow(<Toolbar {...props} />);
 

diff --git a/src/components/toolbar/__tests__/toolbarFieldDisplayName.test.js b/src/components/toolbar/__tests__/toolbarFieldDisplayName.test.js
@@ -4,7 +4,7 @@ import { ToolbarFieldDisplayName } from '../toolbarFieldDisplayName';
 import { store } from '../../../redux/store';
 import { TextInput } from '../../form/textInput';
 import { helpers } from '../../../common/helpers';
-import { RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldDisplayName Component', () => {
   let mockDispatch;
@@ -20,7 +20,7 @@ describe('ToolbarFieldDisplayName Component', () => {
   it('should render a basic component', () => {
     const props = {
       useProduct: () => ({ viewId: 'loremIpsum' }),
-      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
+      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
     };
     const component = shallow(<ToolbarFieldDisplayName {...props} />);
 
@@ -30,7 +30,7 @@ describe('ToolbarFieldDisplayName Component', () => {
   it('should handle updating display name through redux state', () => {
     const props = {
       useProduct: () => ({ viewId: 'loremIpsum' }),
-      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
+      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
     };
 
     const component = shallow(<ToolbarFieldDisplayName {...props} />);
@@ -43,7 +43,7 @@ describe('ToolbarFieldDisplayName Component', () => {
   it('should handle updating display name using the enter key', async () => {
     const props = {
       useProduct: () => ({ viewId: 'loremIpsum' }),
-      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
+      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
     };
 
     const component = await mountHookComponent(<ToolbarFieldDisplayName {...props} />);
@@ -56,7 +56,7 @@ describe('ToolbarFieldDisplayName Component', () => {
   it('should handle clearing display name through redux state', async () => {
     const props = {
       useProduct: () => ({ viewId: 'loremIpsum' }),
-      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
+      useProductInventoryHostsQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.DISPLAY_NAME]: 'lorem ipsum' })
     };
 
     const component = await mountHookComponent(<ToolbarFieldDisplayName {...props} />);

diff --git a/src/components/toolbar/__tests__/toolbarFieldGranularity.test.js b/src/components/toolbar/__tests__/toolbarFieldGranularity.test.js
@@ -4,8 +4,8 @@ import { ToolbarFieldGranularity, toolbarFieldOptions, useOnSelect } from '../to
 import { store } from '../../../redux/store';
 import {
   RHSM_API_QUERY_GRANULARITY_TYPES as GRANULARITY_TYPES,
-  RHSM_API_QUERY_TYPES
-} from '../../../types/rhsmApiTypes';
+  RHSM_API_QUERY_SET_TYPES
+} from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldGranularity Component', () => {
   let mockDispatch;
@@ -20,7 +20,7 @@ describe('ToolbarFieldGranularity Component', () => {
 
   it('should render a basic component', () => {
     const props = {
-      useProductGraphTallyQuery: () => ({ [RHSM_API_QUERY_TYPES.GRANULARITY]: GRANULARITY_TYPES.WEEKLY })
+      useProductGraphTallyQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.GRANULARITY]: GRANULARITY_TYPES.WEEKLY })
     };
     const component = shallow(<ToolbarFieldGranularity {...props} />);
 

diff --git a/src/components/toolbar/__tests__/toolbarFieldRangedMonthly.test.js b/src/components/toolbar/__tests__/toolbarFieldRangedMonthly.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { ToolbarFieldRangedMonthly, toolbarFieldOptions, useOnSelect } from '../toolbarFieldRangedMonthly';
 import { store } from '../../../redux/store';
-import { RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldRangedMonthly Component', () => {
   let mockDispatch;
@@ -18,7 +18,7 @@ describe('ToolbarFieldRangedMonthly Component', () => {
   it('should render a basic component', () => {
     const props = {
       useProductGraphTallyQuery: () => ({
-        [RHSM_API_QUERY_TYPES.START_DATE]: 't(curiosity-toolbar.granularityRangedMonthly, {"context":"current"})'
+        [RHSM_API_QUERY_SET_TYPES.START_DATE]: 't(curiosity-toolbar.granularityRangedMonthly, {"context":"current"})'
       })
     };
     const component = shallow(<ToolbarFieldRangedMonthly {...props} />);
@@ -32,7 +32,7 @@ describe('ToolbarFieldRangedMonthly Component', () => {
 
   it('should handle selecting an option directly', () => {
     const props = {
-      useProductGraphTallyQuery: () => ({ [RHSM_API_QUERY_TYPES.START_DATE]: '2018-08-01T00:00:00.000Z' })
+      useProductGraphTallyQuery: () => ({ [RHSM_API_QUERY_SET_TYPES.START_DATE]: '2018-08-01T00:00:00.000Z' })
     };
     const component = shallow(<ToolbarFieldRangedMonthly {...props} />);
 

diff --git a/src/components/toolbar/__tests__/toolbarFieldSelectCategory.test.js b/src/components/toolbar/__tests__/toolbarFieldSelectCategory.test.js
@@ -8,7 +8,7 @@ import {
   toolbarFieldOptions as selectCategoryOptions
 } from '../toolbarFieldSelectCategory';
 import { store } from '../../../redux/store';
-import { RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';
+import { RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants';
 
 describe('ToolbarFieldSelectCategory Component', () => {
   let mockDispatch;
@@ -25,7 +25,7 @@ describe('ToolbarFieldSelectCategory Component', () => {
     const props = {
       useSelectCategoryOptions: () => ({
         options: [selectCategoryOptions[4], selectCategoryOptions[5]],
-        currentCategory: RHSM_API_QUERY_TYPES.SLA
+        currentCategory: RHSM_API_QUERY_SET_TYPES.SLA
       })
     };
     const component = shallow(<ToolbarFieldSelectCategory {...props} />);
@@ -70,7 +70,7 @@ describe('ToolbarFieldSelectCategory Component', () => {
     const options = {
       useProduct: () => ({ viewId: 'loremIpsum' }),
       useProductToolbarConfig: () => ({
-        filters: [{ id: RHSM_API_QUERY_TYPES.USAGE, selected: true }, { id: RHSM_API_QUERY_TYPES.SLA }]
+        filters: [{ id: RHSM_API_QUERY_SET_TYPES.USAGE, selected: true }, { id: RHSM_API_QUERY_SET_TYPES.SLA }]
       }),
       useSelector: () => ({ currentFilter: undefined })
     };
@@ -80,7 +80,7 @@ describe('ToolbarFieldSelectCategory Component', () => {
     expect(initialResult).toMatchSnapshot('options, initialCategory, hook');
 
     const { result: updatedResult } = shallowHook(() =>
-      useSelectCategoryOptions({ ...options, useSelector: () => ({ currentFilter: RHSM_API_QUERY_TYPES.SLA }) })
+      useSelectCategoryOptions({ ...options, useSelector: () => ({ currentFilter: RHSM_API_QUERY_SET_TYPES.SLA }) })
     );
 
     expect(updatedResult).toMatchSnapshot('options, currentCategory, hook');