From deacb43d87050a7dc8ff143573b12ce1ecc6c69f Mon Sep 17 00:00:00 2001 From: Dan Labrecque Date: Tue, 24 Aug 2021 11:54:29 -0400 Subject: [PATCH 1/2] Convert patternfly react-icon from js to esm paths --- jest.config.js | 6 ++++-- src/components/state/emptyFilterState/emptyFilterState.tsx | 2 +- src/components/state/emptyValueState/emptyValueState.tsx | 2 +- src/components/state/errorState/errorState.tsx | 4 ++-- src/pages/costModels/components/errorState.tsx | 2 +- src/pages/costModels/components/inputs/rateInput.tsx | 2 +- src/pages/costModels/components/rateForm/rateForm.tsx | 2 +- .../costModels/components/rateForm/taggingRatesForm.tsx | 2 +- src/pages/costModels/components/toolbar/primarySelector.tsx | 2 +- src/pages/costModels/components/warningIcon.tsx | 2 +- .../costModels/costModel/assignSourcesModalToolbar.tsx | 2 +- src/pages/costModels/costModel/dialog.tsx | 2 +- src/pages/costModels/costModel/index.tsx | 2 +- src/pages/costModels/costModel/priceListTable.tsx | 2 +- src/pages/costModels/costModel/sourcesToolbar.tsx | 2 +- src/pages/costModels/costModel/table.tsx | 2 +- src/pages/costModels/costModelsDetails/header.tsx | 2 +- src/pages/costModels/costModelsDetails/noCostModels.tsx | 2 +- src/pages/costModels/costModelsDetails/noMatchFound.tsx | 2 +- src/pages/costModels/costModelsDetails/utils/filters.tsx | 2 +- src/pages/costModels/costModelsDetails/utils/toolbar.tsx | 2 +- .../createCostModelWizard/assignSourcesToolbar.tsx | 2 +- src/pages/costModels/createCostModelWizard/index.tsx | 2 +- .../costModels/createCostModelWizard/priceListTable.tsx | 2 +- src/pages/costModels/createCostModelWizard/review.tsx | 2 +- src/pages/state/noData/noDataState.tsx | 2 +- src/pages/state/noProviders/noProvidersState.tsx | 4 ++-- src/pages/views/components/dataToolbar/dataToolbar.tsx | 6 +++--- src/pages/views/details/awsDetails/detailsTable.tsx | 2 +- src/pages/views/details/azureDetails/detailsTable.tsx | 2 +- .../views/details/components/breakdown/breakdownHeader.tsx | 2 +- .../details/components/costOverview/costOverviewBase.tsx | 2 +- .../views/details/components/priceList/noRatesState.tsx | 2 +- src/pages/views/details/components/tag/tagLink.tsx | 2 +- src/pages/views/details/gcpDetails/detailsTable.tsx | 2 +- src/pages/views/details/ibmDetails/detailsTable.tsx | 2 +- src/pages/views/details/ocpDetails/detailsTable.tsx | 2 +- src/pages/views/explorer/explorerTable.tsx | 2 +- src/pages/views/overview/overview.tsx | 2 +- 39 files changed, 46 insertions(+), 44 deletions(-) diff --git a/jest.config.js b/jest.config.js index b74bf9a42..e10b580b3 100644 --- a/jest.config.js +++ b/jest.config.js @@ -3,9 +3,10 @@ module.exports = { clearMocks: true, timers: 'fake', transform: { - '^.+\\.(ts|tsx)$': '/test/transformTS.js', + '^.+\\.[jt]sx?$': '/test/transformTS.js', '^.+\\.(jpg)$': '/test/transformFile.js', }, + transformIgnorePatterns: ['node_modules/(?!@patternfly/react-icons/dist/esm)'], setupFiles: ['./test/test.env.ts'], testRegex: '\\.test\\.(jsx?|tsx?)$', moduleFileExtensions: ['ts', 'tsx', 'js'], @@ -13,7 +14,8 @@ module.exports = { moduleNameMapper: { '\\.(css|less|sass|scss)$': '/test/styleMock.js', }, + roots: ['/src'], snapshotSerializers: ['enzyme-to-json/serializer'], - testPathIgnorePatterns: ['/archive/'], + testPathIgnorePatterns: ['node_modules/(?!@patternfly/react-icons/dist/esm)'], testURL: 'http://localhost/', }; diff --git a/src/components/state/emptyFilterState/emptyFilterState.tsx b/src/components/state/emptyFilterState/emptyFilterState.tsx index 3ccec98ce..0247c1e67 100644 --- a/src/components/state/emptyFilterState/emptyFilterState.tsx +++ b/src/components/state/emptyFilterState/emptyFilterState.tsx @@ -1,5 +1,5 @@ import { EmptyState, EmptyStateBody, EmptyStateIcon, Title, TitleSizes } from '@patternfly/react-core'; -import { SearchIcon } from '@patternfly/react-icons/dist/js/icons/search-icon'; +import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon'; import { OcpCloudQuery, parseQuery } from 'api/queries/ocpCloudQuery'; import React from 'react'; import { WithTranslation, withTranslation } from 'react-i18next'; diff --git a/src/components/state/emptyValueState/emptyValueState.tsx b/src/components/state/emptyValueState/emptyValueState.tsx index b6f1e42ca..b1d870a86 100644 --- a/src/components/state/emptyValueState/emptyValueState.tsx +++ b/src/components/state/emptyValueState/emptyValueState.tsx @@ -1,6 +1,6 @@ import './emptyValueState.scss'; -import { MinusIcon } from '@patternfly/react-icons/dist/js/icons/minus-icon'; +import { MinusIcon } from '@patternfly/react-icons/dist/esm/icons/minus-icon'; import React from 'react'; export const EmptyValueState: React.SFC = () => { diff --git a/src/components/state/errorState/errorState.tsx b/src/components/state/errorState/errorState.tsx index dfee078c6..292af593f 100644 --- a/src/components/state/errorState/errorState.tsx +++ b/src/components/state/errorState/errorState.tsx @@ -1,6 +1,6 @@ import { EmptyState, EmptyStateBody, EmptyStateIcon, EmptyStateVariant, Title } from '@patternfly/react-core'; -import { ErrorCircleOIcon } from '@patternfly/react-icons/dist/js/icons/error-circle-o-icon'; -import { LockIcon } from '@patternfly/react-icons/dist/js/icons/lock-icon'; +import { ErrorCircleOIcon } from '@patternfly/react-icons/dist/esm/icons/error-circle-o-icon'; +import { LockIcon } from '@patternfly/react-icons/dist/esm/icons/lock-icon'; import { AxiosError } from 'axios'; import React from 'react'; import { WithTranslation, withTranslation } from 'react-i18next'; diff --git a/src/pages/costModels/components/errorState.tsx b/src/pages/costModels/components/errorState.tsx index fd2a4c072..187e24b24 100644 --- a/src/pages/costModels/components/errorState.tsx +++ b/src/pages/costModels/components/errorState.tsx @@ -10,7 +10,7 @@ import { Title, TitleSizes, } from '@patternfly/react-core'; -import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-circle-icon'; +import { ExclamationCircleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-circle-icon'; import global_DangerColor_100 from '@patternfly/react-tokens/dist/js/global_danger_color_100'; import React from 'react'; import { Trans, useTranslation } from 'react-i18next'; diff --git a/src/pages/costModels/components/inputs/rateInput.tsx b/src/pages/costModels/components/inputs/rateInput.tsx index aa82e016d..ee7614d3d 100644 --- a/src/pages/costModels/components/inputs/rateInput.tsx +++ b/src/pages/costModels/components/inputs/rateInput.tsx @@ -6,7 +6,7 @@ import { TextInput, TextInputProps, } from '@patternfly/react-core'; -import { DollarSignIcon } from '@patternfly/react-icons/dist/js/icons/dollar-sign-icon'; +import { DollarSignIcon } from '@patternfly/react-icons/dist/esm/icons/dollar-sign-icon'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/src/pages/costModels/components/rateForm/rateForm.tsx b/src/pages/costModels/components/rateForm/rateForm.tsx index 64dae50ee..035727205 100644 --- a/src/pages/costModels/components/rateForm/rateForm.tsx +++ b/src/pages/costModels/components/rateForm/rateForm.tsx @@ -1,5 +1,5 @@ import { Button, ButtonVariant, FormGroup, Grid, GridItem, Radio, Switch } from '@patternfly/react-core'; -import { PlusCircleIcon } from '@patternfly/react-icons/dist/js/icons/plus-circle-icon'; +import { PlusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon'; import { MetricHash } from 'api/metrics'; import { RateInputBase } from 'pages/costModels/components/inputs/rateInput'; import { Selector } from 'pages/costModels/components/inputs/selector'; diff --git a/src/pages/costModels/components/rateForm/taggingRatesForm.tsx b/src/pages/costModels/components/rateForm/taggingRatesForm.tsx index d615008b7..cec38b8dc 100644 --- a/src/pages/costModels/components/rateForm/taggingRatesForm.tsx +++ b/src/pages/costModels/components/rateForm/taggingRatesForm.tsx @@ -1,5 +1,5 @@ import { Button, ButtonVariant, Checkbox, FormGroup, Split, SplitItem } from '@patternfly/react-core'; -import { MinusCircleIcon } from '@patternfly/react-icons/dist/js/icons/minus-circle-icon'; +import { MinusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/minus-circle-icon'; import { RateInputBase } from 'pages/costModels/components/inputs/rateInput'; import { SimpleInput } from 'pages/costModels/components/inputs/simpleInput'; import React from 'react'; diff --git a/src/pages/costModels/components/toolbar/primarySelector.tsx b/src/pages/costModels/components/toolbar/primarySelector.tsx index 53102b771..dfd93f410 100644 --- a/src/pages/costModels/components/toolbar/primarySelector.tsx +++ b/src/pages/costModels/components/toolbar/primarySelector.tsx @@ -1,5 +1,5 @@ import { Select, SelectOption } from '@patternfly/react-core'; -import { FilterIcon } from '@patternfly/react-icons/dist/js/icons/filter-icon'; +import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon'; import { WithStateMachine } from 'pages/costModels/components/hoc/withStateMachine'; import { selectMachineState } from 'pages/costModels/components/logic/selectStateMachine'; import { Option } from 'pages/costModels/components/logic/types'; diff --git a/src/pages/costModels/components/warningIcon.tsx b/src/pages/costModels/components/warningIcon.tsx index 90d58e17a..bcac1de3c 100644 --- a/src/pages/costModels/components/warningIcon.tsx +++ b/src/pages/costModels/components/warningIcon.tsx @@ -1,5 +1,5 @@ import { Tooltip } from '@patternfly/react-core'; -import { WarningTriangleIcon } from '@patternfly/react-icons/dist/js/icons/warning-triangle-icon'; +import { WarningTriangleIcon } from '@patternfly/react-icons/dist/esm/icons/warning-triangle-icon'; import React from 'react'; interface WarningIconProps { diff --git a/src/pages/costModels/costModel/assignSourcesModalToolbar.tsx b/src/pages/costModels/costModel/assignSourcesModalToolbar.tsx index 4e615e670..904cad597 100644 --- a/src/pages/costModels/costModel/assignSourcesModalToolbar.tsx +++ b/src/pages/costModels/costModel/assignSourcesModalToolbar.tsx @@ -9,7 +9,7 @@ import { ToolbarFilter, ToolbarItem, } from '@patternfly/react-core'; -import { SearchIcon } from '@patternfly/react-icons/dist/js/icons/search-icon'; +import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon'; import React from 'react'; import { WithTranslation, withTranslation } from 'react-i18next'; import { Omit } from 'react-redux'; diff --git a/src/pages/costModels/costModel/dialog.tsx b/src/pages/costModels/costModel/dialog.tsx index 573128d9b..dfe5c19ec 100644 --- a/src/pages/costModels/costModel/dialog.tsx +++ b/src/pages/costModels/costModel/dialog.tsx @@ -1,5 +1,5 @@ import { Alert, Button, Modal, Title, TitleSizes } from '@patternfly/react-core'; -import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon'; +import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon'; import React from 'react'; import { WithTranslation, withTranslation } from 'react-i18next'; diff --git a/src/pages/costModels/costModel/index.tsx b/src/pages/costModels/costModel/index.tsx index fc80a3c7a..83662ae00 100644 --- a/src/pages/costModels/costModel/index.tsx +++ b/src/pages/costModels/costModel/index.tsx @@ -8,7 +8,7 @@ import { Title, TitleSizes, } from '@patternfly/react-core'; -import { ErrorCircleOIcon } from '@patternfly/react-icons/dist/js/icons/error-circle-o-icon'; +import { ErrorCircleOIcon } from '@patternfly/react-icons/dist/esm/icons/error-circle-o-icon'; import Main from '@redhat-cloud-services/frontend-components/Main'; import PageHeader, { PageHeaderTitle } from '@redhat-cloud-services/frontend-components/PageHeader'; import { CostModel } from 'api/costModels'; diff --git a/src/pages/costModels/costModel/priceListTable.tsx b/src/pages/costModels/costModel/priceListTable.tsx index bfa5e48a6..df4073ee2 100644 --- a/src/pages/costModels/costModel/priceListTable.tsx +++ b/src/pages/costModels/costModel/priceListTable.tsx @@ -14,7 +14,7 @@ import { ToolbarItem, ToolbarItemVariant, } from '@patternfly/react-core'; -import { FileInvoiceDollarIcon } from '@patternfly/react-icons/dist/js/icons/file-invoice-dollar-icon'; +import { FileInvoiceDollarIcon } from '@patternfly/react-icons/dist/esm/icons/file-invoice-dollar-icon'; import { Unavailable } from '@redhat-cloud-services/frontend-components/Unavailable'; import { CostModel } from 'api/costModels'; import { MetricHash } from 'api/metrics'; diff --git a/src/pages/costModels/costModel/sourcesToolbar.tsx b/src/pages/costModels/costModel/sourcesToolbar.tsx index bc519cf25..819089c8a 100644 --- a/src/pages/costModels/costModel/sourcesToolbar.tsx +++ b/src/pages/costModels/costModel/sourcesToolbar.tsx @@ -11,7 +11,7 @@ import { ToolbarFilter, ToolbarItem, } from '@patternfly/react-core'; -import { SearchIcon } from '@patternfly/react-icons/dist/js/icons/search-icon'; +import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon'; import { ReadOnlyTooltip } from 'pages/costModels/components/readOnlyTooltip'; import React from 'react'; diff --git a/src/pages/costModels/costModel/table.tsx b/src/pages/costModels/costModel/table.tsx index 05d12ec88..412647cf8 100644 --- a/src/pages/costModels/costModel/table.tsx +++ b/src/pages/costModels/costModel/table.tsx @@ -1,5 +1,5 @@ import { EmptyState, EmptyStateBody, EmptyStateIcon, Title, TitleSizes } from '@patternfly/react-core'; -import { DollarSignIcon } from '@patternfly/react-icons/dist/js/icons/dollar-sign-icon'; +import { DollarSignIcon } from '@patternfly/react-icons/dist/esm/icons/dollar-sign-icon'; import { CostModel } from 'api/costModels'; import { EmptyFilterState } from 'components/state/emptyFilterState/emptyFilterState'; import { addMultiValueQuery, removeMultiValueQuery } from 'pages/costModels/components/filterLogic'; diff --git a/src/pages/costModels/costModelsDetails/header.tsx b/src/pages/costModels/costModelsDetails/header.tsx index 4fb32704a..ca939803c 100644 --- a/src/pages/costModels/costModelsDetails/header.tsx +++ b/src/pages/costModels/costModelsDetails/header.tsx @@ -1,5 +1,5 @@ import { Button, ButtonVariant, Popover, TextContent, Title, TitleSizes } from '@patternfly/react-core'; -import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/js/icons/outlined-question-circle-icon'; +import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon'; import React from 'react'; import { Trans, WithTranslation, withTranslation } from 'react-i18next'; import { connect } from 'react-redux'; diff --git a/src/pages/costModels/costModelsDetails/noCostModels.tsx b/src/pages/costModels/costModelsDetails/noCostModels.tsx index 08b3f3b38..2f970f24c 100644 --- a/src/pages/costModels/costModelsDetails/noCostModels.tsx +++ b/src/pages/costModels/costModelsDetails/noCostModels.tsx @@ -1,4 +1,4 @@ -import { PlusCircleIcon } from '@patternfly/react-icons/dist/js/icons/plus-circle-icon'; +import { PlusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon'; import HookIntoProps from 'hook-into-props'; import { CreateCostModelButton } from 'pages/costModels/costModelsDetails/createCostModelButton'; import React from 'react'; diff --git a/src/pages/costModels/costModelsDetails/noMatchFound.tsx b/src/pages/costModels/costModelsDetails/noMatchFound.tsx index 7ec9c6cdf..95c5e7d31 100644 --- a/src/pages/costModels/costModelsDetails/noMatchFound.tsx +++ b/src/pages/costModels/costModelsDetails/noMatchFound.tsx @@ -1,4 +1,4 @@ -import { SearchIcon } from '@patternfly/react-icons/dist/js/icons/search-icon'; +import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon'; import HookIntoProps from 'hook-into-props'; import { useTranslation } from 'react-i18next'; diff --git a/src/pages/costModels/costModelsDetails/utils/filters.tsx b/src/pages/costModels/costModelsDetails/utils/filters.tsx index 6a6da18a5..f219df670 100644 --- a/src/pages/costModels/costModelsDetails/utils/filters.tsx +++ b/src/pages/costModels/costModelsDetails/utils/filters.tsx @@ -10,7 +10,7 @@ import { ToolbarFilterProps, ToolbarProps, } from '@patternfly/react-core'; -import { SearchIcon } from '@patternfly/react-icons/dist/js/icons/search-icon'; +import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon'; import HookIntoProps from 'hook-into-props'; import React from 'react'; import { WithTranslation, withTranslation } from 'react-i18next'; diff --git a/src/pages/costModels/costModelsDetails/utils/toolbar.tsx b/src/pages/costModels/costModelsDetails/utils/toolbar.tsx index 07d2b6879..a1e3e1d46 100644 --- a/src/pages/costModels/costModelsDetails/utils/toolbar.tsx +++ b/src/pages/costModels/costModelsDetails/utils/toolbar.tsx @@ -7,7 +7,7 @@ import { SelectProps, SelectVariant, } from '@patternfly/react-core'; -import { FilterIcon } from '@patternfly/react-icons/dist/js/icons/filter-icon'; +import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon'; import HookIntoProps from 'hook-into-props'; import React from 'react'; import { WithTranslation, withTranslation } from 'react-i18next'; diff --git a/src/pages/costModels/createCostModelWizard/assignSourcesToolbar.tsx b/src/pages/costModels/createCostModelWizard/assignSourcesToolbar.tsx index 4e615e670..904cad597 100644 --- a/src/pages/costModels/createCostModelWizard/assignSourcesToolbar.tsx +++ b/src/pages/costModels/createCostModelWizard/assignSourcesToolbar.tsx @@ -9,7 +9,7 @@ import { ToolbarFilter, ToolbarItem, } from '@patternfly/react-core'; -import { SearchIcon } from '@patternfly/react-icons/dist/js/icons/search-icon'; +import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon'; import React from 'react'; import { WithTranslation, withTranslation } from 'react-i18next'; import { Omit } from 'react-redux'; diff --git a/src/pages/costModels/createCostModelWizard/index.tsx b/src/pages/costModels/createCostModelWizard/index.tsx index b6344aa8b..283d139b0 100644 --- a/src/pages/costModels/createCostModelWizard/index.tsx +++ b/src/pages/costModels/createCostModelWizard/index.tsx @@ -1,6 +1,6 @@ import { Title, TitleSizes, Wizard, WizardStepFunctionType } from '@patternfly/react-core'; import { Button, Modal } from '@patternfly/react-core'; -import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/js/icons/exclamation-triangle-icon'; +import { ExclamationTriangleIcon } from '@patternfly/react-icons/dist/esm/icons/exclamation-triangle-icon'; import { addCostModel } from 'api/costModels'; import { MetricHash } from 'api/metrics'; import { Rate } from 'api/rates'; diff --git a/src/pages/costModels/createCostModelWizard/priceListTable.tsx b/src/pages/costModels/createCostModelWizard/priceListTable.tsx index 2d117c012..475679a9e 100644 --- a/src/pages/costModels/createCostModelWizard/priceListTable.tsx +++ b/src/pages/costModels/createCostModelWizard/priceListTable.tsx @@ -13,7 +13,7 @@ import { Title, TitleSizes, } from '@patternfly/react-core'; -import { PlusCircleIcon } from '@patternfly/react-icons/dist/js/icons/plus-circle-icon'; +import { PlusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon'; import { MetricHash } from 'api/metrics'; import { EmptyFilterState } from 'components/state/emptyFilterState/emptyFilterState'; import { WithPriceListSearch } from 'pages/costModels/components/hoc/withPriceListSearch'; diff --git a/src/pages/costModels/createCostModelWizard/review.tsx b/src/pages/costModels/createCostModelWizard/review.tsx index 0b1504c73..7be7710a0 100644 --- a/src/pages/costModels/createCostModelWizard/review.tsx +++ b/src/pages/costModels/createCostModelWizard/review.tsx @@ -17,7 +17,7 @@ import { Title, TitleSizes, } from '@patternfly/react-core'; -import { OkIcon } from '@patternfly/react-icons/dist/js/icons/ok-icon'; +import { OkIcon } from '@patternfly/react-icons/dist/esm/icons/ok-icon'; import { RateTable } from 'pages/costModels/components/rateTable'; import { WarningIcon } from 'pages/costModels/components/warningIcon'; import React from 'react'; diff --git a/src/pages/state/noData/noDataState.tsx b/src/pages/state/noData/noDataState.tsx index 835b65174..55413908f 100644 --- a/src/pages/state/noData/noDataState.tsx +++ b/src/pages/state/noData/noDataState.tsx @@ -1,5 +1,5 @@ import { Button, EmptyState, EmptyStateBody, EmptyStateIcon, EmptyStateVariant, Title } from '@patternfly/react-core'; -import { FileInvoiceDollarIcon } from '@patternfly/react-icons/dist/js/icons/file-invoice-dollar-icon'; +import { FileInvoiceDollarIcon } from '@patternfly/react-icons/dist/esm/icons/file-invoice-dollar-icon'; import React from 'react'; import { WithTranslation, withTranslation } from 'react-i18next'; import { RouteComponentProps, withRouter } from 'react-router-dom'; diff --git a/src/pages/state/noProviders/noProvidersState.tsx b/src/pages/state/noProviders/noProvidersState.tsx index 8cf069644..83d2a1675 100644 --- a/src/pages/state/noProviders/noProvidersState.tsx +++ b/src/pages/state/noProviders/noProvidersState.tsx @@ -1,6 +1,6 @@ import { Button, EmptyState, EmptyStateBody, EmptyStateIcon, EmptyStateVariant, Title } from '@patternfly/react-core'; -import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/js/icons/external-link-alt-icon'; -import { PlusCircleIcon } from '@patternfly/react-icons/dist/js/icons/plus-circle-icon'; +import { ExternalLinkAltIcon } from '@patternfly/react-icons/dist/esm/icons/external-link-alt-icon'; +import { PlusCircleIcon } from '@patternfly/react-icons/dist/esm/icons/plus-circle-icon'; import { ProviderType } from 'api/providers'; import CostIcon from 'components/icons/costIcon'; import React from 'react'; diff --git a/src/pages/views/components/dataToolbar/dataToolbar.tsx b/src/pages/views/components/dataToolbar/dataToolbar.tsx index 2f34ef118..7f80723fd 100644 --- a/src/pages/views/components/dataToolbar/dataToolbar.tsx +++ b/src/pages/views/components/dataToolbar/dataToolbar.tsx @@ -22,9 +22,9 @@ import { ToolbarItem, ToolbarToggleGroup, } from '@patternfly/react-core'; -import { ExportIcon } from '@patternfly/react-icons/dist/js/icons/export-icon'; -import { FilterIcon } from '@patternfly/react-icons/dist/js/icons/filter-icon'; -import { SearchIcon } from '@patternfly/react-icons/dist/js/icons/search-icon'; +import { ExportIcon } from '@patternfly/react-icons/dist/esm/icons/export-icon'; +import { FilterIcon } from '@patternfly/react-icons/dist/esm/icons/filter-icon'; +import { SearchIcon } from '@patternfly/react-icons/dist/esm/icons/search-icon'; import { Org } from 'api/orgs/org'; import { orgUnitIdKey, orgUnitNameKey, Query, tagKey, tagPrefix } from 'api/queries/query'; import { ResourcePathsType } from 'api/resources/resource'; diff --git a/src/pages/views/details/awsDetails/detailsTable.tsx b/src/pages/views/details/awsDetails/detailsTable.tsx index 75469abf1..058c5014d 100644 --- a/src/pages/views/details/awsDetails/detailsTable.tsx +++ b/src/pages/views/details/awsDetails/detailsTable.tsx @@ -1,7 +1,7 @@ import './awsDetailsTable.scss'; import { Bullseye, EmptyState, EmptyStateBody, EmptyStateIcon, Spinner } from '@patternfly/react-core'; -import { CalculatorIcon } from '@patternfly/react-icons/dist/js/icons/calculator-icon'; +import { CalculatorIcon } from '@patternfly/react-icons/dist/esm/icons/calculator-icon'; import { sortable, SortByDirection, Table, TableBody, TableHeader } from '@patternfly/react-table'; import { AwsQuery, getQuery } from 'api/queries/awsQuery'; import { tagPrefix } from 'api/queries/query'; diff --git a/src/pages/views/details/azureDetails/detailsTable.tsx b/src/pages/views/details/azureDetails/detailsTable.tsx index 6da57a073..66e1c363b 100644 --- a/src/pages/views/details/azureDetails/detailsTable.tsx +++ b/src/pages/views/details/azureDetails/detailsTable.tsx @@ -1,7 +1,7 @@ import './azureDetailsTable.scss'; import { Bullseye, EmptyState, EmptyStateBody, EmptyStateIcon, Spinner } from '@patternfly/react-core'; -import { CalculatorIcon } from '@patternfly/react-icons/dist/js/icons/calculator-icon'; +import { CalculatorIcon } from '@patternfly/react-icons/dist/esm/icons/calculator-icon'; import { sortable, SortByDirection, Table, TableBody, TableHeader } from '@patternfly/react-table'; import { AzureQuery, getQuery } from 'api/queries/azureQuery'; import { tagPrefix } from 'api/queries/query'; diff --git a/src/pages/views/details/components/breakdown/breakdownHeader.tsx b/src/pages/views/details/components/breakdown/breakdownHeader.tsx index b7bd53558..7eb7369f6 100644 --- a/src/pages/views/details/components/breakdown/breakdownHeader.tsx +++ b/src/pages/views/details/components/breakdown/breakdownHeader.tsx @@ -1,7 +1,7 @@ import './breakdownHeader.scss'; import { Title, TitleSizes } from '@patternfly/react-core'; -import { AngleLeftIcon } from '@patternfly/react-icons/dist/js/icons/angle-left-icon'; +import { AngleLeftIcon } from '@patternfly/react-icons/dist/esm/icons/angle-left-icon'; import { breakdownDescKey, breakdownTitleKey, getQueryRoute, orgUnitIdKey, Query } from 'api/queries/query'; import { Report } from 'api/reports/report'; import { TagPathsType } from 'api/tags/tag'; diff --git a/src/pages/views/details/components/costOverview/costOverviewBase.tsx b/src/pages/views/details/components/costOverview/costOverviewBase.tsx index 1a6358cb8..6986ac4cc 100644 --- a/src/pages/views/details/components/costOverview/costOverviewBase.tsx +++ b/src/pages/views/details/components/costOverview/costOverviewBase.tsx @@ -10,7 +10,7 @@ import { Title, TitleSizes, } from '@patternfly/react-core'; -import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons'; +import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon'; import { orgUnitIdKey, Query, tagPrefix } from 'api/queries/query'; import { Report } from 'api/reports/report'; import { Cluster } from 'pages/views/details/components/cluster/cluster'; diff --git a/src/pages/views/details/components/priceList/noRatesState.tsx b/src/pages/views/details/components/priceList/noRatesState.tsx index 1216be0f6..354ce8844 100644 --- a/src/pages/views/details/components/priceList/noRatesState.tsx +++ b/src/pages/views/details/components/priceList/noRatesState.tsx @@ -1,5 +1,5 @@ import { EmptyState as PfEmptyState, EmptyStateBody, EmptyStateIcon, Title, TitleSizes } from '@patternfly/react-core'; -import { MoneyCheckAltIcon } from '@patternfly/react-icons/dist/js/icons/money-check-alt-icon'; +import { MoneyCheckAltIcon } from '@patternfly/react-icons/dist/esm/icons/money-check-alt-icon'; import React from 'react'; import { WithTranslation, withTranslation } from 'react-i18next'; diff --git a/src/pages/views/details/components/tag/tagLink.tsx b/src/pages/views/details/components/tag/tagLink.tsx index 6c0f9f81f..31e2f3769 100644 --- a/src/pages/views/details/components/tag/tagLink.tsx +++ b/src/pages/views/details/components/tag/tagLink.tsx @@ -1,4 +1,4 @@ -import { TagIcon } from '@patternfly/react-icons/dist/js/icons/tag-icon'; +import { TagIcon } from '@patternfly/react-icons/dist/esm/icons/tag-icon'; import { getQuery, logicalAndPrefix, orgUnitIdKey, parseQuery, Query } from 'api/queries/query'; import { Tag, TagPathsType, TagType } from 'api/tags/tag'; import { getGroupById, getGroupByOrgValue, getGroupByValue } from 'pages/views/utils/groupBy'; diff --git a/src/pages/views/details/gcpDetails/detailsTable.tsx b/src/pages/views/details/gcpDetails/detailsTable.tsx index ce9e2de98..23961b9bf 100644 --- a/src/pages/views/details/gcpDetails/detailsTable.tsx +++ b/src/pages/views/details/gcpDetails/detailsTable.tsx @@ -1,7 +1,7 @@ import './gcpDetailsTable.scss'; import { Bullseye, EmptyState, EmptyStateBody, EmptyStateIcon, Spinner } from '@patternfly/react-core'; -import { CalculatorIcon } from '@patternfly/react-icons/dist/js/icons/calculator-icon'; +import { CalculatorIcon } from '@patternfly/react-icons/dist/esm/icons/calculator-icon'; import { sortable, SortByDirection, Table, TableBody, TableHeader } from '@patternfly/react-table'; import { GcpQuery, getQuery } from 'api/queries/gcpQuery'; import { tagPrefix } from 'api/queries/query'; diff --git a/src/pages/views/details/ibmDetails/detailsTable.tsx b/src/pages/views/details/ibmDetails/detailsTable.tsx index a448413a7..bfa9ad125 100644 --- a/src/pages/views/details/ibmDetails/detailsTable.tsx +++ b/src/pages/views/details/ibmDetails/detailsTable.tsx @@ -1,7 +1,7 @@ import './ibmDetailsTable.scss'; import { Bullseye, EmptyState, EmptyStateBody, EmptyStateIcon, Spinner } from '@patternfly/react-core'; -import { CalculatorIcon } from '@patternfly/react-icons/dist/js/icons/calculator-icon'; +import { CalculatorIcon } from '@patternfly/react-icons/dist/esm/icons/calculator-icon'; import { sortable, SortByDirection, Table, TableBody, TableHeader } from '@patternfly/react-table'; import { getQuery, IbmQuery } from 'api/queries/ibmQuery'; import { tagPrefix } from 'api/queries/query'; diff --git a/src/pages/views/details/ocpDetails/detailsTable.tsx b/src/pages/views/details/ocpDetails/detailsTable.tsx index e9b33e366..831411bc8 100644 --- a/src/pages/views/details/ocpDetails/detailsTable.tsx +++ b/src/pages/views/details/ocpDetails/detailsTable.tsx @@ -1,7 +1,7 @@ import './detailsTable.scss'; import { Bullseye, EmptyState, EmptyStateBody, EmptyStateIcon, Spinner } from '@patternfly/react-core'; -import { CalculatorIcon } from '@patternfly/react-icons/dist/js/icons/calculator-icon'; +import { CalculatorIcon } from '@patternfly/react-icons/dist/esm/icons/calculator-icon'; import { sortable, SortByDirection, Table, TableBody, TableHeader } from '@patternfly/react-table'; import { ProviderType } from 'api/providers'; import { getQuery, OcpQuery } from 'api/queries/ocpQuery'; diff --git a/src/pages/views/explorer/explorerTable.tsx b/src/pages/views/explorer/explorerTable.tsx index 2287f89d7..fe68bd9d1 100644 --- a/src/pages/views/explorer/explorerTable.tsx +++ b/src/pages/views/explorer/explorerTable.tsx @@ -1,7 +1,7 @@ import './explorerTable.scss'; import { Bullseye, EmptyState, EmptyStateBody, EmptyStateIcon, Spinner } from '@patternfly/react-core'; -import { CalculatorIcon } from '@patternfly/react-icons/dist/js/icons/calculator-icon'; +import { CalculatorIcon } from '@patternfly/react-icons/dist/esm/icons/calculator-icon'; import { nowrap, sortable, SortByDirection, Table, TableBody, TableHeader } from '@patternfly/react-table'; import { AwsQuery, getQuery } from 'api/queries/awsQuery'; import { parseQuery, Query } from 'api/queries/query'; diff --git a/src/pages/views/overview/overview.tsx b/src/pages/views/overview/overview.tsx index 00154d5b2..ecfc895d9 100644 --- a/src/pages/views/overview/overview.tsx +++ b/src/pages/views/overview/overview.tsx @@ -11,7 +11,7 @@ import { Title, TitleSizes, } from '@patternfly/react-core'; -import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/js/icons/outlined-question-circle-icon'; +import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons/dist/esm/icons/outlined-question-circle-icon'; import { Providers, ProviderType } from 'api/providers'; import { getProvidersQuery } from 'api/queries/providersQuery'; import { getUserAccessQuery } from 'api/queries/userAccessQuery'; From efebbeabe4558bede49c4b5de6176d5ac701d10b Mon Sep 17 00:00:00 2001 From: Dan Labrecque Date: Tue, 24 Aug 2021 12:37:55 -0400 Subject: [PATCH 2/2] Use esm import paths for @patternfly/react-icons https://issues.redhat.com/browse/COST-1793 --- jest.config.js | 1 - package.json | 2 +- test/transformTS.js | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jest.config.js b/jest.config.js index e10b580b3..03e16df0f 100644 --- a/jest.config.js +++ b/jest.config.js @@ -16,6 +16,5 @@ module.exports = { }, roots: ['/src'], snapshotSerializers: ['enzyme-to-json/serializer'], - testPathIgnorePatterns: ['node_modules/(?!@patternfly/react-icons/dist/esm)'], testURL: 'http://localhost/', }; diff --git a/package.json b/package.json index dbc7c6081..05f1d991b 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "start": "node scripts/start-dev-server.js", "start:dev": "NODE_OPTIONS=--max-old-space-size=8192 webpack serve -c ./webpack.config.js", "stats": "yarn build:client --profile --json > stats.json", - "test": "jest", + "test": "jest --clearCache && jest", "manifest:update": "node scripts/createManifest", "codemods:test": "yarn pf-codemods ./src", "container:test": "docker stop -t 0 koku-ui-test >/dev/null; docker build -t koku-ui-test . && docker run -i --rm -p 8080:8080 --name koku-ui-test koku-ui-test", diff --git a/test/transformTS.js b/test/transformTS.js index 763b987fd..d5956cea1 100644 --- a/test/transformTS.js +++ b/test/transformTS.js @@ -13,7 +13,7 @@ delete options.sourceMap; module.exports = { process(src, path) { - if (path.endsWith('.ts') || path.endsWith('.tsx')) { + if (path.endsWith('.ts') || path.endsWith('.tsx') || path.includes('@patternfly/react-icons/dist/esm')) { return tsc.transpile(src, options, path, []); } return src;