From 01e5eb2322d6dcb7fc98bf07d6426a1e4892f3bd Mon Sep 17 00:00:00 2001 From: CD Cabrera Date: Thu, 20 Apr 2023 11:32:22 -0400 Subject: [PATCH] refactor(toolbarFieldArchitecture): sw-748 remove component (#1097) --- public/locales/en-US.json | 3 - src/components/README.md | 112 -------------- .../__tests__/__snapshots__/i18n.test.js.snap | 29 ---- .../productViewContext.test.js.snap | 1 - .../productView/productViewContext.js | 6 +- .../__snapshots__/toolbarContext.test.js.snap | 42 ------ .../toolbarFieldArchitecture.test.js.snap | 96 ------------ .../toolbarFieldSelectCategory.test.js.snap | 8 - .../toolbar/__tests__/toolbarContext.test.js | 3 - .../toolbarFieldArchitecture.test.js | 79 ---------- .../__tests__/toolbarFieldVariant.test.js | 2 +- src/components/toolbar/toolbar.js | 1 - src/components/toolbar/toolbarContext.js | 15 -- .../toolbar/toolbarFieldArchitecture.js | 142 ------------------ .../toolbar/toolbarFieldSelectCategory.js | 10 -- .../__snapshots__/products.test.js.snap | 54 +++---- src/config/__tests__/products.test.js | 2 +- src/config/products.js | 23 +-- .../__snapshots__/rhsmConstants.test.js.snap | 12 -- .../__snapshots__/rhsmHelpers.test.js.snap | 2 - .../rhsm/__tests__/rhsmHelpers.test.js | 4 - src/services/rhsm/rhsmConstants.js | 80 +++++----- src/services/rhsm/rhsmHelpers.js | 4 - tests/__snapshots__/dist.test.js.snap | 2 - 24 files changed, 73 insertions(+), 659 deletions(-) delete mode 100644 src/components/toolbar/__tests__/__snapshots__/toolbarFieldArchitecture.test.js.snap delete mode 100644 src/components/toolbar/__tests__/toolbarFieldArchitecture.test.js delete mode 100644 src/components/toolbar/toolbarFieldArchitecture.js diff --git a/public/locales/en-US.json b/public/locales/en-US.json index 66cd8d119..4337d94ed 100644 --- a/public/locales/en-US.json +++ b/public/locales/en-US.json @@ -225,7 +225,6 @@ "button_displayName": "Search button for name", "clearFilters": "Reset filters", "label": "", - "label_architecture": "", "label_billing_provider": "", "label_billing_provider_none": "None", "label_billing_provider_aws": "Amazon Web Services", @@ -238,7 +237,6 @@ "label_category_physical": "Physical", "label_category_virtual": "Virtual", "label_filter": "Filter by", - "label_filter_architecture": "Variant", "label_filter_billing_provider": "Purchased through", "label_filter_category": "Type", "label_filter_granularity": "Granularity", @@ -284,7 +282,6 @@ "placeholder_uom": "Select unit", "placeholder_usage": "Select usage", "placeholder_filter": "Filter by", - "placeholder_filter_architecture": "Filter by variant", "placeholder_filter_billing_provider": "Filter by purchased through", "placeholder_filter_category": "Filter by type", "placeholder_filter_displayName": "Filter by name", diff --git a/src/components/README.md b/src/components/README.md index e75a4692f..9cb659df5 100644 --- a/src/components/README.md +++ b/src/components/README.md @@ -147,9 +147,6 @@
ToolbarContext
-
ToolbarFieldArchitecture
-

A standalone Architecture select filter.

-
ToolbarFieldBillingProvider

A standalone Billing Provider select filter.

@@ -6023,8 +6020,6 @@ Primary view toolbar. ToolbarContextmodule - ToolbarFieldArchitecturemodule - ToolbarFieldBillingProvidermodule ToolbarFieldCategorymodule @@ -6185,8 +6180,6 @@ Clear a specific toolbar category using a select component's OnSelect hook. optionsobject - options.useArchitectureOnSelectfunction - options.useBillingProviderOnSelectfunction options.useCategoryOnSelectfunction @@ -6217,8 +6210,6 @@ Clear all available toolbar categories. options.useProductQueryfunction - options.useArchitectureOnSelectfunction - options.useSelectCategoryOnSelectfunction options.useBillingProviderOnSelectfunction @@ -6255,109 +6246,6 @@ Return lists of item and secondary toolbar fields for display. - - -## ToolbarFieldArchitecture -A standalone Architecture select filter. - - -* [ToolbarFieldArchitecture](#Toolbar.module_ToolbarFieldArchitecture) - * [~useToolbarFieldOptions(options)](#Toolbar.module_ToolbarFieldArchitecture..useToolbarFieldOptions) ⇒ function - * [~useOnSelect(options)](#Toolbar.module_ToolbarFieldArchitecture..useOnSelect) ⇒ function - * [~ToolbarFieldArchitecture(props)](#Toolbar.module_ToolbarFieldArchitecture..ToolbarFieldArchitecture) ⇒ React.ReactNode - * [.propTypes](#Toolbar.module_ToolbarFieldArchitecture..ToolbarFieldArchitecture.propTypes) : Object - * [.defaultProps](#Toolbar.module_ToolbarFieldArchitecture..ToolbarFieldArchitecture.defaultProps) : Object - - - -### ToolbarFieldArchitecture~useToolbarFieldOptions(options) ⇒ function -Generate select field options from config - -**Kind**: inner method of [ToolbarFieldArchitecture](#Toolbar.module_ToolbarFieldArchitecture) - - - - - - - - - - - - -
ParamType
optionsobject
options.useProductfunction
- - - -### ToolbarFieldArchitecture~useOnSelect(options) ⇒ function -On select update. - -**Kind**: inner method of [ToolbarFieldArchitecture](#Toolbar.module_ToolbarFieldArchitecture) - - - - - - - - - - - - - - -
ParamType
optionsobject
options.useDispatchfunction
options.useProductfunction
- - - -### ToolbarFieldArchitecture~ToolbarFieldArchitecture(props) ⇒ React.ReactNode -Display an architecture field with generated options. - -**Kind**: inner method of [ToolbarFieldArchitecture](#Toolbar.module_ToolbarFieldArchitecture) -**Emits**: event:onSelect - - - - - - - - - - - - - - - - - - - - - - -
ParamType
propsobject
props.isFilterboolean
props.positionstring
props.tfunction
props.useOnSelectfunction
props.useProductToolbarQueryfunction
props.useToolbarFieldOptionsfunction
- - -* [~ToolbarFieldArchitecture(props)](#Toolbar.module_ToolbarFieldArchitecture..ToolbarFieldArchitecture) ⇒ React.ReactNode - * [.propTypes](#Toolbar.module_ToolbarFieldArchitecture..ToolbarFieldArchitecture.propTypes) : Object - * [.defaultProps](#Toolbar.module_ToolbarFieldArchitecture..ToolbarFieldArchitecture.defaultProps) : Object - - - -#### ToolbarFieldArchitecture.propTypes : Object -Prop types. - -**Kind**: static property of [ToolbarFieldArchitecture](#Toolbar.module_ToolbarFieldArchitecture..ToolbarFieldArchitecture) - - -#### ToolbarFieldArchitecture.defaultProps : Object -Default props. - -**Kind**: static property of [ToolbarFieldArchitecture](#Toolbar.module_ToolbarFieldArchitecture..ToolbarFieldArchitecture) ## ToolbarFieldBillingProvider diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap index ef8380b6d..84ae8e574 100644 --- a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap +++ b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap @@ -308,23 +308,6 @@ exports[`I18n Component should generate a predictable locale key output snapshot }, ], }, - { - "file": "src/components/toolbar/toolbarFieldArchitecture.js", - "keys": [ - { - "key": "curiosity-toolbar.label", - "match": "translate('curiosity-toolbar.label', { context: ['architecture', (type === '' && 'none')", - }, - { - "key": "curiosity-toolbar.placeholder", - "match": "t('curiosity-toolbar.placeholder', { context: [isFilter && 'filter', 'architecture'] })", - }, - { - "key": "curiosity-toolbar.placeholder", - "match": "t('curiosity-toolbar.placeholder', { context: [isFilter && 'filter', 'architecture'] })", - }, - ], - }, { "file": "src/components/toolbar/toolbarFieldBillingProvider.js", "keys": [ @@ -437,10 +420,6 @@ exports[`I18n Component should generate a predictable locale key output snapshot "key": "curiosity-toolbar.label", "match": "translate('curiosity-toolbar.label', { context: ['filter', RHSM_API_QUERY_SET_TYPES.VARIANT] })", }, - { - "key": "curiosity-toolbar.label", - "match": "translate('curiosity-toolbar.label', { context: ['filter', RHSM_API_QUERY_SET_TYPES.ARCHITECTURE] })", - }, { "key": "curiosity-toolbar.placeholder", "match": "t('curiosity-toolbar.placeholder', { context: ['filter'] })", @@ -833,10 +812,6 @@ exports[`I18n Component should have locale keys that exist in the default langua "file": "src/components/toolbar/toolbar.js", "key": "curiosity-toolbar.label", }, - { - "file": "src/components/toolbar/toolbarFieldArchitecture.js", - "key": "curiosity-toolbar.label", - }, { "file": "src/components/toolbar/toolbarFieldBillingProvider.js", "key": "curiosity-toolbar.label", @@ -881,10 +856,6 @@ exports[`I18n Component should have locale keys that exist in the default langua "file": "src/components/toolbar/toolbarFieldSelectCategory.js", "key": "curiosity-toolbar.label", }, - { - "file": "src/components/toolbar/toolbarFieldSelectCategory.js", - "key": "curiosity-toolbar.label", - }, { "file": "src/components/toolbar/toolbarFieldSla.js", "key": "curiosity-toolbar.label", diff --git a/src/components/productView/__tests__/__snapshots__/productViewContext.test.js.snap b/src/components/productView/__tests__/__snapshots__/productViewContext.test.js.snap index 27b3e574a..85c9afff8 100644 --- a/src/components/productView/__tests__/__snapshots__/productViewContext.test.js.snap +++ b/src/components/productView/__tests__/__snapshots__/productViewContext.test.js.snap @@ -360,7 +360,6 @@ exports[`ProductViewContext should apply hooks for retrieving specific api queri exports[`ProductViewContext should apply hooks for retrieving specific config filters and settings: productConfig 1`] = ` { - "productArchitectures": undefined, "productGroup": "loremIpsum", "productId": "lorem", "productLabel": "labelLorem", diff --git a/src/components/productView/productViewContext.js b/src/components/productView/productViewContext.js index 1747a4729..5fc3bc02c 100644 --- a/src/components/productView/productViewContext.js +++ b/src/components/productView/productViewContext.js @@ -283,13 +283,11 @@ const useProductContext = ({ * * @param {object} options * @param {Function} options.useProductViewContext - * @returns {{productLabel, viewId, productId, productGroup, productVariants, productArchitectures}} + * @returns {{productLabel, viewId, productId, productGroup, productVariants}} */ const useProduct = ({ useProductViewContext: useAliasProductViewContext = useProductViewContext } = {}) => { - const { productArchitectures, productGroup, productId, productLabel, productVariants, viewId } = - useAliasProductViewContext(); + const { productGroup, productId, productLabel, productVariants, viewId } = useAliasProductViewContext(); return { - productArchitectures, productGroup, productId, productLabel, diff --git a/src/components/toolbar/__tests__/__snapshots__/toolbarContext.test.js.snap b/src/components/toolbar/__tests__/__snapshots__/toolbarContext.test.js.snap index d15da85ad..c9f215c0a 100644 --- a/src/components/toolbar/__tests__/__snapshots__/toolbarContext.test.js.snap +++ b/src/components/toolbar/__tests__/__snapshots__/toolbarContext.test.js.snap @@ -2,20 +2,6 @@ exports[`ToolbarContext should apply a hook for clearing a toolbar field through redux: clear single field 1`] = ` [ - [ - [ - { - "type": "SET_QUERY_RESET_INVENTORY_LIST", - "viewId": undefined, - }, - { - "filter": "architecture", - "type": "SET_QUERY", - "value": null, - "viewId": undefined, - }, - ], - ], [ [ { @@ -93,20 +79,6 @@ exports[`ToolbarContext should apply a hook for clearing a toolbar field through exports[`ToolbarContext should apply a hook for clearing specific active toolbar fields through redux: clear all fields 1`] = ` [ - [ - [ - { - "type": "SET_QUERY_RESET_INVENTORY_LIST", - "viewId": undefined, - }, - { - "filter": "architecture", - "type": "SET_QUERY", - "value": null, - "viewId": undefined, - }, - ], - ], [ [ { @@ -179,20 +151,6 @@ exports[`ToolbarContext should apply a hook for clearing specific active toolbar }, ], ], - [ - [ - { - "type": "SET_QUERY_RESET_INVENTORY_LIST", - "viewId": undefined, - }, - { - "filter": "architecture", - "type": "SET_QUERY", - "value": null, - "viewId": undefined, - }, - ], - ], [ [ { diff --git a/src/components/toolbar/__tests__/__snapshots__/toolbarFieldArchitecture.test.js.snap b/src/components/toolbar/__tests__/__snapshots__/toolbarFieldArchitecture.test.js.snap deleted file mode 100644 index c2696d389..000000000 --- a/src/components/toolbar/__tests__/__snapshots__/toolbarFieldArchitecture.test.js.snap +++ /dev/null @@ -1,96 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`ToolbarFieldArchitecture Component should generate select options: toolbarFieldOptions 1`] = ` -[ - { - "selected": false, - "title": "t(curiosity-toolbar.label_architecture, {"context":"lorem"})", - "value": "lorem", - }, - { - "selected": false, - "title": "t(curiosity-toolbar.label_architecture, {"context":"ipsum"})", - "value": "ipsum", - }, - { - "selected": false, - "title": "t(curiosity-toolbar.label_architecture, {"context":"dolor"})", - "value": "dolor", - }, - { - "selected": false, - "title": "t(curiosity-toolbar.label_architecture, {"context":"sit"})", - "value": "sit", - }, - { - "selected": false, - "title": "t(curiosity-toolbar.label_architecture, {"context":"none"})", - "value": "", - }, -] -`; - -exports[`ToolbarFieldArchitecture Component should handle updating through redux state with component: dispatch, component 1`] = ` -[ - [ - [ - { - "type": "SET_QUERY_RESET_INVENTORY_LIST", - "viewId": undefined, - }, - { - "filter": "architecture", - "type": "SET_QUERY", - "value": "ipsum", - "viewId": undefined, - }, - ], - ], -] -`; - -exports[`ToolbarFieldArchitecture Component should handle updating through redux state with hook: dispatch, hook 1`] = ` -[ - [ - [ - { - "type": "SET_QUERY_RESET_INVENTORY_LIST", - "viewId": "loremIpsum", - }, - { - "filter": "architecture", - "type": "SET_QUERY", - "value": "dolor sit", - "viewId": "loremIpsum", - }, - ], - ], -] -`; - -exports[`ToolbarFieldArchitecture Component should render a basic component: basic 1`] = ` - - ); -}; - -/** - * Prop types. - * - * @type {{useOnSelect: Function, t: Function, useProductToolbarQuery: Function, isFilter: boolean, - * position: string, useToolbarFieldOptions: Function}} - */ -ToolbarFieldArchitecture.propTypes = { - isFilter: PropTypes.bool, - position: PropTypes.string, - t: PropTypes.func, - useOnSelect: PropTypes.func, - useProductToolbarQuery: PropTypes.func, - useToolbarFieldOptions: PropTypes.func -}; - -/** - * Default props. - * - * @type {{useOnSelect: Function, t: translate, useProductToolbarQuery: Function, isFilter: boolean, - * position: string, useToolbarFieldOptions: Function}} - */ -ToolbarFieldArchitecture.defaultProps = { - isFilter: false, - position: SelectPosition.left, - t: translate, - useOnSelect, - useProductToolbarQuery, - useToolbarFieldOptions -}; - -export { ToolbarFieldArchitecture as default, ToolbarFieldArchitecture, useOnSelect, useToolbarFieldOptions }; diff --git a/src/components/toolbar/toolbarFieldSelectCategory.js b/src/components/toolbar/toolbarFieldSelectCategory.js index 4850d8138..f77787def 100644 --- a/src/components/toolbar/toolbarFieldSelectCategory.js +++ b/src/components/toolbar/toolbarFieldSelectCategory.js @@ -7,7 +7,6 @@ import { useProduct, useProductToolbarConfig } from '../productView/productViewC import { Select } from '../form/select'; import { RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants'; import { translate } from '../i18n/i18n'; -import { ToolbarFieldArchitecture } from './toolbarFieldArchitecture'; import { ToolbarFieldBillingProvider, toolbarFieldOptions as billingProviderOptions @@ -103,15 +102,6 @@ const toolbarFieldOptions = [ }, options: [], isClearable: true - }, - { - title: translate('curiosity-toolbar.label', { context: ['filter', RHSM_API_QUERY_SET_TYPES.ARCHITECTURE] }), - value: RHSM_API_QUERY_SET_TYPES.ARCHITECTURE, - component: function Architecture(props) { - return ; - }, - options: [], - isClearable: true } ].map(option => ({ ...option, diff --git a/src/config/__tests__/__snapshots__/products.test.js.snap b/src/config/__tests__/__snapshots__/products.test.js.snap index 3f0f69176..9674968df 100644 --- a/src/config/__tests__/__snapshots__/products.test.js.snap +++ b/src/config/__tests__/__snapshots__/products.test.js.snap @@ -5,12 +5,12 @@ exports[`Product configurations should return sorted product configs: sorted 1`] "byAlias": { "dolor": [ { - "productArchitectures": [ + "productGroup": "lorem", + "productId": "lorem-ipsum", + "productVariants": [ "dolor", "sit", ], - "productGroup": "lorem", - "productId": "lorem-ipsum", "viewId": "view-lorem", }, ], @@ -27,12 +27,12 @@ exports[`Product configurations should return sorted product configs: sorted 1`] ], "sit": [ { - "productArchitectures": [ + "productGroup": "lorem", + "productId": "lorem-ipsum", + "productVariants": [ "dolor", "sit", ], - "productGroup": "lorem", - "productId": "lorem-ipsum", "viewId": "view-lorem", }, ], @@ -62,12 +62,12 @@ exports[`Product configurations should return sorted product configs: sorted 1`] "byGroup": { "dolor": [ { - "productArchitectures": [ + "productGroup": "lorem", + "productId": "lorem-ipsum", + "productVariants": [ "dolor", "sit", ], - "productGroup": "lorem", - "productId": "lorem-ipsum", "viewId": "view-lorem", }, { @@ -103,12 +103,12 @@ exports[`Product configurations should return sorted product configs: sorted 1`] ], "lorem": [ { - "productArchitectures": [ + "productGroup": "lorem", + "productId": "lorem-ipsum", + "productVariants": [ "dolor", "sit", ], - "productGroup": "lorem", - "productId": "lorem-ipsum", "viewId": "view-lorem", }, { @@ -134,23 +134,23 @@ exports[`Product configurations should return sorted product configs: sorted 1`] ], "lorem-ipsum": [ { - "productArchitectures": [ + "productGroup": "lorem", + "productId": "lorem-ipsum", + "productVariants": [ "dolor", "sit", ], - "productGroup": "lorem", - "productId": "lorem-ipsum", "viewId": "view-lorem", }, ], "sit": [ { - "productArchitectures": [ + "productGroup": "lorem", + "productId": "lorem-ipsum", + "productVariants": [ "dolor", "sit", ], - "productGroup": "lorem", - "productId": "lorem-ipsum", "viewId": "view-lorem", }, ], @@ -183,12 +183,12 @@ exports[`Product configurations should return sorted product configs: sorted 1`] ], "lorem": [ { - "productArchitectures": [ + "productGroup": "lorem", + "productId": "lorem-ipsum", + "productVariants": [ "dolor", "sit", ], - "productGroup": "lorem", - "productId": "lorem-ipsum", "viewId": "view-lorem", }, { @@ -235,12 +235,12 @@ exports[`Product configurations should return sorted product configs: sorted 1`] "viewId": "view-lorem", }, "lorem-ipsum": { - "productArchitectures": [ + "productGroup": "lorem", + "productId": "lorem-ipsum", + "productVariants": [ "dolor", "sit", ], - "productGroup": "lorem", - "productId": "lorem-ipsum", "viewId": "view-lorem", }, }, @@ -268,12 +268,12 @@ exports[`Product configurations should return sorted product configs: sorted 1`] ], "view-lorem": [ { - "productArchitectures": [ + "productGroup": "lorem", + "productId": "lorem-ipsum", + "productVariants": [ "dolor", "sit", ], - "productGroup": "lorem", - "productId": "lorem-ipsum", "viewId": "view-lorem", }, { diff --git a/src/config/__tests__/products.test.js b/src/config/__tests__/products.test.js index 7dcab2215..5841c8410 100644 --- a/src/config/__tests__/products.test.js +++ b/src/config/__tests__/products.test.js @@ -12,7 +12,7 @@ describe('Product configurations', () => { expect( products.sortedConfigs([ { - productArchitectures: ['dolor', 'sit'], + productVariants: ['dolor', 'sit'], productGroup: 'lorem', productId: 'lorem-ipsum', viewId: `view-lorem` diff --git a/src/config/products.js b/src/config/products.js index 8ffd177c0..d8d28deef 100644 --- a/src/config/products.js +++ b/src/config/products.js @@ -4,7 +4,7 @@ import { helpers } from '../common/helpers'; * IIFE for generating a product configs listing via webpack * * @type {{aliases: string[], productGroup: string, productId: string, productLabel: string, productDisplay: string, viewId: string, - * productArchitectures: string[], productVariants: string[], query: object, graphTallyQuery: object, inventoryHostQuery: object, + * productVariants: string[], query: object, graphTallyQuery: object, inventoryHostQuery: object, * inventorySubscriptionsQuery: object, initialGraphFilters: {}[], initialGraphSettings: object, initialGuestsFilters: {}[], * initialInventoryFilters: {}[], initialSubscriptionsInventoryFilters: {}[], initialToolbarFilters: {}[], }[]} */ @@ -59,16 +59,7 @@ const sortedProductConfigs = helpers.memo((configs = productConfigs) => { const groupedViewIds = {}; configs?.forEach(config => { - const { - aliases, - productArchitectures, - productGroup, - productId, - productLabel, - productPath, - productVariants, - viewId - } = config; + const { aliases, productGroup, productId, productLabel, productPath, productVariants, viewId } = config; if (productGroup && productId) { grouped[productGroup] ??= {}; @@ -100,16 +91,6 @@ const sortedProductConfigs = helpers.memo((configs = productConfigs) => { productAliases[alias].push(config); }); - productArchitectures?.forEach(architecture => { - if (productId) { - grouped[architecture] ??= {}; - grouped[architecture][productId] = config; - } - - productAliases[architecture] ??= []; - productAliases[architecture].push(config); - }); - productVariants?.forEach(variant => { if (productId) { grouped[variant] ??= {}; diff --git a/src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap b/src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap index ec4482018..f4164d3fb 100644 --- a/src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap +++ b/src/services/rhsm/__tests__/__snapshots__/rhsmConstants.test.js.snap @@ -96,7 +96,6 @@ exports[`RHSM Constants should have specific properties: all exported constants "USAGE": "usage", }, "RHSM_API_QUERY_SET_INVENTORY_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_ACCOUNT_ID": "billing_account_id", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", @@ -113,7 +112,6 @@ exports[`RHSM Constants should have specific properties: all exported constants "VARIANT": "variant", }, "RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", "END_DATE": "ending", @@ -124,7 +122,6 @@ exports[`RHSM Constants should have specific properties: all exported constants "VARIANT": "variant", }, "RHSM_API_QUERY_SET_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_ACCOUNT_ID": "billing_account_id", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", @@ -379,7 +376,6 @@ exports[`RHSM Constants should have specific properties: all exported constants "USAGE": "usage", }, "RHSM_API_QUERY_SET_INVENTORY_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_ACCOUNT_ID": "billing_account_id", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", @@ -396,7 +392,6 @@ exports[`RHSM Constants should have specific properties: all exported constants "VARIANT": "variant", }, "RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", "END_DATE": "ending", @@ -407,7 +402,6 @@ exports[`RHSM Constants should have specific properties: all exported constants "VARIANT": "variant", }, "RHSM_API_QUERY_SET_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_ACCOUNT_ID": "billing_account_id", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", @@ -663,7 +657,6 @@ exports[`RHSM Constants should have specific properties: all exported constants "USAGE": "usage", }, "RHSM_API_QUERY_SET_INVENTORY_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_ACCOUNT_ID": "billing_account_id", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", @@ -680,7 +673,6 @@ exports[`RHSM Constants should have specific properties: all exported constants "VARIANT": "variant", }, "RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", "END_DATE": "ending", @@ -691,7 +683,6 @@ exports[`RHSM Constants should have specific properties: all exported constants "VARIANT": "variant", }, "RHSM_API_QUERY_SET_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_ACCOUNT_ID": "billing_account_id", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", @@ -951,7 +942,6 @@ exports[`RHSM Constants should have specific properties: specific constants 1`] "USAGE": "usage", }, "RHSM_API_QUERY_SET_INVENTORY_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_ACCOUNT_ID": "billing_account_id", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", @@ -968,7 +958,6 @@ exports[`RHSM Constants should have specific properties: specific constants 1`] "VARIANT": "variant", }, "RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", "END_DATE": "ending", @@ -979,7 +968,6 @@ exports[`RHSM Constants should have specific properties: specific constants 1`] "VARIANT": "variant", }, "RHSM_API_QUERY_SET_TYPES": { - "ARCHITECTURE": "architecture", "BILLING_ACCOUNT_ID": "billing_account_id", "BILLING_PROVIDER": "billing_provider", "CATEGORY": "category", diff --git a/src/services/rhsm/__tests__/__snapshots__/rhsmHelpers.test.js.snap b/src/services/rhsm/__tests__/__snapshots__/rhsmHelpers.test.js.snap index ec9b7f040..e2a9f6009 100644 --- a/src/services/rhsm/__tests__/__snapshots__/rhsmHelpers.test.js.snap +++ b/src/services/rhsm/__tests__/__snapshots__/rhsmHelpers.test.js.snap @@ -2,8 +2,6 @@ exports[`RHSM Helpers filterArchitectureVariant, should filter architectures, variants from an object: passed id 1`] = `"passThroughId"`; -exports[`RHSM Helpers filterArchitectureVariant, should filter architectures, variants from an object: updated id, architecture 1`] = `"lorem"`; - exports[`RHSM Helpers filterArchitectureVariant, should filter architectures, variants from an object: updated id, variant 1`] = `"ipsum"`; exports[`RHSM Helpers should have specific functions: helpers 1`] = ` diff --git a/src/services/rhsm/__tests__/rhsmHelpers.test.js b/src/services/rhsm/__tests__/rhsmHelpers.test.js index 6716bf22a..430b68b23 100644 --- a/src/services/rhsm/__tests__/rhsmHelpers.test.js +++ b/src/services/rhsm/__tests__/rhsmHelpers.test.js @@ -9,10 +9,6 @@ describe('RHSM Helpers', () => { it('filterArchitectureVariant, should filter architectures, variants from an object', () => { expect(rhsmHelpers.filterArchitectureVariant('passThroughId')).toMatchSnapshot('passed id'); - expect( - rhsmHelpers.filterArchitectureVariant('passThroughId', { [RHSM_API_QUERY_SET_TYPES.ARCHITECTURE]: 'lorem' }) - ).toMatchSnapshot('updated id, architecture'); - expect( rhsmHelpers.filterArchitectureVariant('passThroughId', { [RHSM_API_QUERY_SET_TYPES.VARIANT]: 'ipsum' }) ).toMatchSnapshot('updated id, variant'); diff --git a/src/services/rhsm/rhsmConstants.js b/src/services/rhsm/rhsmConstants.js index 5a45a86b7..ebf1fd331 100644 --- a/src/services/rhsm/rhsmConstants.js +++ b/src/services/rhsm/rhsmConstants.js @@ -403,12 +403,11 @@ const RHSM_API_QUERY_USAGE_TYPES = RHSM_API_RESPONSE_USAGE_TYPES; /** * RHSM API query/search parameter INVENTORY type values. * - * @type {{BILLING_ACCOUNT_ID: string, DIRECTION: string, END_DATE: string, SLA: string, LIMIT: string, - * START_DATE: string, VARIANT: string, DISPLAY_NAME: string, UOM: string, USAGE: string, CATEGORY: string, - * ARCHITECTURE: string, SORT: string, OFFSET: string, BILLING_PROVIDER: string}} + * @type {{BILLING_ACCOUNT_ID: string, DIRECTION: string, END_DATE: string, SLA: string, LIMIT: string, START_DATE: string, + * VARIANT: string, DISPLAY_NAME: string, UOM: string, USAGE: string, CATEGORY: string, SORT: string, OFFSET: string, + * BILLING_PROVIDER: string}} */ const RHSM_API_QUERY_SET_INVENTORY_TYPES = { - ARCHITECTURE: 'architecture', BILLING_PROVIDER: 'billing_provider', BILLING_ACCOUNT_ID: 'billing_account_id', CATEGORY: 'category', @@ -429,10 +428,9 @@ const RHSM_API_QUERY_SET_INVENTORY_TYPES = { * RHSM query parameter options for TALLY, CAPACITY endpoints. * * @type {{GRANULARITY: string, USAGE: string, CATEGORY: string, END_DATE: string, SLA: string, START_DATE: string, - * BILLING_PROVIDER: string}} + * BILLING_PROVIDER: string, VARIANT: string}} */ const RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES = { - ARCHITECTURE: 'architecture', BILLING_PROVIDER: 'billing_provider', CATEGORY: 'category', END_DATE: 'ending', @@ -471,7 +469,7 @@ const RHSM_INTERNAL_PRODUCT_DISPLAY_TYPES = { * RHSM constants. * * @type {{RHSM_API_QUERY_SET_TALLY_CAPACITY_TYPES: {GRANULARITY: string, USAGE: string, CATEGORY: string, END_DATE: string, - * SLA: string, START_DATE: string, BILLING_PROVIDER: string}, RHSM_API_RESPONSE_DATA: string, + * SLA: string, START_DATE: string, BILLING_PROVIDER: string, VARIANT: string}, RHSM_API_RESPONSE_DATA: string, * RHSM_API_RESPONSE_SUBSCRIPTIONS_META_TYPES: {PRODUCT: string, SUBSCRIPTION_TYPE: string, COUNT: string}, * RHSM_API_PATH_PRODUCT_VARIANT_SATELLITE_TYPES: {SATELLITE_SERVER: string, SATELLITE_CAPSULE: string}, * RHSM_API_PATH_METRIC_TYPES: {CORES: string, STORAGE_GIBIBYTES: string, SOCKETS: string, INSTANCE_HOURS: string, @@ -480,47 +478,49 @@ const RHSM_INTERNAL_PRODUCT_DISPLAY_TYPES = { * RHSM_API_RESPONSE_INSTANCES_DATA_TYPES: {MEASUREMENTS: string, BILLING_ACCOUNT_ID: string, CATEGORY: string, * SUBSCRIPTION_MANAGER_ID: string, INSTANCE_ID: string, NUMBER_OF_GUESTS: string, BILLING_PROVIDER: string, * DISPLAY_NAME: string, CLOUD_PROVIDER: string, LAST_SEEN: string}, RHSM_API_RESPONSE_SLA_TYPES: {PREMIUM: string, - * SELF: string, NONE: string, STANDARD: string}, RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES: {RHEL_ARM: string, - * RHEL_IBM_Z: string, RHEL_IBM_POWER: string, RHEL_X86: string}, RHSM_API_RESPONSE_HOSTS_META_TYPES: {PRODUCT: string, - * COUNT: string}, RHSM_API_RESPONSE_META_TYPES: {PRODUCT: string, COUNT: string}, - * RHSM_API_RESPONSE_ERRORS_CODE_TYPES: {GENERIC: string, OPTIN: string}, RHSM_API_QUERY_GRANULARITY_TYPES: {WEEKLY: string, - * QUARTERLY: string, DAILY: string, MONTHLY: string}, RHSM_API_RESPONSE_UOM_TYPES: {CORES: string, SOCKETS: string}, - * RHSM_API_RESPONSE_SUBSCRIPTIONS_DATA_TYPES: {BILLING_ACCOUNT_ID: string, QUANTITY: string, SUBSCRIPTION_MANAGER_ID: string, - * INVENTORY_ID: string, NUMBER_OF_GUESTS: string, HAS_INFINITE_QUANTITY: string, TOTAL_CAPACITY: string, PRODUCT_NAME: string, - * SERVICE_LEVEL: string, DISPLAY_NAME: string, MEASUREMENTS: string, UOM: string, CATEGORY: string, NEXT_EVENT_DATE: string, - * BILLING_PROVIDER: string, LAST_SEEN: string}, RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES: {ASCENDING: string, - * DESCENDING: string}, RHSM_API_RESPONSE_SUBSCRIPTION_TYPES: {ANNUAL: string, ON_DEMAND: string}, + * SELF: string, NONE: string, STANDARD: string}, RHSM_API_RESPONSE_HOSTS_META_TYPES: {PRODUCT: string, COUNT: string}, + * RHSM_API_RESPONSE_META_TYPES: {PRODUCT: string, COUNT: string}, RHSM_API_RESPONSE_ERRORS_CODE_TYPES: {GENERIC: string, + * OPTIN: string}, RHSM_API_QUERY_GRANULARITY_TYPES: {WEEKLY: string, QUARTERLY: string, DAILY: string, MONTHLY: string}, + * RHSM_API_RESPONSE_UOM_TYPES: {CORES: string, SOCKETS: string}, + * RHSM_API_PATH_PRODUCT_VARIANT_RHEL_TYPES: {RHEL_ARM: string, RHEL_IBM_Z: string, RHEL_IBM_POWER: string, + * RHEL_X86: string}, RHSM_API_RESPONSE_SUBSCRIPTIONS_DATA_TYPES: {BILLING_ACCOUNT_ID: string, QUANTITY: string, + * SUBSCRIPTION_MANAGER_ID: string, INVENTORY_ID: string, NUMBER_OF_GUESTS: string, HAS_INFINITE_QUANTITY: string, + * TOTAL_CAPACITY: string, PRODUCT_NAME: string, SERVICE_LEVEL: string, DISPLAY_NAME: string, MEASUREMENTS: string, + * UOM: string, CATEGORY: string, NEXT_EVENT_DATE: string, BILLING_PROVIDER: string, LAST_SEEN: string}, + * RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES: {ASCENDING: string, DESCENDING: string}, + * RHSM_API_RESPONSE_SUBSCRIPTION_TYPES: {ANNUAL: string, ON_DEMAND: string}, * RHSM_API_QUERY_INVENTORY_SORT_TYPES: {CORES: string, STORAGE_GIBIBYTES: string, CATEGORY: string, SOCKETS: string, - * INSTANCE_HOURS: string, NUMBER_OF_GUESTS: string, TRANSFER_GIBIBYTES: string, BILLING_PROVIDER: string, CORE_SECONDS: string, - * STORAGE_GIBIBYTE_MONTHS: string, LAST_SEEN: string, NAME: string}, RHSM_API_PATH_PRODUCT_TYPES: {RHEL_ARM: string, - * OPENSHIFT_METRICS: string, SATELLITE: string, RHEL_WORKSTATION: string, RHODS: string, RHOSAK: string, - * RHEL_COMPUTE_NODE: string, RHEL_X86: string, OPENSHIFT: string, SATELLITE_SERVER: string, OPENSHIFT_DEDICATED_METRICS: string, - * RHEL_DESKTOP: string, RHEL: string, SATELLITE_CAPSULE: string, RHEL_SERVER: string, RHEL_IBM_Z: string, RHACS: string, - * RHEL_IBM_POWER: string}, RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, NONE: string, - * AWS: string, ORACLE: string}, RHSM_API_RESPONSE_ERRORS_TYPES: {CODE: string}, - * RHSM_API_RESPONSE_TALLY_CAPACITY_DATA_TYPES: {DATE: string, HAS_DATA: string, VALUE: string, HAS_INFINITE_QUANTITY: string}, - * RHSM_API_RESPONSE_TALLY_CAPACITY_META_TYPES: {TOTAL_MONTHLY: string, DATE: string, PRODUCT: string, HAS_CLOUDIGRADE_DATA: string, - * HAS_CLOUDIGRADE_MISMATCH: string, HAS_DATA: string, METRIC_ID: string, COUNT: string, VALUE: string}, - * RHSM_API_QUERY_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, NONE: string, AWS: string, ORACLE: string}, - * RHSM_API_QUERY_CATEGORY_TYPES: {CLOUD: string, PHYSICAL: string, HYPERVISOR: string, VIRTUAL: string}, - * RHSM_API_QUERY_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string, PRODUCTION: string}, - * RHSM_API_QUERY_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string, STANDARD: string}, - * RHSM_API_QUERY_SET_INVENTORY_TYPES: {BILLING_ACCOUNT_ID: string, DIRECTION: string, END_DATE: string, SLA: string, - * LIMIT: string, START_DATE: string, VARIANT: string, DISPLAY_NAME: string, UOM: string, USAGE: string, CATEGORY: string, - * ARCHITECTURE: string, SORT: string, OFFSET: string, BILLING_PROVIDER: string}, + * INSTANCE_HOURS: string, NUMBER_OF_GUESTS: string, TRANSFER_GIBIBYTES: string, BILLING_PROVIDER: string, + * CORE_SECONDS: string, STORAGE_GIBIBYTE_MONTHS: string, LAST_SEEN: string, NAME: string}, + * RHSM_API_PATH_PRODUCT_TYPES: {RHEL_ARM: string, OPENSHIFT_METRICS: string, SATELLITE: string, + * RHEL_WORKSTATION: string, RHODS: string, RHOSAK: string, RHEL_COMPUTE_NODE: string, RHEL_X86: string, + * OPENSHIFT: string, SATELLITE_SERVER: string, OPENSHIFT_DEDICATED_METRICS: string, RHEL_DESKTOP: string, + * RHEL: string, SATELLITE_CAPSULE: string, RHEL_SERVER: string, RHEL_IBM_Z: string, RHACS: string, + * RHEL_IBM_POWER: string}, RHSM_API_RESPONSE_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, + * NONE: string, AWS: string, ORACLE: string}, RHSM_API_RESPONSE_ERRORS_TYPES: {CODE: string}, + * RHSM_API_RESPONSE_TALLY_CAPACITY_DATA_TYPES: {DATE: string, HAS_DATA: string, VALUE: string, + * HAS_INFINITE_QUANTITY: string}, RHSM_API_RESPONSE_TALLY_CAPACITY_META_TYPES: {TOTAL_MONTHLY: string, DATE: string, + * PRODUCT: string, HAS_CLOUDIGRADE_DATA: string, HAS_CLOUDIGRADE_MISMATCH: string, HAS_DATA: string, METRIC_ID: string, + * COUNT: string, VALUE: string}, RHSM_API_QUERY_BILLING_PROVIDER_TYPES: {AZURE: string, GCP: string, RED_HAT: string, + * NONE: string, AWS: string, ORACLE: string}, RHSM_API_QUERY_CATEGORY_TYPES: {CLOUD: string, PHYSICAL: string, + * HYPERVISOR: string, VIRTUAL: string}, RHSM_API_QUERY_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, + * DEVELOPMENT: string, PRODUCTION: string}, RHSM_API_QUERY_SLA_TYPES: {PREMIUM: string, SELF: string, NONE: string, + * STANDARD: string}, RHSM_API_QUERY_SET_INVENTORY_TYPES: {BILLING_ACCOUNT_ID: string, DIRECTION: string, END_DATE: string, + * SLA: string, LIMIT: string, START_DATE: string, VARIANT: string, DISPLAY_NAME: string, UOM: string, USAGE: string, + * CATEGORY: string, SORT: string, OFFSET: string, BILLING_PROVIDER: string}, * RHSM_API_RESPONSE_HOSTS_DATA_TYPES: {MEASUREMENT_TYPE: string, CORES: string, CORE_HOURS: string, HARDWARE_TYPE: string, * SUBSCRIPTION_MANAGER_ID: string, INSTANCE_HOURS: string, SOCKETS: string, INVENTORY_ID: string, NUMBER_OF_GUESTS: string, * DISPLAY_NAME: string, CLOUD_PROVIDER: string, LAST_SEEN: string}, RHSM_API_RESPONSE_ERRORS: string, * RHSM_API_QUERY_UOM_TYPES: {CORES: string, SOCKETS: string}, RHSM_API_RESPONSE_META: string, * RHSM_API_RESPONSE_GRANULARITY_TYPES: {WEEKLY: string, QUARTERLY: string, DAILY: string, MONTHLY: string}, - * RHSM_API_QUERY_SET_TYPES: {UOM: string, GRANULARITY: string, USAGE: string, DIRECTION: string, SORT: string, END_DATE: string, - * OFFSET: string, SLA: string, LIMIT: string, START_DATE: string, DISPLAY_NAME: string}, + * RHSM_API_QUERY_SET_TYPES: {UOM: string, GRANULARITY: string, USAGE: string, DIRECTION: string, SORT: string, + * END_DATE: string, OFFSET: string, SLA: string, LIMIT: string, START_DATE: string, DISPLAY_NAME: string}, * RHSM_API_QUERY_INVENTORY_SUBSCRIPTIONS_SORT_TYPES: {QUANTITY: string, USAGE: string, NEXT_EVENT_TYPE: string, * NEXT_EVENT_DATE: string, TOTAL_CAPACITY: string, PRODUCT_NAME: string, SKU: string, SERVICE_LEVEL: string}, - * RHSM_INTERNAL_PRODUCT_DISPLAY_TYPES: {CAPACITY: string, LEGACY: string, DUAL_AXES: string, PARTIAL: string, HOURLY: string}, - * RHSM_API_RESPONSE_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string, PRODUCTION: string}, - * RHSM_API_QUERY_INVENTORY_HOSTS_SORT_TYPES: {CORES: string, CORE_HOURS: string, HARDWARE: string, INSTANCE_HOURS: string, - * SOCKETS: string, MEASUREMENT: string, LAST_SEEN: string, NAME: string}}} + * RHSM_INTERNAL_PRODUCT_DISPLAY_TYPES: {CAPACITY: string, LEGACY: string, DUAL_AXES: string, PARTIAL: string, + * HOURLY: string}, RHSM_API_RESPONSE_USAGE_TYPES: {UNSPECIFIED: string, DISASTER: string, DEVELOPMENT: string, + * PRODUCTION: string}, RHSM_API_QUERY_INVENTORY_HOSTS_SORT_TYPES: {CORES: string, CORE_HOURS: string, HARDWARE: string, + * INSTANCE_HOURS: string, SOCKETS: string, MEASUREMENT: string, LAST_SEEN: string, NAME: string}}} */ const rhsmConstants = { RHSM_API_PATH_PRODUCT_TYPES, diff --git a/src/services/rhsm/rhsmHelpers.js b/src/services/rhsm/rhsmHelpers.js index 27f07f39e..6c003b389 100644 --- a/src/services/rhsm/rhsmHelpers.js +++ b/src/services/rhsm/rhsmHelpers.js @@ -18,10 +18,6 @@ import { RHSM_API_QUERY_SET_TYPES } from './rhsmConstants'; const filterArchitectureVariant = (id, params = {}) => { const updatedId = id; - if (params?.[RHSM_API_QUERY_SET_TYPES.ARCHITECTURE]?.length) { - return params?.[RHSM_API_QUERY_SET_TYPES.ARCHITECTURE]; - } - if (params?.[RHSM_API_QUERY_SET_TYPES.VARIANT]?.length) { return params?.[RHSM_API_QUERY_SET_TYPES.VARIANT]; } diff --git a/tests/__snapshots__/dist.test.js.snap b/tests/__snapshots__/dist.test.js.snap index 6bdadfdce..006036e2a 100644 --- a/tests/__snapshots__/dist.test.js.snap +++ b/tests/__snapshots__/dist.test.js.snap @@ -297,7 +297,6 @@ exports[`Build distribution should match a specific file output 1`] = ` "./dist/js/2738*js", "./dist/js/2881*js", "./dist/js/2896*js", - "./dist/js/2948*js", "./dist/js/31*js", "./dist/js/3128*js", "./dist/js/3267*js", @@ -383,7 +382,6 @@ exports[`Build distribution should match a specific file output 1`] = ` "./dist/sourcemaps/2738*map", "./dist/sourcemaps/2881*map", "./dist/sourcemaps/2896*map", - "./dist/sourcemaps/2948*map", "./dist/sourcemaps/31*map", "./dist/sourcemaps/3128*map", "./dist/sourcemaps/3267*map",