diff --git a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap index 7dd70598a..8a4f856e8 100644 --- a/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap +++ b/src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap @@ -162,7 +162,7 @@ Array [ ], }, Object { - "file": "./src/components/inventoryList/inventoryCard.js", + "file": "./src/components/inventoryCard/inventoryCard.js", "keys": Array [ Object { "key": "curiosity-inventory.tab", @@ -171,7 +171,7 @@ Array [ ], }, Object { - "file": "./src/components/inventoryList/inventoryCardHelpers.js", + "file": "./src/components/inventoryCard/inventoryCardHelpers.js", "keys": Array [ Object { "key": "curiosity-inventory.header", @@ -184,7 +184,7 @@ Array [ ], }, Object { - "file": "./src/components/inventoryList/inventoryList.deprecated.js", + "file": "./src/components/inventoryCard/inventoryList.deprecated.js", "keys": Array [ Object { "key": "curiosity-inventory.tab", @@ -693,11 +693,11 @@ Array [ "key": "curiosity-graph.label", }, Object { - "file": "./src/components/inventoryList/inventoryCard.js", + "file": "./src/components/inventoryCard/inventoryCard.js", "key": "curiosity-inventory.tab", }, Object { - "file": "./src/components/inventoryList/inventoryList.deprecated.js", + "file": "./src/components/inventoryCard/inventoryList.deprecated.js", "key": "curiosity-inventory.tab", }, Object { diff --git a/src/components/inventoryList/__tests__/__snapshots__/inventoryCard.test.js.snap b/src/components/inventoryCard/__tests__/__snapshots__/inventoryCard.test.js.snap similarity index 99% rename from src/components/inventoryList/__tests__/__snapshots__/inventoryCard.test.js.snap rename to src/components/inventoryCard/__tests__/__snapshots__/inventoryCard.test.js.snap index 0346ca7a9..c55069a4e 100644 --- a/src/components/inventoryList/__tests__/__snapshots__/inventoryCard.test.js.snap +++ b/src/components/inventoryCard/__tests__/__snapshots__/inventoryCard.test.js.snap @@ -54,7 +54,7 @@ exports[`InventoryCard Component should handle expandable guests data: number of 1, "loremIpsum", ], - "expandedContent": , diff --git a/src/components/inventoryList/__tests__/__snapshots__/inventoryCardContext.test.js.snap b/src/components/inventoryCard/__tests__/__snapshots__/inventoryCardContext.test.js.snap similarity index 100% rename from src/components/inventoryList/__tests__/__snapshots__/inventoryCardContext.test.js.snap rename to src/components/inventoryCard/__tests__/__snapshots__/inventoryCardContext.test.js.snap diff --git a/src/components/inventoryList/__tests__/__snapshots__/inventoryCardHelpers.test.js.snap b/src/components/inventoryCard/__tests__/__snapshots__/inventoryCardHelpers.test.js.snap similarity index 100% rename from src/components/inventoryList/__tests__/__snapshots__/inventoryCardHelpers.test.js.snap rename to src/components/inventoryCard/__tests__/__snapshots__/inventoryCardHelpers.test.js.snap diff --git a/src/components/inventoryList/__tests__/__snapshots__/inventoryList.deprecated.test.js.snap b/src/components/inventoryCard/__tests__/__snapshots__/inventoryList.deprecated.test.js.snap similarity index 100% rename from src/components/inventoryList/__tests__/__snapshots__/inventoryList.deprecated.test.js.snap rename to src/components/inventoryCard/__tests__/__snapshots__/inventoryList.deprecated.test.js.snap diff --git a/src/components/inventoryList/__tests__/inventoryCard.test.js b/src/components/inventoryCard/__tests__/inventoryCard.test.js similarity index 100% rename from src/components/inventoryList/__tests__/inventoryCard.test.js rename to src/components/inventoryCard/__tests__/inventoryCard.test.js diff --git a/src/components/inventoryList/__tests__/inventoryCardContext.test.js b/src/components/inventoryCard/__tests__/inventoryCardContext.test.js similarity index 100% rename from src/components/inventoryList/__tests__/inventoryCardContext.test.js rename to src/components/inventoryCard/__tests__/inventoryCardContext.test.js diff --git a/src/components/inventoryList/__tests__/inventoryCardHelpers.test.js b/src/components/inventoryCard/__tests__/inventoryCardHelpers.test.js similarity index 100% rename from src/components/inventoryList/__tests__/inventoryCardHelpers.test.js rename to src/components/inventoryCard/__tests__/inventoryCardHelpers.test.js diff --git a/src/components/inventoryList/__tests__/inventoryList.deprecated.test.js b/src/components/inventoryCard/__tests__/inventoryList.deprecated.test.js similarity index 100% rename from src/components/inventoryList/__tests__/inventoryList.deprecated.test.js rename to src/components/inventoryCard/__tests__/inventoryList.deprecated.test.js diff --git a/src/components/inventoryList/inventoryCard.js b/src/components/inventoryCard/inventoryCard.js similarity index 97% rename from src/components/inventoryList/inventoryCard.js rename to src/components/inventoryCard/inventoryCard.js index 4c13e4fe5..07d1c5cb5 100644 --- a/src/components/inventoryList/inventoryCard.js +++ b/src/components/inventoryCard/inventoryCard.js @@ -9,7 +9,7 @@ import { connect, reduxSelectors } from '../../redux'; import Table from '../table/table'; import { Loader } from '../loader/loader'; import { MinHeight } from '../minHeight/minHeight'; -import GuestsList from '../guestsList/guestsList'; +import InventoryGuests from '../inventoryGuests/inventoryGuests'; import { inventoryCardHelpers } from './inventoryCardHelpers'; import Pagination from '../pagination/pagination'; import { ToolbarFieldDisplayName } from '../toolbar/toolbarFieldDisplayName'; @@ -112,7 +112,7 @@ const InventoryCard = ({ return { cells, expandedContent: - (isSubTable && ) || undefined + (isSubTable && ) || undefined }; }); diff --git a/src/components/inventoryList/inventoryCardContext.js b/src/components/inventoryCard/inventoryCardContext.js similarity index 100% rename from src/components/inventoryList/inventoryCardContext.js rename to src/components/inventoryCard/inventoryCardContext.js diff --git a/src/components/inventoryList/inventoryCardHelpers.js b/src/components/inventoryCard/inventoryCardHelpers.js similarity index 100% rename from src/components/inventoryList/inventoryCardHelpers.js rename to src/components/inventoryCard/inventoryCardHelpers.js diff --git a/src/components/inventoryList/inventoryList.deprecated.js b/src/components/inventoryCard/inventoryList.deprecated.js similarity index 99% rename from src/components/inventoryList/inventoryList.deprecated.js rename to src/components/inventoryCard/inventoryList.deprecated.js index 6098aedc7..bacba5f70 100644 --- a/src/components/inventoryList/inventoryList.deprecated.js +++ b/src/components/inventoryCard/inventoryList.deprecated.js @@ -10,7 +10,7 @@ import { connect, reduxActions, reduxSelectors, reduxTypes, store } from '../../ import Table from '../table/table'; import { Loader } from '../loader/loader'; import { MinHeight } from '../minHeight/minHeight'; -import GuestsList from '../guestsList/guestsList.deprecated'; +import GuestsList from '../inventoryGuests/guestsList.deprecated'; import { inventoryCardHelpers } from './inventoryCardHelpers'; import Pagination from '../pagination/pagination'; import { ToolbarFieldDisplayName } from '../toolbar/toolbarFieldDisplayName'; diff --git a/src/components/inventorySubscriptions/__tests__/__snapshots__/inventorySubscriptions.test.js.snap b/src/components/inventoryCardSubscriptions/__tests__/__snapshots__/inventoryCardSubscriptions.test.js.snap similarity index 73% rename from src/components/inventorySubscriptions/__tests__/__snapshots__/inventorySubscriptions.test.js.snap rename to src/components/inventoryCardSubscriptions/__tests__/__snapshots__/inventoryCardSubscriptions.test.js.snap index d1d7b1179..38be0f936 100644 --- a/src/components/inventorySubscriptions/__tests__/__snapshots__/inventorySubscriptions.test.js.snap +++ b/src/components/inventoryCardSubscriptions/__tests__/__snapshots__/inventoryCardSubscriptions.test.js.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`InventorySubscriptions Component should render a basic component: basic render 1`] = ` +exports[`InventoryCardSubscriptions Component should render a basic component: basic render 1`] = ` { +describe('InventoryCardSubscriptions Component', () => { it('should render a basic component', async () => { const props = { useProduct: () => ({ productId: 'lorem' }), @@ -12,7 +12,7 @@ describe('InventorySubscriptions Component', () => { }) }; - const component = await shallowHookComponent(); + const component = await shallowHookComponent(); expect(component).toMatchSnapshot('basic render'); }); }); diff --git a/src/components/inventorySubscriptions/__tests__/inventorySubscriptionsContext.test.js b/src/components/inventoryCardSubscriptions/__tests__/inventoryCardSubscriptionsContext.test.js similarity index 97% rename from src/components/inventorySubscriptions/__tests__/inventorySubscriptionsContext.test.js rename to src/components/inventoryCardSubscriptions/__tests__/inventoryCardSubscriptionsContext.test.js index 3df30b82f..8f9e915ea 100644 --- a/src/components/inventorySubscriptions/__tests__/inventorySubscriptionsContext.test.js +++ b/src/components/inventoryCardSubscriptions/__tests__/inventoryCardSubscriptionsContext.test.js @@ -3,10 +3,10 @@ import { useGetSubscriptionsInventory, useOnPageSubscriptions, useOnColumnSortSubscriptions -} from '../inventorySubscriptionsContext'; +} from '../inventoryCardSubscriptionsContext'; import { RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES } from '../../../services/rhsm/rhsmConstants'; -describe('InventorySubscriptionsContext', () => { +describe('InventoryCardSubscriptionsContext', () => { it('should return specific properties', () => { expect(context).toMatchSnapshot('specific properties'); }); diff --git a/src/components/inventorySubscriptions/inventorySubscriptions.js b/src/components/inventoryCardSubscriptions/inventoryCardSubscriptions.js similarity index 88% rename from src/components/inventorySubscriptions/inventorySubscriptions.js rename to src/components/inventoryCardSubscriptions/inventoryCardSubscriptions.js index 08f2759f9..baa644e7b 100644 --- a/src/components/inventorySubscriptions/inventorySubscriptions.js +++ b/src/components/inventoryCardSubscriptions/inventoryCardSubscriptions.js @@ -8,8 +8,8 @@ import { useGetSubscriptionsInventory, useOnPageSubscriptions, useOnColumnSortSubscriptions -} from './inventorySubscriptionsContext'; -import InventoryCard from '../inventoryList/inventoryCard'; +} from './inventoryCardSubscriptionsContext'; +import InventoryCard from '../inventoryCard/inventoryCard'; import { helpers } from '../../common'; /** @@ -27,7 +27,7 @@ import { helpers } from '../../common'; * @fires onUpdateInventoryData * @returns {Node} */ -const InventorySubscriptions = ({ +const InventoryCardSubscriptions = ({ isDisabled, useGetInventory: useAliasGetInventory, useOnPage: useAliasOnPage, @@ -52,7 +52,7 @@ const InventorySubscriptions = ({ * @type {{useOnPage: Function, isDisabled: boolean, useProductInventoryConfig: Function, useGetInventory: Function, * useOnColumnSort: Function, useProductInventoryQuery: Function}} */ -InventorySubscriptions.propTypes = { +InventoryCardSubscriptions.propTypes = { isDisabled: PropTypes.bool, useGetInventory: PropTypes.func, useOnPage: PropTypes.func, @@ -67,7 +67,7 @@ InventorySubscriptions.propTypes = { * @type {{useOnPage: Function, isDisabled: boolean, useProductInventoryConfig: Function, useGetInventory: Function, * useOnColumnSort: Function, useProductInventoryQuery: Function}} */ -InventorySubscriptions.defaultProps = { +InventoryCardSubscriptions.defaultProps = { isDisabled: helpers.UI_DISABLED_TABLE_SUBSCRIPTIONS, useGetInventory: useGetSubscriptionsInventory, useOnPage: useOnPageSubscriptions, @@ -76,4 +76,4 @@ InventorySubscriptions.defaultProps = { useProductInventoryQuery: useProductInventorySubscriptionsQuery }; -export { InventorySubscriptions as default, InventorySubscriptions }; +export { InventoryCardSubscriptions as default, InventoryCardSubscriptions }; diff --git a/src/components/inventorySubscriptions/inventorySubscriptionsContext.js b/src/components/inventoryCardSubscriptions/inventoryCardSubscriptionsContext.js similarity index 100% rename from src/components/inventorySubscriptions/inventorySubscriptionsContext.js rename to src/components/inventoryCardSubscriptions/inventoryCardSubscriptionsContext.js diff --git a/src/components/guestsList/__tests__/__snapshots__/guestsList.deprecated.test.js.snap b/src/components/inventoryGuests/__tests__/__snapshots__/guestsList.deprecated.test.js.snap similarity index 100% rename from src/components/guestsList/__tests__/__snapshots__/guestsList.deprecated.test.js.snap rename to src/components/inventoryGuests/__tests__/__snapshots__/guestsList.deprecated.test.js.snap diff --git a/src/components/guestsList/__tests__/__snapshots__/guestsList.test.js.snap b/src/components/inventoryGuests/__tests__/__snapshots__/inventoryGuests.test.js.snap similarity index 100% rename from src/components/guestsList/__tests__/__snapshots__/guestsList.test.js.snap rename to src/components/inventoryGuests/__tests__/__snapshots__/inventoryGuests.test.js.snap diff --git a/src/components/guestsList/__tests__/__snapshots__/guestsListContext.test.js.snap b/src/components/inventoryGuests/__tests__/__snapshots__/inventoryGuestsContext.test.js.snap similarity index 100% rename from src/components/guestsList/__tests__/__snapshots__/guestsListContext.test.js.snap rename to src/components/inventoryGuests/__tests__/__snapshots__/inventoryGuestsContext.test.js.snap diff --git a/src/components/guestsList/__tests__/guestsList.deprecated.test.js b/src/components/inventoryGuests/__tests__/guestsList.deprecated.test.js similarity index 100% rename from src/components/guestsList/__tests__/guestsList.deprecated.test.js rename to src/components/inventoryGuests/__tests__/guestsList.deprecated.test.js diff --git a/src/components/guestsList/__tests__/guestsList.test.js b/src/components/inventoryGuests/__tests__/inventoryGuests.test.js similarity index 84% rename from src/components/guestsList/__tests__/guestsList.test.js rename to src/components/inventoryGuests/__tests__/inventoryGuests.test.js index 91f20a5e6..5e5670567 100644 --- a/src/components/guestsList/__tests__/guestsList.test.js +++ b/src/components/inventoryGuests/__tests__/inventoryGuests.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import { GuestsList } from '../guestsList'; +import { InventoryGuests } from '../inventoryGuests'; describe('GuestsList Component', () => { it('should render a basic component', async () => { @@ -8,7 +8,7 @@ describe('GuestsList Component', () => { numberOfGuests: 0 }; - const component = await shallowHookComponent(); + const component = await shallowHookComponent(); expect(component).toMatchSnapshot('basic render'); }); @@ -26,7 +26,7 @@ describe('GuestsList Component', () => { }) }; - const component = await shallowHookComponent(); + const component = await shallowHookComponent(); expect(component).toMatchSnapshot('variable data'); component.setProps({ @@ -47,7 +47,7 @@ describe('GuestsList Component', () => { }) }; - const component = await shallowHookComponent(); + const component = await shallowHookComponent(); expect(component).toMatchSnapshot('initial pending'); component.setProps({ @@ -76,7 +76,7 @@ describe('GuestsList Component', () => { }) }; - const component = await shallowHookComponent(); + const component = await shallowHookComponent(); component .find('.curiosity-table-scroll-list') .simulate('scroll', { target: { scrollHeight: 200, scrollTop: 100, clientHeight: 100 } }); diff --git a/src/components/guestsList/__tests__/guestsListContext.test.js b/src/components/inventoryGuests/__tests__/inventoryGuestsContext.test.js similarity index 99% rename from src/components/guestsList/__tests__/guestsListContext.test.js rename to src/components/inventoryGuests/__tests__/inventoryGuestsContext.test.js index d659a0915..f24471bab 100644 --- a/src/components/guestsList/__tests__/guestsListContext.test.js +++ b/src/components/inventoryGuests/__tests__/inventoryGuestsContext.test.js @@ -1,4 +1,4 @@ -import { context, useGetGuestsInventory, useOnScroll } from '../guestsListContext'; +import { context, useGetGuestsInventory, useOnScroll } from '../inventoryGuestsContext'; import { RHSM_API_QUERY_SET_TYPES } from '../../../services/rhsm/rhsmConstants'; describe('InventorySubscriptionsContext', () => { diff --git a/src/components/guestsList/guestsList.deprecated.js b/src/components/inventoryGuests/guestsList.deprecated.js similarity index 99% rename from src/components/guestsList/guestsList.deprecated.js rename to src/components/inventoryGuests/guestsList.deprecated.js index 812139d73..7f371bc0c 100644 --- a/src/components/guestsList/guestsList.deprecated.js +++ b/src/components/inventoryGuests/guestsList.deprecated.js @@ -4,7 +4,7 @@ import { TableVariant } from '@patternfly/react-table'; import { helpers } from '../../common'; import { apiQueries, connect, reduxActions, reduxSelectors } from '../../redux'; import { Loader } from '../loader/loader'; -import { inventoryCardHelpers } from '../inventoryList/inventoryCardHelpers'; +import { inventoryCardHelpers } from '../inventoryCard/inventoryCardHelpers'; import { RHSM_API_QUERY_TYPES } from '../../types/rhsmApiTypes'; import { Table } from '../table/table'; diff --git a/src/components/guestsList/guestsList.js b/src/components/inventoryGuests/inventoryGuests.js similarity index 93% rename from src/components/guestsList/guestsList.js rename to src/components/inventoryGuests/inventoryGuests.js index 30eebbd49..48c44a0fb 100644 --- a/src/components/guestsList/guestsList.js +++ b/src/components/inventoryGuests/inventoryGuests.js @@ -4,10 +4,10 @@ import { TableVariant } from '@patternfly/react-table'; import { useProductInventoryGuestsConfig, useProductInventoryGuestsQuery } from '../productView/productViewContext'; import { connect, reduxSelectors } from '../../redux'; import { Loader } from '../loader/loader'; -import { inventoryCardHelpers } from '../inventoryList/inventoryCardHelpers'; +import { inventoryCardHelpers } from '../inventoryCard/inventoryCardHelpers'; import { RHSM_API_QUERY_SET_TYPES } from '../../services/rhsm/rhsmConstants'; import { Table } from '../table/table'; -import { useGetGuestsInventory, useOnScroll } from './guestsListContext'; +import { useGetGuestsInventory, useOnScroll } from './inventoryGuestsContext'; /** * A system inventory guests component. @@ -24,7 +24,7 @@ import { useGetGuestsInventory, useOnScroll } from './guestsListContext'; * @fires onScroll * @returns {Node} */ -const GuestsList = ({ +const InventoryGuests = ({ defaultPerPage, id, numberOfGuests, @@ -149,7 +149,7 @@ const GuestsList = ({ * @type {{useProductInventoryGuestsConfig: Function, session: object, useOnScroll: Function, numberOfGuests: number, * id: string, useGetGuestsInventory: Function, useProductInventoryGuestsQuery: Function, defaultPerPage: number}} */ -GuestsList.propTypes = { +InventoryGuests.propTypes = { defaultPerPage: PropTypes.number, id: PropTypes.string.isRequired, numberOfGuests: PropTypes.number.isRequired, @@ -166,7 +166,7 @@ GuestsList.propTypes = { * @type {{useProductInventoryGuestsConfig: Function, session: object, useOnScroll: Function, * useGetGuestsInventory: Function, useProductInventoryGuestsQuery: Function, defaultPerPage: number}} */ -GuestsList.defaultProps = { +InventoryGuests.defaultProps = { defaultPerPage: 5, session: {}, useGetGuestsInventory, @@ -182,6 +182,6 @@ GuestsList.defaultProps = { */ const makeMapStateToProps = reduxSelectors.user.makeUserSession(); -const ConnectedGuestsList = connect(makeMapStateToProps)(GuestsList); +const ConnectedInventoryGuests = connect(makeMapStateToProps)(InventoryGuests); -export { ConnectedGuestsList as default, ConnectedGuestsList, GuestsList }; +export { ConnectedInventoryGuests as default, ConnectedInventoryGuests, InventoryGuests }; diff --git a/src/components/guestsList/guestsListContext.js b/src/components/inventoryGuests/inventoryGuestsContext.js similarity index 100% rename from src/components/guestsList/guestsListContext.js rename to src/components/inventoryGuests/inventoryGuestsContext.js diff --git a/src/components/productView/__tests__/__snapshots__/productView.test.js.snap b/src/components/productView/__tests__/__snapshots__/productView.test.js.snap index 8394a938b..7c36e7a63 100644 --- a/src/components/productView/__tests__/__snapshots__/productView.test.js.snap +++ b/src/components/productView/__tests__/__snapshots__/productView.test.js.snap @@ -137,7 +137,7 @@ exports[`ProductView Component should allow custom inventory displays via config key="inventory_subs_lorem" title="t(curiosity-inventory.tabSubscriptions, {\\"context\\":\\"lorem\\"})" > - - - + )} diff --git a/src/components/productView/productViewOpenShiftContainer.js b/src/components/productView/productViewOpenShiftContainer.js index ee866b1e0..793e9cbaf 100644 --- a/src/components/productView/productViewOpenShiftContainer.js +++ b/src/components/productView/productViewOpenShiftContainer.js @@ -13,8 +13,8 @@ import { ToolbarFieldUom } from '../toolbar/toolbarFieldUom'; import { ToolbarFieldGranularity } from '../toolbar/toolbarFieldGranularity'; import { ToolbarFieldRangedMonthly } from '../toolbar/toolbarFieldRangedMonthly'; import { Toolbar } from '../toolbar/toolbar'; -import InventoryList from '../inventoryList/inventoryList.deprecated'; -import InventorySubscriptions from '../inventorySubscriptions/inventorySubscriptions'; +import InventoryList from '../inventoryCard/inventoryList.deprecated'; +import InventoryCardSubscriptions from '../inventoryCardSubscriptions/inventoryCardSubscriptions'; import InventoryTabs, { InventoryTab } from '../inventoryTabs/inventoryTabs'; import { translate } from '../i18n/i18n'; import { helpers } from '../../common'; @@ -135,7 +135,7 @@ const ProductViewOpenShiftContainer = ({ t, useRouteDetail: useAliasRouteDetail key={`inventory_subs_${productId}`} title={t('curiosity-inventory.tabSubscriptions', { context: productId })} > - + )} diff --git a/src/config/__tests__/product.openshiftContainer.test.js b/src/config/__tests__/product.openshiftContainer.test.js index 5c35a5d28..5869a5aa1 100644 --- a/src/config/__tests__/product.openshiftContainer.test.js +++ b/src/config/__tests__/product.openshiftContainer.test.js @@ -1,5 +1,5 @@ import { config } from '../product.openshiftContainer'; -import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers'; +import { parseRowCellsListData } from '../../components/inventoryCard/inventoryCardHelpers'; import { RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES, RHSM_API_QUERY_TYPES diff --git a/src/config/__tests__/product.openshiftDedicated.test.js b/src/config/__tests__/product.openshiftDedicated.test.js index 31a713044..d2c59d82c 100644 --- a/src/config/__tests__/product.openshiftDedicated.test.js +++ b/src/config/__tests__/product.openshiftDedicated.test.js @@ -1,5 +1,5 @@ import { config } from '../product.openshiftDedicated'; -import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers'; +import { parseRowCellsListData } from '../../components/inventoryCard/inventoryCardHelpers'; import { RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES, RHSM_API_QUERY_TYPES diff --git a/src/config/__tests__/product.openshiftMetrics.test.js b/src/config/__tests__/product.openshiftMetrics.test.js index f8d7614d3..8abe55a43 100644 --- a/src/config/__tests__/product.openshiftMetrics.test.js +++ b/src/config/__tests__/product.openshiftMetrics.test.js @@ -1,5 +1,5 @@ import { config } from '../product.openshiftMetrics'; -import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers'; +import { parseRowCellsListData } from '../../components/inventoryCard/inventoryCardHelpers'; import { RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES, RHSM_API_QUERY_TYPES diff --git a/src/config/__tests__/product.rhel.test.js b/src/config/__tests__/product.rhel.test.js index 822583ad2..d595e5731 100644 --- a/src/config/__tests__/product.rhel.test.js +++ b/src/config/__tests__/product.rhel.test.js @@ -1,5 +1,5 @@ import { config } from '../product.rhel'; -import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers'; +import { parseRowCellsListData } from '../../components/inventoryCard/inventoryCardHelpers'; import { RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES, RHSM_API_QUERY_TYPES diff --git a/src/config/__tests__/product.rhosak.test.js b/src/config/__tests__/product.rhosak.test.js index f74eac086..e79e61f2c 100644 --- a/src/config/__tests__/product.rhosak.test.js +++ b/src/config/__tests__/product.rhosak.test.js @@ -1,6 +1,6 @@ import { config } from '../product.rhosak'; import { generateChartSettings } from '../../components/graphCard/graphCardHelpers'; -import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers'; +import { parseRowCellsListData } from '../../components/inventoryCard/inventoryCardHelpers'; import { RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES, RHSM_API_RESPONSE_INSTANCES_DATA_TYPES as INVENTORY_TYPES, diff --git a/src/config/__tests__/product.satellite.test.js b/src/config/__tests__/product.satellite.test.js index 6524b2a5f..cf13f1c9b 100644 --- a/src/config/__tests__/product.satellite.test.js +++ b/src/config/__tests__/product.satellite.test.js @@ -1,5 +1,5 @@ import { config } from '../product.satellite'; -import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers'; +import { parseRowCellsListData } from '../../components/inventoryCard/inventoryCardHelpers'; import { RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES, RHSM_API_QUERY_TYPES diff --git a/tests/__snapshots__/code.test.js.snap b/tests/__snapshots__/code.test.js.snap index a6dcfff4e..baa76ace8 100644 --- a/tests/__snapshots__/code.test.js.snap +++ b/tests/__snapshots__/code.test.js.snap @@ -2,10 +2,10 @@ exports[`General code checks should only have specific console.[warn|log|info|error] methods: console methods 1`] = ` Array [ - "components/inventoryList/inventoryCardContext.js:127: console.warn(\`Sorting can only be performed on select fields, confirm field \${id} is allowed.\`);", - "components/inventoryList/inventoryCardHelpers.js:194: console.error(", - "components/inventoryList/inventoryList.deprecated.js:62: console.warn(\`Sorting can only be performed on select fields, confirm field \${id} is allowed.\`);", - "components/inventorySubscriptions/inventorySubscriptionsContext.js:127: console.warn(\`Sorting can only be performed on select fields, confirm field \${id} is allowed.\`);", + "components/inventoryCard/inventoryCardContext.js:127: console.warn(\`Sorting can only be performed on select fields, confirm field \${id} is allowed.\`);", + "components/inventoryCard/inventoryCardHelpers.js:194: console.error(", + "components/inventoryCard/inventoryList.deprecated.js:62: console.warn(\`Sorting can only be performed on select fields, confirm field \${id} is allowed.\`);", + "components/inventoryCardSubscriptions/inventoryCardSubscriptionsContext.js:127: console.warn(\`Sorting can only be performed on select fields, confirm field \${id} is allowed.\`);", "redux/common/reduxHelpers.js:282: console.error(\`Error: Property \${prop} does not exist within the passed state.\`, state);", "redux/common/reduxHelpers.js:286: console.warn(\`Warning: Property \${prop} does not exist within the passed initialState.\`, initialState);", "services/common/helpers.js:64: console.error(", diff --git a/tests/__snapshots__/dist.test.js.snap b/tests/__snapshots__/dist.test.js.snap index 61670d4b7..71f0dcc12 100644 --- a/tests/__snapshots__/dist.test.js.snap +++ b/tests/__snapshots__/dist.test.js.snap @@ -11,7 +11,6 @@ Array [ "./dist/fonts/graph2x.png", "./dist/fonts/graph4x.png", "./dist/index.html", - "./dist/js/1001*js", "./dist/js/1014*js", "./dist/js/1026*js", "./dist/js/1138*js", @@ -25,15 +24,18 @@ Array [ "./dist/js/1750*js", "./dist/js/1799*js", "./dist/js/1858*js", - "./dist/js/1988*js", "./dist/js/1995*js", + "./dist/js/2195*js", + "./dist/js/2243*js", + "./dist/js/2293*js", "./dist/js/2635*js", "./dist/js/2664*js", "./dist/js/2738*js", + "./dist/js/2881*js", + "./dist/js/2896*js", "./dist/js/2902*js", - "./dist/js/3056*js", - "./dist/js/3060*js", "./dist/js/31*js", + "./dist/js/325*js", "./dist/js/3267*js", "./dist/js/3313*js", "./dist/js/3366*js", @@ -42,6 +44,7 @@ Array [ "./dist/js/384*js", "./dist/js/3935*js", "./dist/js/3935*txt", + "./dist/js/4004*js", "./dist/js/4024*js", "./dist/js/4044*js", "./dist/js/4096*js", @@ -51,18 +54,17 @@ Array [ "./dist/js/4291*js", "./dist/js/4291*txt", "./dist/js/4314*js", - "./dist/js/4379*js", - "./dist/js/4393*js", "./dist/js/4418*js", "./dist/js/4569*js", "./dist/js/4569*txt", "./dist/js/4590*js", "./dist/js/4590*txt", "./dist/js/4944*js", - "./dist/js/5016*js", "./dist/js/5020*js", "./dist/js/5068*js", + "./dist/js/5242*js", "./dist/js/5394*js", + "./dist/js/5473*js", "./dist/js/5555*js", "./dist/js/5876*js", "./dist/js/608*js", @@ -71,23 +73,20 @@ Array [ "./dist/js/6491*js", "./dist/js/655*js", "./dist/js/655*txt", - "./dist/js/6580*js", - "./dist/js/6745*js", "./dist/js/6816*js", "./dist/js/6873*js", "./dist/js/6937*js", "./dist/js/6937*txt", - "./dist/js/7015*js", "./dist/js/7159*js", "./dist/js/7159*txt", "./dist/js/7235*js", "./dist/js/7294*js", "./dist/js/7294*txt", "./dist/js/7514*js", - "./dist/js/7573*js", "./dist/js/7585*js", "./dist/js/7891*js", "./dist/js/8139*js", + "./dist/js/8191*js", "./dist/js/8213*js", "./dist/js/8216*js", "./dist/js/8216*txt", @@ -98,6 +97,7 @@ Array [ "./dist/js/8341*js", "./dist/js/8412*js", "./dist/js/8503*js", + "./dist/js/8526*js", "./dist/js/8551*js", "./dist/js/8683*js", "./dist/js/8710*js", @@ -124,7 +124,6 @@ Array [ "./dist/locales/en-US.json", "./dist/locales/en.json", "./dist/locales/locales.json", - "./dist/sourcemaps/1001*map", "./dist/sourcemaps/1014*map", "./dist/sourcemaps/1026*map", "./dist/sourcemaps/1138*map", @@ -138,13 +137,16 @@ Array [ "./dist/sourcemaps/1750*map", "./dist/sourcemaps/1799*map", "./dist/sourcemaps/1858*map", - "./dist/sourcemaps/1988*map", "./dist/sourcemaps/1995*map", + "./dist/sourcemaps/2195*map", + "./dist/sourcemaps/2243*map", + "./dist/sourcemaps/2293*map", "./dist/sourcemaps/2738*map", + "./dist/sourcemaps/2881*map", + "./dist/sourcemaps/2896*map", "./dist/sourcemaps/2902*map", - "./dist/sourcemaps/3056*map", - "./dist/sourcemaps/3060*map", "./dist/sourcemaps/31*map", + "./dist/sourcemaps/325*map", "./dist/sourcemaps/3267*map", "./dist/sourcemaps/3313*map", "./dist/sourcemaps/3366*map", @@ -152,6 +154,7 @@ Array [ "./dist/sourcemaps/361*map", "./dist/sourcemaps/384*map", "./dist/sourcemaps/3935*map", + "./dist/sourcemaps/4004*map", "./dist/sourcemaps/4024*map", "./dist/sourcemaps/4044*map", "./dist/sourcemaps/4096*map", @@ -160,16 +163,15 @@ Array [ "./dist/sourcemaps/4220*map", "./dist/sourcemaps/4291*map", "./dist/sourcemaps/4314*map", - "./dist/sourcemaps/4379*map", - "./dist/sourcemaps/4393*map", "./dist/sourcemaps/4418*map", "./dist/sourcemaps/4569*map", "./dist/sourcemaps/4590*map", "./dist/sourcemaps/4944*map", - "./dist/sourcemaps/5016*map", "./dist/sourcemaps/5020*map", "./dist/sourcemaps/5068*map", + "./dist/sourcemaps/5242*map", "./dist/sourcemaps/5394*map", + "./dist/sourcemaps/5473*map", "./dist/sourcemaps/5555*map", "./dist/sourcemaps/5876*map", "./dist/sourcemaps/608*map", @@ -177,20 +179,17 @@ Array [ "./dist/sourcemaps/6395*map", "./dist/sourcemaps/6491*map", "./dist/sourcemaps/655*map", - "./dist/sourcemaps/6580*map", - "./dist/sourcemaps/6745*map", "./dist/sourcemaps/6816*map", "./dist/sourcemaps/6873*map", "./dist/sourcemaps/6937*map", - "./dist/sourcemaps/7015*map", "./dist/sourcemaps/7159*map", "./dist/sourcemaps/7235*map", "./dist/sourcemaps/7294*map", "./dist/sourcemaps/7514*map", - "./dist/sourcemaps/7573*map", "./dist/sourcemaps/7585*map", "./dist/sourcemaps/7891*map", "./dist/sourcemaps/8139*map", + "./dist/sourcemaps/8191*map", "./dist/sourcemaps/8213*map", "./dist/sourcemaps/8216*map", "./dist/sourcemaps/8232*map", @@ -200,6 +199,7 @@ Array [ "./dist/sourcemaps/8341*map", "./dist/sourcemaps/8412*map", "./dist/sourcemaps/8503*map", + "./dist/sourcemaps/8526*map", "./dist/sourcemaps/8551*map", "./dist/sourcemaps/8683*map", "./dist/sourcemaps/8710*map",