diff --git a/kafka-ui-react-app/.eslintrc.json b/kafka-ui-react-app/.eslintrc.json index d9f29abee6e..c5614f1f6d2 100644 --- a/kafka-ui-react-app/.eslintrc.json +++ b/kafka-ui-react-app/.eslintrc.json @@ -33,7 +33,14 @@ "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"], + "newlines-between": "always" + }], + "import/no-relative-parent-imports": "error", + "no-debugger": "warn" }, "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/App.tsx b/kafka-ui-react-app/src/components/App.tsx index e659f11986c..b7978b3dec7 100644 --- a/kafka-ui-react-app/src/components/App.tsx +++ b/kafka-ui-react-app/src/components/App.tsx @@ -1,16 +1,16 @@ -import './App.scss'; import React from 'react'; import cx from 'classnames'; import { Cluster } from 'generated-sources'; import { Switch, Route, useLocation } from 'react-router-dom'; import { GIT_TAG, GIT_COMMIT } from 'lib/constants'; import { Alerts } from 'redux/interfaces'; -import Nav from './Nav/Nav'; -import PageLoader from './common/PageLoader/PageLoader'; -import Dashboard from './Dashboard/Dashboard'; -import ClusterPage from './Cluster/Cluster'; -import Version from './Version/Version'; -import Alert from './Alert/Alert'; +import Nav from 'components/Nav/Nav'; +import PageLoader from 'components/common/PageLoader/PageLoader'; +import Dashboard from 'components/Dashboard/Dashboard'; +import ClusterPage from 'components/Cluster/Cluster'; +import Version from 'components/Version/Version'; +import Alert from 'components/Alert/Alert'; +import 'components/App.scss'; export interface AppProps { isClusterListFetched?: boolean; diff --git a/kafka-ui-react-app/src/components/AppContainer.tsx b/kafka-ui-react-app/src/components/AppContainer.tsx index 6712b1b93ce..f32dab55a4d 100644 --- a/kafka-ui-react-app/src/components/AppContainer.tsx +++ b/kafka-ui-react-app/src/components/AppContainer.tsx @@ -6,7 +6,7 @@ import { } from 'redux/reducers/clusters/selectors'; import { getAlerts } from 'redux/reducers/alerts/selectors'; import { RootState } from 'redux/interfaces'; -import App from './App'; +import App from 'components/App'; const mapStateToProps = (state: RootState) => ({ isClusterListFetched: getIsClusterListFetched(state), diff --git a/kafka-ui-react-app/src/components/Brokers/BrokersContainer.ts b/kafka-ui-react-app/src/components/Brokers/BrokersContainer.ts index f515c75273d..9dad90a0abf 100644 --- a/kafka-ui-react-app/src/components/Brokers/BrokersContainer.ts +++ b/kafka-ui-react-app/src/components/Brokers/BrokersContainer.ts @@ -13,7 +13,7 @@ import { getUnderReplicatedPartitionCount, getDiskUsage, } from 'redux/reducers/brokers/selectors'; -import Brokers from './Brokers'; +import Brokers from 'components/Brokers/Brokers'; const mapStateToProps = (state: RootState) => ({ isFetched: getIsBrokerListFetched(state), 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/Connect.tsx b/kafka-ui-react-app/src/components/Connect/Connect.tsx index b6a941d6183..c3d2d50b554 100644 --- a/kafka-ui-react-app/src/components/Connect/Connect.tsx +++ b/kafka-ui-react-app/src/components/Connect/Connect.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Switch, Route } from 'react-router-dom'; import { clusterConnectorsPath } from 'lib/paths'; -import ListContainer from './List/ListContainer'; +import ListContainer from 'components/Connect/List/ListContainer'; const Connect: React.FC = () => ( diff --git a/kafka-ui-react-app/src/components/Connect/List/List.tsx b/kafka-ui-react-app/src/components/Connect/List/List.tsx index db84c4772dd..09f513a5b67 100644 --- a/kafka-ui-react-app/src/components/Connect/List/List.tsx +++ b/kafka-ui-react-app/src/components/Connect/List/List.tsx @@ -7,7 +7,7 @@ import ClusterContext from 'components/contexts/ClusterContext'; import Indicator from 'components/common/Dashboard/Indicator'; import MetricsWrapper from 'components/common/Dashboard/MetricsWrapper'; import PageLoader from 'components/common/PageLoader/PageLoader'; -import ListItem from './ListItem'; +import ListItem from 'components/Connect/List/ListItem'; export interface ListProps { areConnectsFetching: boolean; diff --git a/kafka-ui-react-app/src/components/Connect/List/ListContainer.ts b/kafka-ui-react-app/src/components/Connect/List/ListContainer.ts index c8f0d979869..d7b8e979ac9 100644 --- a/kafka-ui-react-app/src/components/Connect/List/ListContainer.ts +++ b/kafka-ui-react-app/src/components/Connect/List/ListContainer.ts @@ -10,7 +10,7 @@ import { getAreConnectsFetching, getAreConnectorsFetching, } from 'redux/reducers/connect/selectors'; -import List from './List'; +import List from 'components/Connect/List/List'; const mapStateToProps = (state: RootState) => ({ areConnectsFetching: getAreConnectsFetching(state), 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..5b247e64c0e 100644 --- a/kafka-ui-react-app/src/components/ConsumerGroups/ConsumersGroupsContainer.ts +++ b/kafka-ui-react-app/src/components/ConsumerGroups/ConsumersGroupsContainer.ts @@ -2,8 +2,9 @@ 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/ConsumerGroups/Details/Details.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx index b6ab8ce01e9..f32ad6e6785 100644 --- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx +++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/Details.tsx @@ -8,8 +8,8 @@ import { ConsumerGroupDetails, ConsumerTopicPartitionDetail, } from 'generated-sources'; - import PageLoader from 'components/common/PageLoader/PageLoader'; + import ListItem from './ListItem'; interface Props extends ConsumerGroup, ConsumerGroupDetails { diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/Details/DetailsContainer.ts b/kafka-ui-react-app/src/components/ConsumerGroups/Details/DetailsContainer.ts index 97beb58b40e..6bfd2422cf2 100644 --- a/kafka-ui-react-app/src/components/ConsumerGroups/Details/DetailsContainer.ts +++ b/kafka-ui-react-app/src/components/ConsumerGroups/Details/DetailsContainer.ts @@ -7,6 +7,7 @@ import { } from 'redux/reducers/consumerGroups/selectors'; import { ConsumerGroupID } from 'redux/interfaces/consumerGroup'; import { fetchConsumerGroupDetails } from 'redux/actions/thunks'; + import Details from './Details'; interface RouteProps { diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx b/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx index 258811264e9..3d1b6a25a49 100644 --- a/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx +++ b/kafka-ui-react-app/src/components/ConsumerGroups/List/List.tsx @@ -2,6 +2,7 @@ import React from 'react'; import { ClusterName } from 'redux/interfaces'; import { ConsumerGroup } from 'generated-sources'; import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb'; + import ListItem from './ListItem'; interface Props { diff --git a/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.ts b/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.ts index 31fa8fae010..7c044b0ba1b 100644 --- a/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.ts +++ b/kafka-ui-react-app/src/components/ConsumerGroups/List/ListContainer.ts @@ -2,6 +2,7 @@ import { connect } from 'react-redux'; import { ClusterName, RootState } from 'redux/interfaces'; import { getConsumerGroupsList } from 'redux/reducers/consumerGroups/selectors'; import { withRouter, RouteComponentProps } from 'react-router-dom'; + import List from './List'; interface RouteProps { diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx index 48f5a58a848..e57d68a5808 100644 --- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx +++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidget.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { chunk } from 'lodash'; import { v4 } from 'uuid'; - import MetricsWrapper from 'components/common/Dashboard/MetricsWrapper'; import Indicator from 'components/common/Dashboard/Indicator'; import { Cluster } from 'generated-sources'; + import ClusterWidget from './ClusterWidget'; interface Props { diff --git a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidgetContainer.ts b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidgetContainer.ts index 17ec6147ce9..176d792dd30 100644 --- a/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidgetContainer.ts +++ b/kafka-ui-react-app/src/components/Dashboard/ClustersWidget/ClustersWidgetContainer.ts @@ -5,6 +5,7 @@ import { getOfflineClusters, } from 'redux/reducers/clusters/selectors'; import { RootState } from 'redux/interfaces'; + import ClustersWidget from './ClustersWidget'; const mapStateToProps = (state: RootState) => ({ 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..6e3cab5ecdc 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,8 @@ 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/Dashboard/Dashboard.tsx b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx index e5d89b8c833..2c894c7d093 100644 --- a/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx +++ b/kafka-ui-react-app/src/components/Dashboard/Dashboard.tsx @@ -1,5 +1,6 @@ import React from 'react'; import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb'; + import ClustersWidgetContainer from './ClustersWidget/ClustersWidgetContainer'; const Dashboard: React.FC = () => ( diff --git a/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx b/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx index 642f2b163c8..752efa5047e 100644 --- a/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx +++ b/kafka-ui-react-app/src/components/Nav/ClusterMenu.tsx @@ -8,6 +8,7 @@ import { clusterSchemasPath, clusterConnectorsPath, } from 'lib/paths'; + import DefaultClusterIcon from './DefaultClusterIcon'; import ClusterStatusIcon from './ClusterStatusIcon'; diff --git a/kafka-ui-react-app/src/components/Nav/Nav.tsx b/kafka-ui-react-app/src/components/Nav/Nav.tsx index 3b4c123ad59..23a9e444675 100644 --- a/kafka-ui-react-app/src/components/Nav/Nav.tsx +++ b/kafka-ui-react-app/src/components/Nav/Nav.tsx @@ -2,6 +2,7 @@ import React from 'react'; import { NavLink } from 'react-router-dom'; import cx from 'classnames'; import { Cluster } from 'generated-sources'; + import ClusterMenu from './ClusterMenu'; interface Props { 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 c4225e6f1c6..d2ba74faf2e 100644 --- a/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx +++ b/kafka-ui-react-app/src/components/Schemas/Details/Details.tsx @@ -3,10 +3,11 @@ import { useHistory } from 'react-router'; import { SchemaSubject } from 'generated-sources'; import { ClusterName, SchemaName } from 'redux/interfaces'; import { clusterSchemasPath } from 'lib/paths'; +import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb'; import ClusterContext from 'components/contexts/ClusterContext'; import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal'; import PageLoader from 'components/common/PageLoader/PageLoader'; -import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb'; + import SchemaVersion from './SchemaVersion'; import LatestVersionItem from './LatestVersionItem'; diff --git a/kafka-ui-react-app/src/components/Schemas/Details/DetailsContainer.ts b/kafka-ui-react-app/src/components/Schemas/Details/DetailsContainer.ts index 16d20b274dc..d8126884174 100644 --- a/kafka-ui-react-app/src/components/Schemas/Details/DetailsContainer.ts +++ b/kafka-ui-react-app/src/components/Schemas/Details/DetailsContainer.ts @@ -7,6 +7,7 @@ import { getSortedSchemaVersions, } from 'redux/reducers/schemas/selectors'; import { fetchSchemaVersions, deleteSchema } from 'redux/actions'; + import Details from './Details'; interface RouteProps { 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 7816369f63c..1413237a130 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,9 @@ import { shallow, mount, ReactWrapper } 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..7b45d0fff0a 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,8 @@ 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..4e817692e62 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,7 @@ 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/List.tsx b/kafka-ui-react-app/src/components/Schemas/List/List.tsx index 587fe69d0ff..9516e8c3b47 100644 --- a/kafka-ui-react-app/src/components/Schemas/List/List.tsx +++ b/kafka-ui-react-app/src/components/Schemas/List/List.tsx @@ -6,6 +6,7 @@ import { ClusterName } from 'redux/interfaces'; import PageLoader from 'components/common/PageLoader/PageLoader'; import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb'; import ClusterContext from 'components/contexts/ClusterContext'; + import ListItem from './ListItem'; export interface ListProps { diff --git a/kafka-ui-react-app/src/components/Schemas/List/ListContainer.tsx b/kafka-ui-react-app/src/components/Schemas/List/ListContainer.tsx index 9bd7c4fd6b7..8cbcebd5cb1 100644 --- a/kafka-ui-react-app/src/components/Schemas/List/ListContainer.tsx +++ b/kafka-ui-react-app/src/components/Schemas/List/ListContainer.tsx @@ -5,6 +5,7 @@ import { getIsSchemaListFetching, getSchemaList, } from 'redux/reducers/schemas/selectors'; + import List from './List'; const mapStateToProps = (state: RootState) => ({ 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..0fbc6188f77 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,9 @@ 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..1a7eafca9f9 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,9 @@ 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/NewContainer.ts b/kafka-ui-react-app/src/components/Schemas/New/NewContainer.ts index 267ff08270f..0c00a485bd1 100644 --- a/kafka-ui-react-app/src/components/Schemas/New/NewContainer.ts +++ b/kafka-ui-react-app/src/components/Schemas/New/NewContainer.ts @@ -2,6 +2,7 @@ import { connect } from 'react-redux'; import { RootState } from 'redux/interfaces'; import { createSchema } from 'redux/actions'; import { getSchemaCreated } from 'redux/reducers/schemas/selectors'; + import New from './New'; const mapStateToProps = (state: RootState) => ({ 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/Schemas.tsx b/kafka-ui-react-app/src/components/Schemas/Schemas.tsx index 56653af1579..3cb1b0ce34d 100644 --- a/kafka-ui-react-app/src/components/Schemas/Schemas.tsx +++ b/kafka-ui-react-app/src/components/Schemas/Schemas.tsx @@ -5,6 +5,7 @@ import { clusterSchemaPath, clusterSchemasPath, } from 'lib/paths'; + import ListContainer from './List/ListContainer'; import DetailsContainer from './Details/DetailsContainer'; import NewContainer from './New/NewContainer'; 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/List.tsx b/kafka-ui-react-app/src/components/Topics/List/List.tsx index 5f601d09e4e..31bd9500c62 100644 --- a/kafka-ui-react-app/src/components/Topics/List/List.tsx +++ b/kafka-ui-react-app/src/components/Topics/List/List.tsx @@ -12,6 +12,7 @@ import { FetchTopicsListParams } from 'redux/actions'; import ClusterContext from 'components/contexts/ClusterContext'; import PageLoader from 'components/common/PageLoader/PageLoader'; import Pagination from 'components/common/Pagination/Pagination'; + import ListItem from './ListItem'; interface Props { diff --git a/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts b/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts index 2b3884cbc71..d5d5c5f416d 100644 --- a/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts +++ b/kafka-ui-react-app/src/components/Topics/List/ListContainer.ts @@ -11,6 +11,7 @@ import { getAreTopicsFetching, getTopicListTotalPages, } from 'redux/reducers/topics/selectors'; + import List from './List'; const mapStateToProps = (state: RootState) => ({ 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 b09326d1a52..11dd2b00b65 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 1d5986d18b1..6aa399efa6d 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/New/New.tsx b/kafka-ui-react-app/src/components/Topics/New/New.tsx index cfb634e1f3b..d52074f13a4 100644 --- a/kafka-ui-react-app/src/components/Topics/New/New.tsx +++ b/kafka-ui-react-app/src/components/Topics/New/New.tsx @@ -1,7 +1,6 @@ import React from 'react'; import { ClusterName, TopicName, TopicFormDataRaw } from 'redux/interfaces'; import { useForm, FormProvider } from 'react-hook-form'; - import Breadcrumb from 'components/common/Breadcrumb/Breadcrumb'; import { clusterTopicsPath } from 'lib/paths'; import TopicForm from 'components/Topics/shared/Form/TopicForm'; diff --git a/kafka-ui-react-app/src/components/Topics/New/NewContainer.ts b/kafka-ui-react-app/src/components/Topics/New/NewContainer.ts index 406cbfe24fb..20102cafba5 100644 --- a/kafka-ui-react-app/src/components/Topics/New/NewContainer.ts +++ b/kafka-ui-react-app/src/components/Topics/New/NewContainer.ts @@ -11,6 +11,7 @@ import { createTopic, createTopicAction } from 'redux/actions'; import { getTopicCreated } from 'redux/reducers/topics/selectors'; import { clusterTopicPath } from 'lib/paths'; import { ThunkDispatch } from 'redux-thunk'; + import New from './New'; interface RouteProps { diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx index 0f52f9a22dd..379ffc53a69 100644 --- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx +++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Details.tsx @@ -11,6 +11,7 @@ import { } from 'lib/paths'; import ClusterContext from 'components/contexts/ClusterContext'; import ConfirmationModal from 'components/common/ConfirmationModal/ConfirmationModal'; + import OverviewContainer from './Overview/OverviewContainer'; import MessagesContainer from './Messages/MessagesContainer'; import SettingsContainer from './Settings/SettingsContainer'; diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Messages.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Messages.tsx index 0ca083ed775..fd0d4499f86 100644 --- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Messages.tsx +++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/Messages.tsx @@ -1,6 +1,7 @@ import 'react-datepicker/dist/react-datepicker.css'; import React, { useCallback, useEffect, useRef } from 'react'; import { groupBy, map, concat, maxBy } from 'lodash'; +import DatePicker from 'react-datepicker'; import MultiSelect from 'react-multi-select-component'; import { Option } from 'react-multi-select-component/dist/lib/interfaces'; import { useDebouncedCallback } from 'use-debounce'; @@ -11,7 +12,7 @@ import { } from 'redux/interfaces'; import { TopicMessage, Partition, SeekType } from 'generated-sources'; import PageLoader from 'components/common/PageLoader/PageLoader'; -import DatePicker from 'react-datepicker'; + import MessagesTable from './MessagesTable'; export interface Props { diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessagesTable.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessagesTable.tsx index 477c3d32bf4..8fe394b6367 100644 --- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessagesTable.tsx +++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/MessagesTable.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { TopicMessage } from 'generated-sources'; import CustomParamButton from 'components/Topics/shared/Form/CustomParams/CustomParamButton'; + import MessageItem from './MessageItem'; export interface MessagesTableProp { diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessageItem.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessageItem.spec.tsx index cea622ac0e6..f08876c8479 100644 --- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessageItem.spec.tsx +++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessageItem.spec.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; import MessageItem from 'components/Topics/Topic/Details/Messages/MessageItem'; + import { messages } from './fixtures'; jest.mock('date-fns', () => ({ diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessagesTable.spec.tsx b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessagesTable.spec.tsx index 691f069e231..0627b773a95 100644 --- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessagesTable.spec.tsx +++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Messages/__test__/MessagesTable.spec.tsx @@ -3,6 +3,7 @@ import { shallow } from 'enzyme'; import MessagesTable, { MessagesTableProp, } from 'components/Topics/Topic/Details/Messages/MessagesTable'; + import { messages } from './fixtures'; jest.mock('date-fns', () => ({ diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/OverviewContainer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/OverviewContainer.ts index 05a1dede2d8..30fdaf2c128 100644 --- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/OverviewContainer.ts +++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Overview/OverviewContainer.ts @@ -3,7 +3,7 @@ import { RootState, TopicName, ClusterName } from 'redux/interfaces'; import { getTopicByName } from 'redux/reducers/topics/selectors'; import { withRouter, RouteComponentProps } from 'react-router-dom'; import { clearTopicMessages } from 'redux/actions'; -import Overview from './Overview'; +import Overview from 'components/Topics/Topic/Details/Overview/Overview'; interface RouteProps { clusterName: ClusterName; diff --git a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/SettingsContainer.ts b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/SettingsContainer.ts index 4e4278aead8..0d4fa4dbe12 100644 --- a/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/SettingsContainer.ts +++ b/kafka-ui-react-app/src/components/Topics/Topic/Details/Settings/SettingsContainer.ts @@ -6,6 +6,7 @@ import { getTopicConfig, getTopicConfigFetched, } from 'redux/reducers/topics/selectors'; + import Settings from './Settings'; interface RouteProps { diff --git a/kafka-ui-react-app/src/components/Topics/Topic/TopicContainer.tsx b/kafka-ui-react-app/src/components/Topics/Topic/TopicContainer.tsx index 55cee070d72..d0a33cab032 100644 --- a/kafka-ui-react-app/src/components/Topics/Topic/TopicContainer.tsx +++ b/kafka-ui-react-app/src/components/Topics/Topic/TopicContainer.tsx @@ -2,6 +2,7 @@ import { connect } from 'react-redux'; import { RootState } from 'redux/interfaces'; import { fetchTopicDetails } from 'redux/actions'; import { getIsTopicDetailsFetching } from 'redux/reducers/topics/selectors'; + import Topic from './Topic'; const mapStateToProps = (state: RootState) => ({ diff --git a/kafka-ui-react-app/src/components/Topics/Topics.tsx b/kafka-ui-react-app/src/components/Topics/Topics.tsx index 8990bf96b59..6a78e22ee51 100644 --- a/kafka-ui-react-app/src/components/Topics/Topics.tsx +++ b/kafka-ui-react-app/src/components/Topics/Topics.tsx @@ -5,6 +5,7 @@ import { clusterTopicPath, clusterTopicsPath, } from 'lib/paths'; + import ListContainer from './List/ListContainer'; import TopicContainer from './Topic/TopicContainer'; import NewContainer from './New/NewContainer'; diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamAction.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamAction.tsx index a6909024a97..41f48a6dc5f 100644 --- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamAction.tsx +++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamAction.tsx @@ -1,4 +1,5 @@ import React from 'react'; + import CustomParamButton from './CustomParamButton'; interface Props { diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamSelect.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamSelect.tsx index 2be0fd1783e..31965e372b1 100644 --- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamSelect.tsx +++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamSelect.tsx @@ -3,6 +3,7 @@ import { useFormContext } from 'react-hook-form'; import { TopicConfigValue } from 'redux/interfaces'; import { ErrorMessage } from '@hookform/error-message'; import { TOPIC_CUSTOM_PARAMS } from 'lib/constants'; + import { INDEX_PREFIX } from './CustomParams'; export interface CustomParamSelectProps { diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx index 1a1080a1278..570d0154f40 100644 --- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx +++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { omit, reject, reduce, remove } from 'lodash'; import { v4 } from 'uuid'; - import { TopicFormCustomParams, TopicConfigByName, TopicConfigParams, } from 'redux/interfaces'; + import CustomParamButton from './CustomParamButton'; import CustomParamField from './CustomParamField'; diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamsContainer.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamsContainer.tsx index d2f017e7737..4d5065e6731 100644 --- a/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamsContainer.tsx +++ b/kafka-ui-react-app/src/components/Topics/shared/Form/CustomParams/CustomParamsContainer.tsx @@ -1,6 +1,7 @@ import { connect } from 'react-redux'; import { RootState, TopicConfigByName } from 'redux/interfaces'; import { withRouter, RouteComponentProps } from 'react-router-dom'; + import CustomParams from './CustomParams'; interface OwnProps extends RouteComponentProps { 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/Topics/shared/Form/TimeToRetain.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetain.tsx index 86d89cd3abc..84100f39f70 100644 --- a/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetain.tsx +++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetain.tsx @@ -2,8 +2,8 @@ import React from 'react'; import prettyMilliseconds from 'pretty-ms'; import { useFormContext } from 'react-hook-form'; import { ErrorMessage } from '@hookform/error-message'; - import { MILLISECONDS_IN_WEEK, MILLISECONDS_IN_SECOND } from 'lib/constants'; + import TimeToRetainBtns from './TimeToRetainBtns'; interface Props { diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtns.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtns.tsx index f75d08791dc..afd974b151b 100644 --- a/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtns.tsx +++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TimeToRetainBtns.tsx @@ -1,5 +1,6 @@ import React from 'react'; import { MILLISECONDS_IN_DAY } from 'lib/constants'; + import TimeToRetainBtn from './TimeToRetainBtn'; interface Props { diff --git a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx index 0bf9f5caf15..ddcc0c79c39 100644 --- a/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx +++ b/kafka-ui-react-app/src/components/Topics/shared/Form/TopicForm.tsx @@ -3,6 +3,7 @@ import { useFormContext } from 'react-hook-form'; import { TOPIC_NAME_VALIDATION_PATTERN, BYTES_IN_GB } from 'lib/constants'; import { TopicName, TopicConfigByName } from 'redux/interfaces'; import { ErrorMessage } from '@hookform/error-message'; + import CustomParamsContainer from './CustomParams/CustomParamsContainer'; import TimeToRetain from './TimeToRetain'; 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/JSONViewer/JSONViewer.tsx b/kafka-ui-react-app/src/components/common/JSONViewer/JSONViewer.tsx index 8e8705b7da2..4ee54ec584a 100644 --- a/kafka-ui-react-app/src/components/common/JSONViewer/JSONViewer.tsx +++ b/kafka-ui-react-app/src/components/common/JSONViewer/JSONViewer.tsx @@ -1,6 +1,6 @@ import React from 'react'; import JSONTree from 'react-json-tree'; -import theme from './themes/google'; +import theme from 'components/common/JSONViewer/themes/google'; interface JSONViewerProps { data: Record; 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/Pagination.tsx b/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx index e2d80c4af8f..7307561088f 100644 --- a/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx +++ b/kafka-ui-react-app/src/components/common/Pagination/Pagination.tsx @@ -3,7 +3,7 @@ import usePagination from 'lib/hooks/usePagination'; import { range } from 'lodash'; import React from 'react'; import { Link } from 'react-router-dom'; -import PageControl from './PageControl'; +import PageControl from 'components/common/Pagination/PageControl'; export interface PaginationProps { totalPages: number; 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/index.tsx b/kafka-ui-react-app/src/index.tsx index ac83617660e..2a82087ef5e 100644 --- a/kafka-ui-react-app/src/index.tsx +++ b/kafka-ui-react-app/src/index.tsx @@ -2,10 +2,10 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { BrowserRouter } from 'react-router-dom'; import { Provider } from 'react-redux'; -import './theme/index.scss'; -import AppContainer from './components/AppContainer'; -import * as serviceWorker from './serviceWorker'; -import configureStore from './redux/store/configureStore'; +import * as serviceWorker from 'serviceWorker'; +import configureStore from 'redux/store/configureStore'; +import AppContainer from 'components/AppContainer'; +import 'theme/index.scss'; const store = configureStore(); diff --git a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts b/kafka-ui-react-app/src/lib/__test__/paths.spec.ts index ef4b0f3e4fe..366e2d92e79 100644 --- a/kafka-ui-react-app/src/lib/__test__/paths.spec.ts +++ b/kafka-ui-react-app/src/lib/__test__/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/lib/paths.ts b/kafka-ui-react-app/src/lib/paths.ts index b0d6ae7229b..6a06a3b514e 100644 --- a/kafka-ui-react-app/src/lib/paths.ts +++ b/kafka-ui-react-app/src/lib/paths.ts @@ -1,4 +1,5 @@ import { ClusterName, SchemaName, TopicName } from 'redux/interfaces'; + import { GIT_REPO_LINK } from './constants'; export const gitCommitPath = (commit: string) => 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 7ddc21614d6..e39fdb2a9c4 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..f698f45c29d 100644 --- a/kafka-ui-react-app/src/redux/actions/thunks/brokers.ts +++ b/kafka-ui-react-app/src/redux/actions/thunks/brokers.ts @@ -1,8 +1,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..8d7f2030e76 100644 --- a/kafka-ui-react-app/src/redux/actions/thunks/clusters.ts +++ b/kafka-ui-react-app/src/redux/actions/thunks/clusters.ts @@ -1,8 +1,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..4a5445cb3b6 100644 --- a/kafka-ui-react-app/src/redux/actions/thunks/consumerGroups.ts +++ b/kafka-ui-react-app/src/redux/actions/thunks/consumerGroups.ts @@ -4,9 +4,8 @@ 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 consumerGroupsApiClient = new ConsumerGroupsApi(apiClientConf); diff --git a/kafka-ui-react-app/src/redux/actions/thunks/schemas.ts b/kafka-ui-react-app/src/redux/actions/thunks/schemas.ts index 323a6f0e4ca..ccc7e1034cd 100644 --- a/kafka-ui-react-app/src/redux/actions/thunks/schemas.ts +++ b/kafka-ui-react-app/src/redux/actions/thunks/schemas.ts @@ -10,7 +10,6 @@ import { SchemaName, FailurePayload, } from 'redux/interfaces'; - import { BASE_PARAMS } from 'lib/constants'; import * as actions from 'redux/actions'; import { getResponse } from 'lib/errorHandling'; diff --git a/kafka-ui-react-app/src/redux/interfaces/index.ts b/kafka-ui-react-app/src/redux/interfaces/index.ts index 8427d3cc3fd..5a1623149fe 100644 --- a/kafka-ui-react-app/src/redux/interfaces/index.ts +++ b/kafka-ui-react-app/src/redux/interfaces/index.ts @@ -1,6 +1,7 @@ import { ActionType } from 'typesafe-actions'; import { ThunkAction } from 'redux-thunk'; import * as actions from 'redux/actions/actions'; + import { TopicsState } from './topic'; import { ClusterState } from './cluster'; import { BrokersState } from './broker'; diff --git a/kafka-ui-react-app/src/redux/reducers/alerts/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/alerts/__test__/reducer.spec.ts index 434bb542ce6..d6ec7d5bbf6 100644 --- a/kafka-ui-react-app/src/redux/reducers/alerts/__test__/reducer.spec.ts +++ b/kafka-ui-react-app/src/redux/reducers/alerts/__test__/reducer.spec.ts @@ -1,5 +1,6 @@ import { dismissAlert, createTopicAction } from 'redux/actions'; import reducer from 'redux/reducers/alerts/reducer'; + import { failurePayload1, failurePayload2 } from './fixtures'; jest.mock('lodash', () => ({ 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..343abe3cca1 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,7 @@ 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/alerts/reducer.ts b/kafka-ui-react-app/src/redux/reducers/alerts/reducer.ts index a92006adc36..5e75f1023b7 100644 --- a/kafka-ui-react-app/src/redux/reducers/alerts/reducer.ts +++ b/kafka-ui-react-app/src/redux/reducers/alerts/reducer.ts @@ -1,6 +1,7 @@ import { getType } from 'typesafe-actions'; import { dismissAlert } from 'redux/actions'; import { Action, AlertsState } from 'redux/interfaces'; + import { addError, removeAlert } from './utils'; export const initialState: AlertsState = {}; diff --git a/kafka-ui-react-app/src/redux/reducers/clusters/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/clusters/__test__/reducer.spec.ts index 3c942e03966..d8bbc747a25 100644 --- a/kafka-ui-react-app/src/redux/reducers/clusters/__test__/reducer.spec.ts +++ b/kafka-ui-react-app/src/redux/reducers/clusters/__test__/reducer.spec.ts @@ -1,5 +1,6 @@ import { fetchClusterListAction } from 'redux/actions'; import reducer from 'redux/reducers/clusters/reducer'; + import { clustersPayload } from './fixtures'; describe('Clusters reducer', () => { 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..5bb16230cad 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,7 @@ 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/index.ts b/kafka-ui-react-app/src/redux/reducers/index.ts index 005a0e680ad..7e3851b77be 100644 --- a/kafka-ui-react-app/src/redux/reducers/index.ts +++ b/kafka-ui-react-app/src/redux/reducers/index.ts @@ -1,5 +1,6 @@ import { combineReducers } from 'redux'; import { RootState } from 'redux/interfaces'; + import topics from './topics/reducer'; import clusters from './clusters/reducer'; import brokers from './brokers/reducer'; diff --git a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/reducer.spec.ts b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/reducer.spec.ts index 29f74051a44..1aa2602c37e 100644 --- a/kafka-ui-react-app/src/redux/reducers/schemas/__test__/reducer.spec.ts +++ b/kafka-ui-react-app/src/redux/reducers/schemas/__test__/reducer.spec.ts @@ -6,6 +6,7 @@ import { fetchSchemaVersionsAction, } from 'redux/actions'; import reducer from 'redux/reducers/schemas/reducer'; + import { clusterSchemasPayload, initialState, 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..1108ae6d556 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,8 @@ 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 7c647e8227a..d4841b137b2 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, clearMessagesTopicAction } from 'redux/actions'; -import reducer from '../reducer'; +import reducer from 'redux/reducers/topics/reducer'; const topic = { name: 'topic',