Skip to content

Commit

Permalink
refactor(inventoryCard): ent-4572 rename from inventoryList (#857)
Browse files Browse the repository at this point in the history
  • Loading branch information
cdcabrera committed Mar 8, 2022
1 parent 68959cb commit e633b5b
Show file tree
Hide file tree
Showing 19 changed files with 44 additions and 44 deletions.
4 changes: 2 additions & 2 deletions src/components/guestsList/guestsList.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 { inventoryListHelpers } from '../inventoryList/inventoryListHelpers';
import { inventoryCardHelpers } from '../inventoryList/inventoryCardHelpers';
import { RHSM_API_QUERY_TYPES } from '../../types/rhsmApiTypes';
import { Table } from '../table/table';

Expand Down Expand Up @@ -121,7 +121,7 @@ class GuestsList extends React.Component {
let updatedColumnHeaders = [];

const updatedRows = [...previousData, ...(listData || [])].map(({ ...cellData }) => {
const { columnHeaders, cells } = inventoryListHelpers.parseRowCellsListData({
const { columnHeaders, cells } = inventoryCardHelpers.parseRowCellsListData({
filters: filterGuestsData,
cellData,
session
Expand Down
26 changes: 13 additions & 13 deletions src/components/i18n/__tests__/__snapshots__/i18n.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,7 @@ Array [
],
},
Object {
"file": "./src/components/inventoryList/inventoryList.deprecated.js",
"keys": Array [
Object {
"key": "curiosity-inventory.tab",
"match": "t('curiosity-inventory.tab', { context: 'disabled' })",
},
],
},
Object {
"file": "./src/components/inventoryList/inventoryList.js",
"file": "./src/components/inventoryList/inventoryCard.js",
"keys": Array [
Object {
"key": "curiosity-inventory.tab",
Expand All @@ -180,7 +171,7 @@ Array [
],
},
Object {
"file": "./src/components/inventoryList/inventoryListHelpers.js",
"file": "./src/components/inventoryList/inventoryCardHelpers.js",
"keys": Array [
Object {
"key": "curiosity-inventory.header",
Expand All @@ -192,6 +183,15 @@ Array [
},
],
},
Object {
"file": "./src/components/inventoryList/inventoryList.deprecated.js",
"keys": Array [
Object {
"key": "curiosity-inventory.tab",
"match": "t('curiosity-inventory.tab', { context: 'disabled' })",
},
],
},
Object {
"file": "./src/components/inventorySubscriptions/inventorySubscriptions.js",
"keys": Array [
Expand Down Expand Up @@ -702,11 +702,11 @@ Array [
"key": "curiosity-graph.label",
},
Object {
"file": "./src/components/inventoryList/inventoryList.deprecated.js",
"file": "./src/components/inventoryList/inventoryCard.js",
"key": "curiosity-inventory.tab",
},
Object {
"file": "./src/components/inventoryList/inventoryList.js",
"file": "./src/components/inventoryList/inventoryList.deprecated.js",
"key": "curiosity-inventory.tab",
},
Object {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { shallow } from 'enzyme';
import { SortByDirection } from '@patternfly/react-table';
import Table from '../../table/table';
import { InventoryList } from '../inventoryList';
import { InventoryList } from '../inventoryCard';
import { store } from '../../../redux';
import { RHSM_API_QUERY_TYPES } from '../../../types/rhsmApiTypes';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import {
inventoryListHelpers,
inventoryCardHelpers,
applySortFilters,
applyWrappableFilters,
parseInventoryFilters,
parseRowCellsListData
} from '../inventoryListHelpers';
} from '../inventoryCardHelpers';
import {
RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
RHSM_API_QUERY_TYPES
} from '../../../types/rhsmApiTypes';

describe('InventoryListHelpers', () => {
it('should have specific functions', () => {
expect(inventoryListHelpers).toMatchSnapshot('inventoryListHelpers');
expect(inventoryCardHelpers).toMatchSnapshot('inventoryListHelpers');
});

it('parseRowCellsListData should parse and return formatted/filtered table cells.', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Table from '../table/table';
import { Loader } from '../loader/loader';
import { MinHeight } from '../minHeight/minHeight';
import GuestsList from '../guestsList/guestsList';
import { inventoryListHelpers } from './inventoryListHelpers';
import { inventoryCardHelpers } from './inventoryCardHelpers';
import Pagination from '../pagination/pagination';
import { ToolbarFieldDisplayName } from '../toolbar/toolbarFieldDisplayName';
import { paginationHelpers } from '../pagination/paginationHelpers';
Expand Down Expand Up @@ -147,8 +147,8 @@ class InventoryList extends React.Component {
let updatedColumnHeaders = [];

const updatedRows = listData.map(({ ...cellData }) => {
const { columnHeaders, cells } = inventoryListHelpers.parseRowCellsListData({
filters: inventoryListHelpers.parseInventoryFilters({
const { columnHeaders, cells } = inventoryCardHelpers.parseRowCellsListData({
filters: inventoryCardHelpers.parseInventoryFilters({
filters: filterInventoryData,
onSort: this.onColumnSort,
query
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,16 +214,16 @@ const parseRowCellsListData = ({ filters = [], cellData = {}, session = {} }) =>
};
};

const inventoryListHelpers = {
const inventoryCardHelpers = {
applySortFilters,
applyWrappableFilters,
parseInventoryFilters,
parseRowCellsListData
};

export {
inventoryListHelpers as default,
inventoryListHelpers,
inventoryCardHelpers as default,
inventoryCardHelpers,
applySortFilters,
applyWrappableFilters,
parseInventoryFilters,
Expand Down
6 changes: 3 additions & 3 deletions src/components/inventoryList/inventoryList.deprecated.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Table from '../table/table';
import { Loader } from '../loader/loader';
import { MinHeight } from '../minHeight/minHeight';
import GuestsList from '../guestsList/guestsList';
import { inventoryListHelpers } from './inventoryListHelpers';
import { inventoryCardHelpers } from './inventoryCardHelpers';
import Pagination from '../pagination/pagination';
import { ToolbarFieldDisplayName } from '../toolbar/toolbarFieldDisplayName';
import { paginationHelpers } from '../pagination/paginationHelpers';
Expand Down Expand Up @@ -135,8 +135,8 @@ class InventoryList extends React.Component {
let updatedColumnHeaders = [];

const updatedRows = listData.map(({ ...cellData }) => {
const { columnHeaders, cells } = inventoryListHelpers.parseRowCellsListData({
filters: inventoryListHelpers.parseInventoryFilters({
const { columnHeaders, cells } = inventoryCardHelpers.parseRowCellsListData({
filters: inventoryCardHelpers.parseInventoryFilters({
filters: filterInventoryData,
onSort: this.onColumnSort,
query
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 { inventoryListHelpers } from '../inventoryList/inventoryListHelpers';
import { inventoryCardHelpers } from '../inventoryList/inventoryCardHelpers';
import Pagination from '../pagination/pagination';
import { paginationHelpers } from '../pagination/paginationHelpers';
import {
Expand Down Expand Up @@ -133,8 +133,8 @@ class InventorySubscriptions extends React.Component {
let updatedColumnHeaders = [];

const updatedRows = listData.map(({ ...cellData }) => {
const { columnHeaders, cells } = inventoryListHelpers.parseRowCellsListData({
filters: inventoryListHelpers.parseInventoryFilters({
const { columnHeaders, cells } = inventoryCardHelpers.parseRowCellsListData({
filters: inventoryCardHelpers.parseInventoryFilters({
filters: filterInventoryData,
onSort: this.onColumnSort,
query
Expand Down
2 changes: 1 addition & 1 deletion src/components/productView/productView.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ConnectedGraphCard as ConnectedGraphCardDeprecated } from '../graphCard
import { GraphCard } from '../graphCard/graphCard';
import { Toolbar } from '../toolbar/toolbar';
import { ConnectedInventoryList as ConnectedInventoryListDeprecated } from '../inventoryList/inventoryList.deprecated';
import { ConnectedInventoryList } from '../inventoryList/inventoryList';
import { ConnectedInventoryList } from '../inventoryList/inventoryCard';
import { helpers } from '../../common';
import BannerMessages from '../bannerMessages/bannerMessages';
import { SelectPosition } from '../form/select';
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/product.openshiftContainer.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { config } from '../product.openshiftContainer';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryListHelpers';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers';
import {
RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
RHSM_API_QUERY_TYPES
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/product.openshiftDedicated.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { config } from '../product.openshiftDedicated';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryListHelpers';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers';
import {
RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
RHSM_API_QUERY_TYPES
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/product.openshiftMetrics.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { config } from '../product.openshiftMetrics';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryListHelpers';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers';
import {
RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
RHSM_API_QUERY_TYPES
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/product.rhel.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { config } from '../product.rhel';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryListHelpers';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers';
import {
RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
RHSM_API_QUERY_TYPES
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/product.rhosak.test.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { config } from '../product.rhosak';
import { generateChartSettings } from '../../components/graphCard/graphCardHelpers';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryListHelpers';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers';
import {
RHSM_API_QUERY_INVENTORY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
RHSM_API_RESPONSE_INSTANCES_DATA_TYPES as INVENTORY_TYPES,
Expand Down
2 changes: 1 addition & 1 deletion src/config/__tests__/product.satellite.test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { config } from '../product.satellite';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryListHelpers';
import { parseRowCellsListData } from '../../components/inventoryList/inventoryCardHelpers';
import {
RHSM_API_QUERY_SORT_DIRECTION_TYPES as SORT_DIRECTION_TYPES,
RHSM_API_QUERY_TYPES
Expand Down
4 changes: 2 additions & 2 deletions tests/__snapshots__/code.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

exports[`General code checks should only have specific console.[warn|log|info|error] methods: console methods 1`] = `
Array [
"components/inventoryList/inventoryCard.js:74: 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/inventoryList/inventoryList.js:74: console.warn(\`Sorting can only be performed on select fields, confirm field \${id} is allowed.\`);",
"components/inventoryList/inventoryListHelpers.js:194: console.error(",
"components/inventorySubscriptions/inventorySubscriptions.js:60: 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);",
Expand Down
8 changes: 4 additions & 4 deletions tests/__snapshots__/dist.test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Array [
"./dist/js/1750*js",
"./dist/js/1799*js",
"./dist/js/1858*js",
"./dist/js/1988*js",
"./dist/js/1995*js",
"./dist/js/2635*js",
"./dist/js/2664*js",
Expand Down Expand Up @@ -53,7 +54,6 @@ Array [
"./dist/js/4569*txt",
"./dist/js/4590*js",
"./dist/js/4590*txt",
"./dist/js/4822*js",
"./dist/js/4944*js",
"./dist/js/5020*js",
"./dist/js/5068*js",
Expand All @@ -66,10 +66,10 @@ 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/6876*js",
"./dist/js/6937*js",
"./dist/js/6937*txt",
"./dist/js/7159*js",
Expand Down Expand Up @@ -131,6 +131,7 @@ Array [
"./dist/sourcemaps/1750*map",
"./dist/sourcemaps/1799*map",
"./dist/sourcemaps/1858*map",
"./dist/sourcemaps/1988*map",
"./dist/sourcemaps/1995*map",
"./dist/sourcemaps/2738*map",
"./dist/sourcemaps/2902*map",
Expand All @@ -154,7 +155,6 @@ Array [
"./dist/sourcemaps/4418*map",
"./dist/sourcemaps/4569*map",
"./dist/sourcemaps/4590*map",
"./dist/sourcemaps/4822*map",
"./dist/sourcemaps/4944*map",
"./dist/sourcemaps/5020*map",
"./dist/sourcemaps/5068*map",
Expand All @@ -166,10 +166,10 @@ 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/6876*map",
"./dist/sourcemaps/6937*map",
"./dist/sourcemaps/7159*map",
"./dist/sourcemaps/7235*map",
Expand Down

0 comments on commit e633b5b

Please sign in to comment.