Skip to content

Commit e7e440f

Browse files
committed
Nuke All redux related code
1 parent c4496ae commit e7e440f

File tree

43 files changed

+54
-191
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+54
-191
lines changed

frontend/src/components/ACLPage/Form/CustomACL/Form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import Input from 'components/common/Input/Input';
77
import ControlledSelect from 'components/common/Select/ControlledSelect';
88
import { matchTypeOptions } from 'components/ACLPage/Form/constants';
99
import useAppParams from 'lib/hooks/useAppParams';
10-
import { ClusterName } from 'redux/interfaces';
1110
import * as S from 'components/ACLPage/Form/Form.styled';
1211
import ACLFormContext from 'components/ACLPage/Form/AclFormContext';
1312
import { AclDetailedFormProps } from 'components/ACLPage/Form/types';
13+
import { ClusterName } from 'lib/interfaces/cluster';
1414

1515
import formSchema from './schema';
1616
import { FormValues } from './types';

frontend/src/components/ACLPage/Form/ForConsumers/Form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { FC, useContext } from 'react';
22
import { yupResolver } from '@hookform/resolvers/yup';
33
import { FormProvider, useForm } from 'react-hook-form';
4-
import { ClusterName } from 'redux/interfaces';
4+
import { ClusterName } from 'lib/interfaces/cluster';
55
import { useCreateConsumersAcl } from 'lib/hooks/api/acl';
66
import useAppParams from 'lib/hooks/useAppParams';
77
import ControlledMultiSelect from 'components/common/MultiSelect/ControlledMultiSelect';

frontend/src/components/ACLPage/Form/ForKafkaStreamApps/Form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { FC, useContext } from 'react';
22
import { FormProvider, useForm } from 'react-hook-form';
33
import { yupResolver } from '@hookform/resolvers/yup';
4-
import { ClusterName } from 'redux/interfaces';
4+
import { ClusterName } from 'lib/interfaces/cluster';
55
import { useCreateStreamAppAcl } from 'lib/hooks/api/acl';
66
import useAppParams from 'lib/hooks/useAppParams';
77
import Input from 'components/common/Input/Input';

frontend/src/components/ACLPage/Form/ForProducers/Form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { yupResolver } from '@hookform/resolvers/yup';
33
import { useCreateProducerAcl } from 'lib/hooks/api/acl';
44
import { FormProvider, useForm } from 'react-hook-form';
55
import useAppParams from 'lib/hooks/useAppParams';
6-
import { ClusterName } from 'redux/interfaces';
6+
import { ClusterName } from 'lib/interfaces/cluster';
77
import Input from 'components/common/Input/Input';
88
import ControlledMultiSelect from 'components/common/MultiSelect/ControlledMultiSelect';
99
import Checkbox from 'components/common/Checkbox/Checkbox';

frontend/src/components/ACLPage/List/List.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Table from 'components/common/NewTable';
55
import { useConfirm } from 'lib/hooks/useConfirm';
66
import useAppParams from 'lib/hooks/useAppParams';
77
import { useAcls, useDeleteAcl } from 'lib/hooks/api/acl';
8-
import { ClusterName } from 'redux/interfaces';
8+
import { ClusterName } from 'lib/interfaces/cluster';
99
import {
1010
KafkaAcl,
1111
KafkaAclNamePatternType,

frontend/src/components/Brokers/BrokersList/BrokersList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useMemo } from 'react';
2-
import { ClusterName } from 'redux/interfaces';
2+
import { ClusterName } from 'lib/interfaces/cluster';
33
import { useNavigate } from 'react-router-dom';
44
import PageHeading from 'components/common/PageHeading/PageHeading';
55
import useAppParams from 'lib/hooks/useAppParams';

frontend/src/components/ConsumerGroups/Details/ListItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { ConsumerGroupTopicPartition } from 'generated-sources';
33
import { Link } from 'react-router-dom';
4-
import { ClusterName } from 'redux/interfaces/cluster';
4+
import { ClusterName } from 'lib/interfaces/cluster';
55
import { clusterTopicPath } from 'lib/paths';
66
import MessageToggleIcon from 'components/common/Icons/MessageToggleIcon';
77
import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';

