From bb5692da47065b3803ce037ad35578e6ac6391c0 Mon Sep 17 00:00:00 2001 From: Azat Mutigullin Date: Wed, 21 Apr 2021 13:35:36 +0300 Subject: [PATCH] Improve eslint configuration --- kafka-ui-react-app/.eslintrc.json | 5 ++++- .../src/components/Alert/__tests__/Alert.spec.tsx | 2 +- .../src/components/Cluster/__tests__/Cluster.spec.tsx | 2 +- kafka-ui-react-app/src/components/Connect/List/ListItem.tsx | 2 +- .../src/components/Connect/List/__tests__/List.spec.tsx | 5 ++--- .../src/components/Connect/List/__tests__/ListItem.spec.tsx | 2 +- .../components/ConsumerGroups/ConsumersGroupsContainer.ts | 2 +- .../ClustersWidget/__test__/ClusterWidget.spec.tsx | 2 +- .../src/components/Nav/__tests__/ClusterMenu.spec.tsx | 2 +- .../src/components/Nav/__tests__/ClusterStatusIcon.spec.tsx | 2 +- .../src/components/Nav/__tests__/Nav.spec.tsx | 2 +- .../src/components/Schemas/Details/Details.tsx | 4 ++-- .../components/Schemas/Details/__test__/Details.spec.tsx | 4 ++-- .../Schemas/Details/__test__/LatestVersionItem.spec.tsx | 2 +- .../Schemas/Details/__test__/SchemaVersion.spec.tsx | 2 +- .../src/components/Schemas/List/__test__/List.spec.tsx | 4 ++-- .../src/components/Schemas/List/__test__/ListItem.spec.tsx | 2 +- .../src/components/Schemas/New/__test__/New.spec.tsx | 4 ++-- .../src/components/Schemas/__test__/Schemas.spec.tsx | 2 +- .../src/components/Topics/List/__tests__/List.spec.tsx | 2 +- .../src/components/Topics/List/__tests__/ListItem.spec.tsx | 2 +- .../Form/CustomParams/__tests__/CustomParamSelect.spec.tsx | 2 +- .../src/components/Version/__tests__/Version.spec.tsx | 2 +- .../common/Breadcrumb/__tests__/Breadcrumb.spec.tsx | 4 +++- .../common/BytesFormatted/__tests__/BytesFormatted.spec.tsx | 4 +++- .../ConfirmationModal/__test__/ConfirmationModal.spec.tsx | 2 +- .../common/Dashboard/__tests__/Indicator.spec.tsx | 2 +- .../common/Dashboard/__tests__/MetricsWrapper.spec.tsx | 2 +- .../components/common/Dropdown/__tests__/Dropdown.spec.tsx | 6 +++--- .../common/Dropdown/__tests__/DropdownItem.spec.tsx | 2 +- .../DynamicTextButton/__tests__/DynamicTextButton.spec.tsx | 2 +- .../common/PageLoader/__tests__/PageLoader.spec.tsx | 2 +- .../common/Pagination/__tests__/PageControl.spec.tsx | 4 +++- .../common/Pagination/__tests__/Pagination.spec.tsx | 4 +++- kafka-ui-react-app/src/lib/__tests__/paths.spec.ts | 2 +- .../src/lib/hooks/__tests__/useDataSaver.spec.tsx | 2 +- .../src/redux/actions/__test__/actions.spec.ts | 2 +- .../src/redux/actions/__test__/thunks/schemas.spec.ts | 2 +- kafka-ui-react-app/src/redux/actions/thunks/brokers.ts | 2 +- kafka-ui-react-app/src/redux/actions/thunks/clusters.ts | 2 +- .../src/redux/actions/thunks/consumerGroups.ts | 2 +- .../src/redux/reducers/alerts/__test__/selectors.spec.ts | 2 +- .../src/redux/reducers/clusters/__test__/selectors.spec.ts | 2 +- .../src/redux/reducers/consumerGroups/selectors.ts | 2 +- .../src/redux/reducers/schemas/__test__/selectors.spec.ts | 2 +- .../src/redux/reducers/topics/__test__/reducer.spec.ts | 2 +- 46 files changed, 64 insertions(+), 54 deletions(-) diff --git a/kafka-ui-react-app/.eslintrc.json b/kafka-ui-react-app/.eslintrc.json index d9f29abee6e..561abef8505 100644 --- a/kafka-ui-react-app/.eslintrc.json +++ b/kafka-ui-react-app/.eslintrc.json @@ -33,7 +33,10 @@ "jsx-a11y/label-has-associated-control": "off", "import/prefer-default-export": "off", "@typescript-eslint/no-explicit-any": "error", - "import/no-extraneous-dependencies": ["error", { "devDependencies": true }] + "import/no-extraneous-dependencies": ["error", { "devDependencies": true }], + "import/no-cycle": "error", + "import/order": ["error", {"groups": ["builtin", "external", "parent", "sibling", "index"]}], + "import/no-relative-parent-imports": "error" }, "overrides": [ { diff --git a/kafka-ui-react-app/src/components/Alert/__tests__/Alert.spec.tsx b/kafka-ui-react-app/src/components/Alert/__tests__/Alert.spec.tsx index 9e7061d8aa0..078abc57a80 100644 --- a/kafka-ui-react-app/src/components/Alert/__tests__/Alert.spec.tsx +++ b/kafka-ui-react-app/src/components/Alert/__tests__/Alert.spec.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { mount } from 'enzyme'; import { Alert as AlertProps } from 'redux/interfaces'; import * as actions from 'redux/actions/actions'; -import Alert from '../Alert'; +import Alert from 'components/Alert/Alert'; const id = 'test-id'; const title = 'My Alert Title'; diff --git a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx index 76b415519c8..f70283087a7 100644 --- a/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx +++ b/kafka-ui-react-app/src/components/Cluster/__tests__/Cluster.spec.tsx @@ -6,7 +6,7 @@ import { ClusterFeaturesEnum } from 'generated-sources'; import { fetchClusterListAction } from 'redux/actions'; import configureStore from 'redux/store/configureStore'; import { onlineClusterPayload } from 'redux/reducers/clusters/__test__/fixtures'; -import Cluster from '../Cluster'; +import Cluster from 'components/Cluster/Cluster'; const store = configureStore(); diff --git a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx index ec35c957cdd..e723217a33c 100644 --- a/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx +++ b/kafka-ui-react-app/src/components/Connect/List/ListItem.tsx @@ -10,7 +10,7 @@ import Dropdown from 'components/common/Dropdown/Dropdown'; import DropdownDivider from 'components/common/Dropdown/DropdownDivider'; import DropdownItem from 'components/common/Dropdown/DropdownItem'; import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal'; -import StatusTag from '../StatusTag'; +import StatusTag from 'components/Connect/StatusTag'; export interface ListItemProps { clusterName: ClusterName; diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx index 3c6c4bb96bf..94b52dc3efb 100644 --- a/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx +++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/List.spec.tsx @@ -8,9 +8,8 @@ import ClusterContext, { ContextProps, initialValue, } from 'components/contexts/ClusterContext'; - -import ListContainer from '../ListContainer'; -import List, { ListProps } from '../List'; +import ListContainer from 'components/Connect/List/ListContainer'; +import List, { ListProps } from 'components/Connect/List/List'; const store = configureStore(); diff --git a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx index 8d7213eb024..480ad8ac82e 100644 --- a/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx +++ b/kafka-ui-react-app/src/components/Connect/List/__tests__/ListItem.spec.tsx @@ -4,7 +4,7 @@ import { Provider } from 'react-redux'; import { BrowserRouter } from 'react-router-dom'; import { connectorsPayload } from 'redux/reducers/connect/__test__/fixtures'; import configureStore from 'redux/store/configureStore'; -import ListItem, { ListItemProps } from '../ListItem'; +import ListItem, { ListItemProps } from 'components/Connect/List/ListItem'; const store = configureStore(); diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/ConsumersGroupsContainer.ts b/kafka-ui-react-app/src/components/ConsumerGroups/ConsumersGroupsContainer.ts index 24fdbe97a92..d9fb44aefc6 100644 --- a/kafka-ui-react-app/src/components/ConsumerGroups/ConsumersGroupsContainer.ts +++ b/kafka-ui-react-app/src/components/ConsumerGroups/ConsumersGroupsContainer.ts @@ -2,8 +2,8 @@ import { connect } from 'react-redux'; import { fetchConsumerGroupsList } from 'redux/actions'; import { RootState, ClusterName } from 'redux/interfaces'; import { RouteComponentProps } from 'react-router-dom'; +import { getIsConsumerGroupsListFetched } from 'redux/reducers/consumerGroups/selectors'; import ConsumerGroups from './ConsumerGroups'; -import { getIsConsumerGroupsListFetched } from '../../redux/reducers/consumerGroups/selectors'; interface RouteProps { clusterName: ClusterName; diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClusterWidget.spec.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClusterWidget.spec.tsx index 6b65ed5553e..bc374c3f6fe 100644 --- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClusterWidget.spec.tsx +++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/__test__/ClusterWidget.spec.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { ServerStatus } from 'generated-sources'; import { clusterBrokersPath, clusterTopicsPath } from 'lib/paths'; -import ClusterWidget from '../ClusterWidget'; +import ClusterWidget from 'components/Dashboard/ClustersWidget/ClusterWidget'; import { offlineCluster, onlineCluster } from './fixtures'; describe('ClusterWidget', () => { diff --git a/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx b/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx index d5317656e38..56090b96439 100644 --- a/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx +++ b/kafka-ui-react-app/src/components/Nav/__tests__/ClusterMenu.spec.tsx @@ -3,7 +3,7 @@ import { mount } from 'enzyme'; import { StaticRouter } from 'react-router'; import { Cluster, ClusterFeaturesEnum } from 'generated-sources'; import { onlineClusterPayload } from 'redux/reducers/clusters/__test__/fixtures'; -import ClusterMenu from '../ClusterMenu'; +import ClusterMenu from 'components/Nav/ClusterMenu'; describe('ClusterMenu', () => { const setupComponent = (cluster: Cluster) => ( diff --git a/kafka-ui-react-app/src/components/Nav/__tests__/ClusterStatusIcon.spec.tsx b/kafka-ui-react-app/src/components/Nav/__tests__/ClusterStatusIcon.spec.tsx index 3edec5130ad..1ea7b758c40 100644 --- a/kafka-ui-react-app/src/components/Nav/__tests__/ClusterStatusIcon.spec.tsx +++ b/kafka-ui-react-app/src/components/Nav/__tests__/ClusterStatusIcon.spec.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { mount } from 'enzyme'; import { ServerStatus } from 'generated-sources'; -import ClusterStatusIcon from '../ClusterStatusIcon'; +import ClusterStatusIcon from 'components/Nav/ClusterStatusIcon'; describe('ClusterStatusIcon', () => { it('matches snapshot', () => { diff --git a/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx b/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx index 8f5bdb519b7..65b4f2b4a8b 100644 --- a/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx +++ b/kafka-ui-react-app/src/components/Nav/__tests__/Nav.spec.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { onlineClusterPayload } from 'redux/reducers/clusters/__test__/fixtures'; -import Nav from '../Nav'; +import Nav from 'components/Nav/Nav'; describe('Nav', () => { it('renders loader', () => { diff --git a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx index c5562a070d8..b785dcc1773 100644 --- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx +++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx @@ -4,10 +4,10 @@ import { ClusterName, SchemaName } from 'redux/interfaces'; import { clusterSchemasPath } from 'lib/paths'; import ClusterContext from 'components/contexts/ClusterContext'; import { useHistory } from 'react-router'; -import Breadcrumb from '../../common/Breadcrumb/Breadcrumb'; +import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb'; +import PageLoader from 'components/common/PageLoader/PageLoader'; import SchemaVersion from './SchemaVersion'; import LatestVersionItem from './LatestVersionItem'; -import PageLoader from '../../common/PageLoader/PageLoader'; export interface DetailsProps { subject: SchemaName; diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx index 9413cd9de61..f78c2b40eb1 100644 --- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx +++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/Details.spec.tsx @@ -4,8 +4,8 @@ import { shallow, mount } from 'enzyme'; import configureStore from 'redux/store/configureStore'; import { StaticRouter } from 'react-router'; import ClusterContext from 'components/contexts/ClusterContext'; -import DetailsContainer from '../DetailsContainer'; -import Details, { DetailsProps } from '../Details'; +import DetailsContainer from 'components/Schemas/Details/DetailsContainer'; +import Details, { DetailsProps } from 'components/Schemas/Details/Details'; import { schema, versions } from './fixtures'; const clusterName = 'testCluster'; diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/LatestVersionItem.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/LatestVersionItem.spec.tsx index 7a500c32cdd..9b42c0f2d7c 100644 --- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/LatestVersionItem.spec.tsx +++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/LatestVersionItem.spec.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; +import LatestVersionItem from 'components/Schemas/Details/LatestVersionItem'; import { schema } from './fixtures'; -import LatestVersionItem from '../LatestVersionItem'; describe('LatestVersionItem', () => { it('renders latest version of schema', () => { diff --git a/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx b/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx index 236a088a987..547a0945e39 100644 --- a/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx +++ b/kafka-ui-react-app/src/components/Schemas/Details/__test__/SchemaVersion.spec.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { shallow } from 'enzyme'; -import SchemaVersion from '../SchemaVersion'; +import SchemaVersion from 'components/Schemas/Details/SchemaVersion'; import { versions } from './fixtures'; describe('SchemaVersion', () => { diff --git a/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx b/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx index bcb7ad212a6..678b0281d35 100644 --- a/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx +++ b/kafka-ui-react-app/src/components/Schemas/List/__test__/List.spec.tsx @@ -4,8 +4,8 @@ import { Provider } from 'react-redux'; import { StaticRouter } from 'react-router'; import configureStore from 'redux/store/configureStore'; import ClusterContext from 'components/contexts/ClusterContext'; -import ListContainer from '../ListContainer'; -import List, { ListProps } from '../List'; +import ListContainer from 'components/Schemas/List/ListContainer'; +import List, { ListProps } from 'components/Schemas/List/List'; import { schemas } from './fixtures'; describe('List', () => { diff --git a/kafka-ui-react-app/src/components/Schemas/List/__test__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/Schemas/List/__test__/ListItem.spec.tsx index 8511b861fbc..7b6227e4fee 100644 --- a/kafka-ui-react-app/src/components/Schemas/List/__test__/ListItem.spec.tsx +++ b/kafka-ui-react-app/src/components/Schemas/List/__test__/ListItem.spec.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { mount } from 'enzyme'; import { BrowserRouter as Router } from 'react-router-dom'; +import ListItem from 'components/Schemas/List/ListItem'; import { schemas } from './fixtures'; -import ListItem from '../ListItem'; describe('ListItem', () => { const wrapper = mount( diff --git a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx index 283e198cd8d..1b14e748807 100644 --- a/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx +++ b/kafka-ui-react-app/src/components/Schemas/New/__test__/New.spec.tsx @@ -3,8 +3,8 @@ import configureStore from 'redux/store/configureStore'; import { mount, shallow } from 'enzyme'; import { Provider } from 'react-redux'; import { StaticRouter } from 'react-router-dom'; -import NewContainer from '../NewContainer'; -import New, { NewProps } from '../New'; +import NewContainer from 'components/Schemas/New/NewContainer'; +import New, { NewProps } from 'components/Schemas/New/New'; describe('New', () => { describe('Container', () => { diff --git a/kafka-ui-react-app/src/components/Schemas/__test__/Schemas.spec.tsx b/kafka-ui-react-app/src/components/Schemas/__test__/Schemas.spec.tsx index e643afeae94..327e530bc4b 100644 --- a/kafka-ui-react-app/src/components/Schemas/__test__/Schemas.spec.tsx +++ b/kafka-ui-react-app/src/components/Schemas/__test__/Schemas.spec.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import { StaticRouter } from 'react-router-dom'; -import Schemas from '../Schemas'; +import Schemas from 'components/Schemas/Schemas'; describe('Schemas', () => { const pathname = `/ui/clusters/clusterName/schemas`; diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx index faf33ddcd39..4548d5afed9 100644 --- a/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx +++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/List.spec.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { mount } from 'enzyme'; import { StaticRouter } from 'react-router-dom'; import ClusterContext from 'components/contexts/ClusterContext'; -import List from '../List'; +import List from 'components/Topics/List/List'; describe('List', () => { describe('when it has readonly flag', () => { diff --git a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListItem.spec.tsx b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListItem.spec.tsx index 26f16cdf77d..3b7b613f91e 100644 --- a/kafka-ui-react-app/src/components/Topics/List/__tests__/ListItem.spec.tsx +++ b/kafka-ui-react-app/src/components/Topics/List/__tests__/ListItem.spec.tsx @@ -5,7 +5,7 @@ import { externalTopicPayload, internalTopicPayload, } from 'redux/reducers/topics/__test__/fixtures'; -import ListItem, { ListItemProps } from '../ListItem'; +import ListItem, { ListItemProps } from 'components/Topics/List/ListItem'; const mockDelete = jest.fn(); const clusterName = 'local'; diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__tests__/CustomParamSelect.spec.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__tests__/CustomParamSelect.spec.tsx index f29e5555e1c..54b4c70aa1e 100644 --- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__tests__/CustomParamSelect.spec.tsx +++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/__tests__/CustomParamSelect.spec.tsx @@ -4,7 +4,7 @@ import { useForm, FormProvider } from 'react-hook-form'; import { TOPIC_CUSTOM_PARAMS } from 'lib/constants'; import CustomParamSelect, { CustomParamSelectProps, -} from '../CustomParamSelect'; +} from 'components/Topics/shared/Form/CustomParams/CustomParamSelect'; const existingFields = [ 'leader.replication.throttled.replicas', diff --git a/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx b/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx index 84e4c011f5d..8215bd8d275 100644 --- a/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx +++ b/kafka-ui-react-app/src/components/Version/__tests__/Version.spec.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import Version from '../Version'; +import Version from 'components/Version/Version'; const tag = 'v1.0.1-SHAPSHOT'; const commit = '123sdf34'; diff --git a/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx b/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx index c07c943ae87..6f1871fb7ad 100644 --- a/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx +++ b/kafka-ui-react-app/src/components/common/Breadcrumb/__tests__/Breadcrumb.spec.tsx @@ -1,7 +1,9 @@ import { mount, shallow } from 'enzyme'; import React from 'react'; import { StaticRouter } from 'react-router-dom'; -import Breadcrumb, { BreadcrumbItem } from '../Breadcrumb'; +import Breadcrumb, { + BreadcrumbItem, +} from 'components/common/Breadcrumb/Breadcrumb'; describe('Breadcrumb component', () => { const links: BreadcrumbItem[] = [ diff --git a/kafka-ui-react-app/src/components/common/BytesFormatted/__tests__/BytesFormatted.spec.tsx b/kafka-ui-react-app/src/components/common/BytesFormatted/__tests__/BytesFormatted.spec.tsx index 135673586c6..1ab5593bbd6 100644 --- a/kafka-ui-react-app/src/components/common/BytesFormatted/__tests__/BytesFormatted.spec.tsx +++ b/kafka-ui-react-app/src/components/common/BytesFormatted/__tests__/BytesFormatted.spec.tsx @@ -1,6 +1,8 @@ import { shallow } from 'enzyme'; import React from 'react'; -import BytesFormatted, { sizes } from '../BytesFormatted'; +import BytesFormatted, { + sizes, +} from 'components/common/BytesFormatted/BytesFormatted'; describe('BytesFormatted', () => { it('renders Bytes correctly', () => { diff --git a/kafka-ui-react-app/src/components/common/ConfirmationModal/__test__/ConfirmationModal.spec.tsx b/kafka-ui-react-app/src/components/common/ConfirmationModal/__test__/ConfirmationModal.spec.tsx index 17c2f1aa422..296dd52cbd0 100644 --- a/kafka-ui-react-app/src/components/common/ConfirmationModal/__test__/ConfirmationModal.spec.tsx +++ b/kafka-ui-react-app/src/components/common/ConfirmationModal/__test__/ConfirmationModal.spec.tsx @@ -2,7 +2,7 @@ import { mount, ReactWrapper } from 'enzyme'; import React from 'react'; import ConfirmationModal, { ConfirmationModalProps, -} from '../ConfirmationModal'; +} from 'components/common/ConfirmationModal/ConfirmationModal'; const confirmMock = jest.fn(); const cancelMock = jest.fn(); diff --git a/kafka-ui-react-app/src/components/common/Dashboard/__tests__/Indicator.spec.tsx b/kafka-ui-react-app/src/components/common/Dashboard/__tests__/Indicator.spec.tsx index 3709f9add18..d17128f261f 100644 --- a/kafka-ui-react-app/src/components/common/Dashboard/__tests__/Indicator.spec.tsx +++ b/kafka-ui-react-app/src/components/common/Dashboard/__tests__/Indicator.spec.tsx @@ -1,6 +1,6 @@ import { mount } from 'enzyme'; import React from 'react'; -import Indicator from '../Indicator'; +import Indicator from 'components/common/Dashboard/Indicator'; describe('Indicator', () => { it('matches the snapshot', () => { diff --git a/kafka-ui-react-app/src/components/common/Dashboard/__tests__/MetricsWrapper.spec.tsx b/kafka-ui-react-app/src/components/common/Dashboard/__tests__/MetricsWrapper.spec.tsx index c5871d50ff6..83e39cee18e 100644 --- a/kafka-ui-react-app/src/components/common/Dashboard/__tests__/MetricsWrapper.spec.tsx +++ b/kafka-ui-react-app/src/components/common/Dashboard/__tests__/MetricsWrapper.spec.tsx @@ -1,6 +1,6 @@ import { shallow } from 'enzyme'; import React from 'react'; -import MetricsWrapper from '../MetricsWrapper'; +import MetricsWrapper from 'components/common/Dashboard/MetricsWrapper'; describe('MetricsWrapper', () => { it('correctly adds classes', () => { diff --git a/kafka-ui-react-app/src/components/common/Dropdown/__tests__/Dropdown.spec.tsx b/kafka-ui-react-app/src/components/common/Dropdown/__tests__/Dropdown.spec.tsx index 5d32ef0c281..dce3b065201 100644 --- a/kafka-ui-react-app/src/components/common/Dropdown/__tests__/Dropdown.spec.tsx +++ b/kafka-ui-react-app/src/components/common/Dropdown/__tests__/Dropdown.spec.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { mount } from 'enzyme'; -import Dropdown, { DropdownProps } from '../Dropdown'; -import DropdownItem from '../DropdownItem'; -import DropdownDivider from '../DropdownDivider'; +import Dropdown, { DropdownProps } from 'components/common/Dropdown/Dropdown'; +import DropdownItem from 'components/common/Dropdown/DropdownItem'; +import DropdownDivider from 'components/common/Dropdown/DropdownDivider'; const dummyLable = 'My Test Label'; const dummyChildren = ( diff --git a/kafka-ui-react-app/src/components/common/Dropdown/__tests__/DropdownItem.spec.tsx b/kafka-ui-react-app/src/components/common/Dropdown/__tests__/DropdownItem.spec.tsx index 76ef7d704f3..e0d02bc69f5 100644 --- a/kafka-ui-react-app/src/components/common/Dropdown/__tests__/DropdownItem.spec.tsx +++ b/kafka-ui-react-app/src/components/common/Dropdown/__tests__/DropdownItem.spec.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount } from 'enzyme'; -import DropdownItem from '../DropdownItem'; +import DropdownItem from 'components/common/Dropdown/DropdownItem'; const onClick = jest.fn(); diff --git a/kafka-ui-react-app/src/components/common/DynamicTextButton/__tests__/DynamicTextButton.spec.tsx b/kafka-ui-react-app/src/components/common/DynamicTextButton/__tests__/DynamicTextButton.spec.tsx index 1255a65d097..453cc185450 100644 --- a/kafka-ui-react-app/src/components/common/DynamicTextButton/__tests__/DynamicTextButton.spec.tsx +++ b/kafka-ui-react-app/src/components/common/DynamicTextButton/__tests__/DynamicTextButton.spec.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; -import DynamicTextButton from '../DynamicTextButton'; +import DynamicTextButton from 'components/common/DynamicTextButton/DynamicTextButton'; describe('DynamicButton', () => { const mockCallback = jest.fn(); diff --git a/kafka-ui-react-app/src/components/common/PageLoader/__tests__/PageLoader.spec.tsx b/kafka-ui-react-app/src/components/common/PageLoader/__tests__/PageLoader.spec.tsx index 0e99792568c..4ff3dc438c7 100644 --- a/kafka-ui-react-app/src/components/common/PageLoader/__tests__/PageLoader.spec.tsx +++ b/kafka-ui-react-app/src/components/common/PageLoader/__tests__/PageLoader.spec.tsx @@ -1,6 +1,6 @@ import { mount } from 'enzyme'; import React from 'react'; -import PageLoader from '../PageLoader'; +import PageLoader from 'components/common/PageLoader/PageLoader'; describe('PageLoader', () => { it('matches the snapshot', () => { diff --git a/kafka-ui-react-app/src/components/common/Pagination/__tests__/PageControl.spec.tsx b/kafka-ui-react-app/src/components/common/Pagination/__tests__/PageControl.spec.tsx index 997f9019582..593f6d070fd 100644 --- a/kafka-ui-react-app/src/components/common/Pagination/__tests__/PageControl.spec.tsx +++ b/kafka-ui-react-app/src/components/common/Pagination/__tests__/PageControl.spec.tsx @@ -1,7 +1,9 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; import { StaticRouter } from 'react-router'; -import PageControl, { PageControlProps } from '../PageControl'; +import PageControl, { + PageControlProps, +} from 'components/common/Pagination/PageControl'; const page = 138; diff --git a/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx b/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx index 9411c7fc83f..ff90131c7ac 100644 --- a/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx +++ b/kafka-ui-react-app/src/components/common/Pagination/__tests__/Pagination.spec.tsx @@ -1,7 +1,9 @@ import React from 'react'; import { mount } from 'enzyme'; import { StaticRouter } from 'react-router'; -import Pagination, { PaginationProps } from '../Pagination'; +import Pagination, { + PaginationProps, +} from 'components/common/Pagination/Pagination'; describe('Pagination', () => { const setupWrapper = (search = '', props: Partial = {}) => ( diff --git a/kafka-ui-react-app/src/lib/__tests__/paths.spec.ts b/kafka-ui-react-app/src/lib/__tests__/paths.spec.ts index f1118960c70..70a2fe99f02 100644 --- a/kafka-ui-react-app/src/lib/__tests__/paths.spec.ts +++ b/kafka-ui-react-app/src/lib/__tests__/paths.spec.ts @@ -1,5 +1,5 @@ import { GIT_REPO_LINK } from 'lib/constants'; -import * as paths from '../paths'; +import * as paths from 'lib/paths'; describe('Paths', () => { it('gitCommitPath', () => { diff --git a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx index 1cec1e52d13..85a06d3ca5e 100644 --- a/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx +++ b/kafka-ui-react-app/src/lib/hooks/__tests__/useDataSaver.spec.tsx @@ -1,4 +1,4 @@ -import useDataSaver from '../useDataSaver'; +import useDataSaver from 'lib/hooks/useDataSaver'; describe('useDataSaver hook', () => { const content = { diff --git a/kafka-ui-react-app/src/redux/actions/__test__/actions.spec.ts b/kafka-ui-react-app/src/redux/actions/__test__/actions.spec.ts index f3deebdac81..365b574a8de 100644 --- a/kafka-ui-react-app/src/redux/actions/__test__/actions.spec.ts +++ b/kafka-ui-react-app/src/redux/actions/__test__/actions.spec.ts @@ -2,7 +2,7 @@ import { clusterSchemasPayload, schemaVersionsPayload, } from 'redux/reducers/schemas/__test__/fixtures'; -import * as actions from '../actions'; +import * as actions from 'redux/actions'; describe('Actions', () => { describe('fetchClusterStatsAction', () => { diff --git a/kafka-ui-react-app/src/redux/actions/__test__/thunks/schemas.spec.ts b/kafka-ui-react-app/src/redux/actions/__test__/thunks/schemas.spec.ts index acee59e8385..afcfda17af0 100644 --- a/kafka-ui-react-app/src/redux/actions/__test__/thunks/schemas.spec.ts +++ b/kafka-ui-react-app/src/redux/actions/__test__/thunks/schemas.spec.ts @@ -3,7 +3,7 @@ import * as actions from 'redux/actions/actions'; import * as thunks from 'redux/actions/thunks'; import * as schemaFixtures from 'redux/reducers/schemas/__test__/fixtures'; import mockStoreCreator from 'redux/store/configureStore/mockStoreCreator'; -import * as fixtures from '../fixtures'; +import * as fixtures from 'redux/actions/__test__/fixtures'; const store = mockStoreCreator; diff --git a/kafka-ui-react-app/src/redux/actions/thunks/brokers.ts b/kafka-ui-react-app/src/redux/actions/thunks/brokers.ts index eb0d9a133b7..b8be5f2001e 100644 --- a/kafka-ui-react-app/src/redux/actions/thunks/brokers.ts +++ b/kafka-ui-react-app/src/redux/actions/thunks/brokers.ts @@ -2,7 +2,7 @@ import { BrokersApi, Configuration } from 'generated-sources'; import { PromiseThunkResult, ClusterName, BrokerId } from 'redux/interfaces'; import { BASE_PARAMS } from 'lib/constants'; -import * as actions from '../actions'; +import * as actions from 'redux/actions/actions'; const apiClientConf = new Configuration(BASE_PARAMS); export const brokersApiClient = new BrokersApi(apiClientConf); diff --git a/kafka-ui-react-app/src/redux/actions/thunks/clusters.ts b/kafka-ui-react-app/src/redux/actions/thunks/clusters.ts index 0336336806b..26cd0778c35 100644 --- a/kafka-ui-react-app/src/redux/actions/thunks/clusters.ts +++ b/kafka-ui-react-app/src/redux/actions/thunks/clusters.ts @@ -2,7 +2,7 @@ import { ClustersApi, Configuration, Cluster } from 'generated-sources'; import { PromiseThunkResult, ClusterName } from 'redux/interfaces'; import { BASE_PARAMS } from 'lib/constants'; -import * as actions from '../actions'; +import * as actions from 'redux/actions/actions'; const apiClientConf = new Configuration(BASE_PARAMS); export const clustersApiClient = new ClustersApi(apiClientConf); diff --git a/kafka-ui-react-app/src/redux/actions/thunks/consumerGroups.ts b/kafka-ui-react-app/src/redux/actions/thunks/consumerGroups.ts index cddbfd7d554..97f1d799e47 100644 --- a/kafka-ui-react-app/src/redux/actions/thunks/consumerGroups.ts +++ b/kafka-ui-react-app/src/redux/actions/thunks/consumerGroups.ts @@ -6,7 +6,7 @@ import { } from 'redux/interfaces'; import { BASE_PARAMS } from 'lib/constants'; -import * as actions from '../actions'; +import * as actions from 'redux/actions/actions'; const apiClientConf = new Configuration(BASE_PARAMS); export const consumerGroupsApiClient = new ConsumerGroupsApi(apiClientConf); diff --git a/kafka-ui-react-app/src/redux/reducers/alerts/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/alerts/__test__/selectors.spec.ts index bd8a77d866d..bd71aa8fbc0 100644 --- a/kafka-ui-react-app/src/redux/reducers/alerts/__test__/selectors.spec.ts +++ b/kafka-ui-react-app/src/redux/reducers/alerts/__test__/selectors.spec.ts @@ -1,6 +1,6 @@ import configureStore from 'redux/store/configureStore'; import { createTopicAction } from 'redux/actions'; -import * as selectors from '../selectors'; +import * as selectors from 'redux/reducers/alerts/selectors'; import { failurePayload1, failurePayload2 } from './fixtures'; const store = configureStore(); diff --git a/kafka-ui-react-app/src/redux/reducers/clusters/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/clusters/__test__/selectors.spec.ts index c80eac2d4e9..93597f8fe5a 100644 --- a/kafka-ui-react-app/src/redux/reducers/clusters/__test__/selectors.spec.ts +++ b/kafka-ui-react-app/src/redux/reducers/clusters/__test__/selectors.spec.ts @@ -1,6 +1,6 @@ import { fetchClusterListAction } from 'redux/actions'; import configureStore from 'redux/store/configureStore'; -import * as selectors from '../selectors'; +import * as selectors from 'redux/reducers/clusters/selectors'; import { clustersPayload, offlineClusterPayload, diff --git a/kafka-ui-react-app/src/redux/reducers/consumerGroups/selectors.ts b/kafka-ui-react-app/src/redux/reducers/consumerGroups/selectors.ts index 86459fc6d5e..87a9c7dcb24 100644 --- a/kafka-ui-react-app/src/redux/reducers/consumerGroups/selectors.ts +++ b/kafka-ui-react-app/src/redux/reducers/consumerGroups/selectors.ts @@ -4,7 +4,7 @@ import { createFetchingSelector } from 'redux/reducers/loader/selectors'; import { ConsumerGroupID, ConsumerGroupsState, -} from '../../interfaces/consumerGroup'; +} from 'redux/interfaces/consumerGroup'; const consumerGroupsState = ({ consumerGroups, diff --git a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/selectors.spec.ts b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/selectors.spec.ts index 93a76119508..0e06c484db2 100644 --- a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/selectors.spec.ts +++ b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/selectors.spec.ts @@ -4,7 +4,7 @@ import { fetchSchemaVersionsAction, } from 'redux/actions'; import configureStore from 'redux/store/configureStore'; -import * as selectors from '../selectors'; +import * as selectors from 'redux/reducers/schemas/selectors'; import { clusterSchemasPayload, clusterSchemasPayloadWithNewSchema, diff --git a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts index 777989c1f84..8f0fdcd34a6 100644 --- a/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts +++ b/kafka-ui-react-app/src/redux/reducers/topics/__test__/reducer.spec.ts @@ -1,5 +1,5 @@ import { deleteTopicAction } from 'redux/actions'; -import reducer from '../reducer'; +import reducer from 'redux/reducers/topics/reducer'; describe('topics reducer', () => { it('deletes the topic from the list on DELETE_TOPIC__SUCCESS', () => {