frontend/src/components/Schemas/Edit/Form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
ClusterSubjectParam,
1313
} from 'lib/paths';
1414
import yup from 'lib/yupExtended';
15-
import { NewSchemaSubjectRaw } from 'redux/interfaces';
15+
import { NewSchemaSubjectRaw } from 'lib/interfaces/schema';
1616
import Editor from 'components/common/Editor/Editor';
1717
import Select from 'components/common/Select/Select';
1818
import { Button } from 'components/common/Button/Button';

frontend/src/components/Schemas/New/New.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { NewSchemaSubjectRaw } from 'redux/interfaces';
2+
import { NewSchemaSubjectRaw } from 'lib/interfaces/schema';
33
import { Controller, FormProvider, useForm } from 'react-hook-form';
44
import { ErrorMessage } from '@hookform/error-message';
55
import {

frontend/src/components/Topics/List/BatchActionsBar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
22
import { Row } from '@tanstack/react-table';
33
import { Action, Topic, ResourceType } from 'generated-sources';
44
import useAppParams from 'lib/hooks/useAppParams';
5-
import { ClusterName } from 'redux/interfaces';
5+
import { ClusterName } from 'lib/interfaces/cluster';
66
import {
77
topicKeys,
88
useClearTopicMessages,

frontend/src/components/Topics/List/TopicTable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { SortOrder, Topic, TopicColumnsToSort } from 'generated-sources';
33
import { ColumnDef } from '@tanstack/react-table';
44
import Table, { SizeCell } from 'components/common/NewTable';
55
import useAppParams from 'lib/hooks/useAppParams';
6-
import { ClusterName } from 'redux/interfaces';
6+
import { ClusterName } from 'lib/interfaces/cluster';
77
import { useSearchParams } from 'react-router-dom';
88
import ClusterContext from 'components/contexts/ClusterContext';
99
import { useTopics } from 'lib/hooks/api/topics';

frontend/src/components/Topics/List/__tests__/TopicTable.spec.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ import { clusterTopicsPath } from 'lib/paths';
1616

1717
const clusterName = 'test-cluster';
1818

19-
jest.mock('lib/hooks/redux', () => ({
20-
...jest.requireActual('lib/hooks/redux'),
21-
useAppDispatch: jest.fn(),
22-
}));
23-
2419
const getButtonByName = (name: string) => screen.getByRole('button', { name });
2520

2621
jest.mock('lib/hooks/api/topics', () => ({

frontend/src/components/Topics/New/New.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React from 'react';
2-
import { TopicFormData } from 'redux/interfaces';
32
import { FormProvider, useForm } from 'react-hook-form';
43
import { ClusterNameRoute, clusterTopicsPath } from 'lib/paths';
54
import TopicForm from 'components/Topics/shared/Form/TopicForm';
@@ -9,6 +8,7 @@ import { topicFormValidationSchema } from 'lib/yupExtended';
98
import PageHeading from 'components/common/PageHeading/PageHeading';
109
import useAppParams from 'lib/hooks/useAppParams';
1110
import { useCreateTopic } from 'lib/hooks/api/topics';
11+
import { TopicFormData } from 'lib/interfaces/topic';
1212

1313
enum Filters {
1414
NAME = 'name',

frontend/src/components/Topics/Topic/Edit/Edit.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React from 'react';
2-
import { TopicConfigByName, TopicFormData } from 'redux/interfaces';
32
import { useForm, FormProvider } from 'react-hook-form';
43
import TopicForm from 'components/Topics/shared/Form/TopicForm';
54
import { RouteParamsClusterTopic } from 'lib/paths';
@@ -16,6 +15,7 @@ import {
1615
} from 'lib/hooks/api/topics';
1716
import DangerZone from 'components/Topics/Topic/Edit/DangerZone/DangerZone';
1817
import { ConfigSource } from 'generated-sources';
18+
import { TopicConfigByName, TopicFormData } from 'lib/interfaces/topic';
1919

2020
export const TOPIC_EDIT_FORM_DEFAULT_PROPS = {
2121
partitions: 1,

frontend/src/components/Topics/Topic/__test__/Topic.spec.tsx

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import {
2222
useRecreateTopic,
2323
useTopicDetails,
2424
} from 'lib/hooks/api/topics';
25-
import { useAppDispatch } from 'lib/hooks/redux';
2625

2726
const mockNavigate = jest.fn();
2827
jest.mock('react-router-dom', () => ({
@@ -39,11 +38,6 @@ jest.mock('lib/hooks/api/topics', () => ({
3938
const unwrapMock = jest.fn();
4039
const clearTopicMessages = jest.fn();
4140

42-
jest.mock('lib/hooks/redux', () => ({
43-
...jest.requireActual('lib/hooks/redux'),
44-
useAppDispatch: jest.fn(),
45-
}));
46-
4741
jest.mock('components/Topics/Topic/Overview/Overview', () => () => (
4842
<>OverviewMock</>
4943
));
@@ -105,9 +99,6 @@ describe('Details', () => {
10599
(useClearTopicMessages as jest.Mock).mockImplementation(() => ({
106100
mutateAsync: clearTopicMessages,
107101
}));
108-
(useAppDispatch as jest.Mock).mockImplementation(() => () => ({
109-
unwrap: unwrapMock,
110-
}));
111102
});
112103
describe('Action Bar', () => {
113104
describe('when it has readonly flag', () => {

frontend/src/components/Topics/shared/Form/CustomParams/CustomParamField.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { useRef } from 'react';
22
import { ErrorMessage } from '@hookform/error-message';
33
import { TOPIC_CUSTOM_PARAMS } from 'lib/constants';
44
import { FieldArrayWithId, useFormContext, Controller } from 'react-hook-form';
5-
import { TopicConfigParams, TopicFormData } from 'redux/interfaces';
65
import { InputLabel } from 'components/common/Input/InputLabel.styled';
76
import { FormError } from 'components/common/Input/Input.styled';
87
import Select from 'components/common/Select/Select';
@@ -11,6 +10,7 @@ import IconButtonWrapper from 'components/common/Icons/IconButtonWrapper';
1110
import CloseCircleIcon from 'components/common/Icons/CloseCircleIcon';
1211
import * as C from 'components/Topics/shared/Form/TopicForm.styled';
1312
import { ConfigSource } from 'generated-sources';
13+
import { TopicConfigParams, TopicFormData } from 'lib/interfaces/topic';
1414

1515
import * as S from './CustomParams.styled';
1616

frontend/src/components/Topics/shared/Form/CustomParams/CustomParams.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import React from 'react';
2-
import { TopicConfigParams, TopicFormData } from 'redux/interfaces';
32
import { useFieldArray, useFormContext, useWatch } from 'react-hook-form';
43
import { Button } from 'components/common/Button/Button';
54
import { TOPIC_CUSTOM_PARAMS_PREFIX } from 'lib/constants';
65
import PlusIcon from 'components/common/Icons/PlusIcon';
6+
import { TopicConfigParams, TopicFormData } from 'lib/interfaces/topic';
77

88
import CustomParamField from './CustomParamField';
99
import * as S from './CustomParams.styled';

frontend/src/components/Topics/shared/Form/TopicForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22
import { useFormContext, Controller } from 'react-hook-form';
33
import { NOT_SET, BYTES_IN_GB } from 'lib/constants';
4-
import { ClusterName, TopicConfigParams, TopicName } from 'redux/interfaces';
54
import { ErrorMessage } from '@hookform/error-message';
65
import Select from 'components/common/Select/Select';
76
import Input from 'components/common/Input/Input';
@@ -12,6 +11,7 @@ import { StyledForm } from 'components/common/Form/Form.styled';
1211
import { clusterTopicPath } from 'lib/paths';
1312
import { useNavigate } from 'react-router-dom';
1413
import useAppParams from 'lib/hooks/useAppParams';
14+
import { TopicConfigParams, TopicName } from 'lib/interfaces/topic';
1515

1616
import CustomParams from './CustomParams/CustomParams';
1717
import TimeToRetain from './TimeToRetain';

frontend/src/index.tsx

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import React from 'react';
22
import { createRoot } from 'react-dom/client';
33
import { BrowserRouter } from 'react-router-dom';
4-
import { Provider } from 'react-redux';
54
import { ThemeModeProvider } from 'components/contexts/ThemeModeContext';
65
import App from 'components/App';
7-
import { store } from 'redux/store';
86
import 'lib/constants';
97
import 'theme/index.scss';
108

@@ -13,11 +11,9 @@ const container =
1311
const root = createRoot(container);
1412

1513
root.render(
16-
<Provider store={store}>
17-
<BrowserRouter basename={window.basePath || '/'}>
18-
<ThemeModeProvider>
19-
<App />
20-
</ThemeModeProvider>
21-
</BrowserRouter>
22-
</Provider>
14+
<BrowserRouter basename={window.basePath || '/'}>
15+
<ThemeModeProvider>
16+
<App />
17+
</ThemeModeProvider>
18+
</BrowserRouter>
2319
);
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { expectQueryWorks, renderQueryHook } from 'lib/testHelpers';
2+
3+
// TODO should be written
4+
describe('schema hooks', () => {
5+
it('should ', () => {
6+
console.log(expectQueryWorks, renderQueryHook);
7+
});
8+
});

frontend/src/lib/hooks/api/__tests__/topics.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {
77
import * as hooks from 'lib/hooks/api/topics';
88
import fetchMock from 'fetch-mock';
99
import { externalTopicPayload, topicConfigPayload } from 'lib/fixtures/topics';
10-
import { TopicFormData, TopicFormDataRaw } from 'redux/interfaces';
1110
import { CreateTopicMessage } from 'generated-sources';
11+
import { TopicFormData, TopicFormDataRaw } from 'lib/interfaces/topic';
1212

1313
const clusterName = 'test-cluster';
1414
const topicName = 'test-topic';

frontend/src/lib/hooks/api/acl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
useQuery,
66
useQueryClient,
77
} from '@tanstack/react-query';
8-
import { ClusterName } from 'redux/interfaces';
8+
import { ClusterName } from 'lib/interfaces/cluster';
99
import { showSuccessAlert } from 'lib/errorHandling';
1010
import {
1111
CreateConsumerAcl,

frontend/src/lib/hooks/api/brokers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { brokersApiClient as api } from 'lib/api';
22
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
3-
import { ClusterName } from 'redux/interfaces';
3+
import { ClusterName } from 'lib/interfaces/cluster';
44
import { BrokerConfigItem } from 'generated-sources';
55

66
interface UpdateBrokerConfigProps {

frontend/src/lib/hooks/api/clusters.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { clustersApiClient as api } from 'lib/api';
22
import { useQuery } from '@tanstack/react-query';
3-
import { ClusterName } from 'redux/interfaces';
3+
import { ClusterName } from 'lib/interfaces/cluster';
44

55
export function useClusters() {
66
return useQuery(['clusters'], () => api.getClusters(), { suspense: false });

frontend/src/lib/hooks/api/consumers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { consumerGroupsApiClient as api } from 'lib/api';
22
import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
3-
import { ClusterName } from 'redux/interfaces';
3+
import { ClusterName } from 'lib/interfaces/cluster';
44
import {
55
ConsumerGroup,
66
ConsumerGroupOffsetsReset,

frontend/src/lib/hooks/api/kafkaConnect.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
import { kafkaConnectApiClient as api } from 'lib/api';
88
import sortBy from 'lodash/sortBy';
99
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
10-
import { ClusterName } from 'redux/interfaces';
10+
import { ClusterName } from 'lib/interfaces/cluster';
1111
import { showSuccessAlert } from 'lib/errorHandling';
1212

1313
interface UseConnectorProps {

frontend/src/lib/hooks/api/ksqlDb.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ksqlDbApiClient as api } from 'lib/api';
22
import { useMutation, useQueries } from '@tanstack/react-query';
3-
import { ClusterName } from 'redux/interfaces';
3+
import { ClusterName } from 'lib/interfaces/cluster';
44
import { BASE_PARAMS } from 'lib/constants';
55
import React from 'react';
66
import { fetchEventSource } from '@microsoft/fetch-event-source';

frontend/src/lib/hooks/api/schemas.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
UpdateSchemaCompatibilityLevelRequest,
1919
} from 'generated-sources';
2020
import { schemasApiClient } from 'lib/api';
21-
import { ClusterName } from 'redux/interfaces';
21+
import { ClusterName } from 'lib/interfaces/cluster';
2222

2323
export function useGetLatestSchema(param: GetLatestSchemaRequest) {
2424
return useQuery<SchemaSubject>({

frontend/src/lib/hooks/api/topicMessages.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React, { useCallback, useRef } from 'react';
22
import { fetchEventSource } from '@microsoft/fetch-event-source';
33
import { BASE_PARAMS, MESSAGES_PER_PAGE } from 'lib/constants';
4-
import { ClusterName, TopicName } from 'redux/interfaces';
54
import {
65
GetSerdesRequest,
76
PollingMode,
@@ -17,6 +16,8 @@ import { useSearchParams } from 'react-router-dom';
1716
import { MessagesFilterKeys } from 'lib/hooks/useMessagesFilters';
1817
import { convertStrToPollingMode } from 'lib/hooks/filterUtils';
1918
import { useMessageFiltersStore } from 'lib/hooks/useMessageFiltersStore';
19+
import { TopicName } from 'lib/interfaces/topic';
20+
import { ClusterName } from 'lib/interfaces/cluster';
2021

2122
interface UseTopicMessagesProps {
2223
clusterName: ClusterName;

frontend/src/lib/hooks/api/topics.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ import {
55
messagesApiClient,
66
} from 'lib/api';
77
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
8-
import {
9-
ClusterName,
10-
TopicFormData,
11-
TopicFormDataRaw,
12-
TopicFormFormattedParams,
13-
} from 'redux/interfaces';
148
import {
159
CreateTopicMessage,
1610
GetTopicDetailsRequest,
@@ -21,6 +15,12 @@ import {
2115
TopicUpdate,
2216
} from 'generated-sources';
2317
import { showServerError, showSuccessAlert } from 'lib/errorHandling';
18+
import { ClusterName } from 'lib/interfaces/cluster';
19+
import {
20+
TopicFormData,
21+
TopicFormDataRaw,
22+
TopicFormFormattedParams,
23+
} from 'lib/interfaces/topic';
2424

2525
export const topicKeys = {
2626
all: (clusterName: ClusterName) =>

frontend/src/lib/hooks/redux.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.

frontend/src/redux/interfaces/topic.ts renamed to frontend/src/lib/interfaces/topic.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,3 @@ export interface TopicFormData {
5050
value: string;
5151
}[];
5252
}
53-
54-
export interface TopicMessagesState {
55-
messages: TopicMessage[];
56-
phase?: string;
57-
meta: TopicMessageConsuming;
58-
messageEventType?: string;
59-
isFetching: boolean;
60-
}

frontend/src/lib/paths.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import { Broker, Connect, Connector } from 'generated-sources';
2-
import { ClusterName, SchemaName, TopicName } from 'redux/interfaces';
32

43
import { GIT_REPO_LINK } from './constants';
54
import { ConsumerGroupID } from './hooks/api/consumers';
5+
import { ClusterName } from './interfaces/cluster';
6+
import { SchemaName } from './interfaces/schema';
7+
import { TopicName } from './interfaces/topic';
68

79
export const gitCommitPath = (commit: string) =>
810
`${GIT_REPO_LINK}/commit/${commit}`;

0 commit comments

Comments
 (0)