Skip to content

Commit 5381d94

Browse files
committed
FE: Fix merge conflicts
1 parent cc20280 commit 5381d94

File tree

5 files changed

+50
-33
lines changed

5 files changed

+50
-33
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import useFts from 'components/common/Fts/useFts';
3030
import Fts from 'components/common/Fts/Fts';
3131
import ClusterContext from 'components/contexts/ClusterContext';
3232

33-
3433
import * as S from './List.styled';
3534

3635
const ACList: React.FC = () => {

frontend/src/components/Connect/List/List.tsx

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
11
import React from 'react';
2-
3-
import useAppParams from 'lib/hooks/useAppParams';
4-
import { ClusterNameRoute } from 'lib/paths';
5-
import { useConnectors } from 'lib/hooks/api/kafkaConnect';
6-
import { useSearchParams } from 'react-router-dom';
72
import { ConnectorsTable } from 'components/Connect/List/ConnectorsTable/ConnectorsTable';
3+
import { FullConnectorInfo } from 'generated-sources';
84

9-
const List: React.FC = () => {
10-
const { clusterName } = useAppParams<ClusterNameRoute>();
11-
const [searchParams] = useSearchParams();
12-
const { data: connectors = [] } = useConnectors(
13-
clusterName,
14-
searchParams.get('q') || ''
15-
);
5+
interface ConnectorsListProps {
6+
connectors: FullConnectorInfo[];
7+
}
168

9+
const List: React.FC<ConnectorsListProps> = ({ connectors }) => {
1710
return <ConnectorsTable connectors={connectors} />;
1811
};
1912

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,44 @@
11
import React, { Suspense } from 'react';
22
import Search from 'components/common/Search/Search';
33
import PageLoader from 'components/common/PageLoader/PageLoader';
4+
import useAppParams from 'lib/hooks/useAppParams';
5+
import { ClusterNameRoute } from 'lib/paths';
6+
import { useConnectors } from 'lib/hooks/api/kafkaConnect';
7+
import { useSearchParams } from 'react-router-dom';
8+
import useFts from 'components/common/Fts/useFts';
9+
import Fts from 'components/common/Fts/Fts';
10+
import { FullConnectorInfo } from 'generated-sources';
411

512
import * as S from './ListPage.styled';
613
import List from './List';
714
import ConnectorsStatistics from './Statistics/Statistics';
815

9-
const ListPage: React.FC = () => (
10-
<>
11-
<ConnectorsStatistics />
12-
<S.Search hasInput>
13-
<Search placeholder="Search by Connect Name, Status or Type" />
14-
</S.Search>
15-
<Suspense fallback={<PageLoader />}>
16-
<List />
17-
</Suspense>
18-
</>
19-
);
16+
const emptyConnectors: FullConnectorInfo[] = [];
17+
18+
const ListPage: React.FC = () => {
19+
const { clusterName } = useAppParams<ClusterNameRoute>();
20+
const [searchParams] = useSearchParams();
21+
const { isFtsEnabled } = useFts('connects');
22+
const { data: connectors = emptyConnectors, isLoading } = useConnectors(
23+
clusterName,
24+
searchParams.get('q') || '',
25+
isFtsEnabled
26+
);
27+
28+
return (
29+
<>
30+
<ConnectorsStatistics connectors={connectors} isLoading={isLoading} />
31+
<S.Search hasInput>
32+
<Search
33+
placeholder="Search by Connect Name, Status or Type"
34+
extraActions={<Fts resourceName="connects" />}
35+
/>
36+
</S.Search>
37+
<Suspense fallback={<PageLoader />}>
38+
<List connectors={connectors} />
39+
</Suspense>
40+
</>
41+
);
42+
};
2043

2144
export default ListPage;

frontend/src/components/Connect/List/Statistics/Statistics.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
import React, { useMemo } from 'react';
1+
import React, { FC, useMemo } from 'react';
22
import * as Statistics from 'components/common/Statistics';
3-
import useAppParams from 'lib/hooks/useAppParams';
4-
import { ClusterNameRoute } from 'lib/paths';
5-
import { useConnectors } from 'lib/hooks/api/kafkaConnect';
3+
import { FullConnectorInfo } from 'generated-sources';
64

75
import { computeStatistics } from './models/computeStatistics';
86

9-
const ConnectorsStatistics = () => {
10-
const { clusterName } = useAppParams<ClusterNameRoute>();
11-
const { data: connectors = [], isLoading } = useConnectors(clusterName);
12-
7+
interface ConnectorsStatisticsProps {
8+
connectors: FullConnectorInfo[];
9+
isLoading: boolean;
10+
}
11+
const ConnectorsStatistics: FC<ConnectorsStatisticsProps> = ({
12+
connectors,
13+
isLoading,
14+
}) => {
1315
const statistics = useMemo(() => computeStatistics(connectors), [connectors]);
1416

1517
return (

frontend/src/components/Connect/List/Statistics/__tests__/Statistics.spec.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('Kafka Connect Connectors Statistics', () => {
2525
function renderComponent({ data = [], isLoading }: RenderComponentProps) {
2626
// eslint-disable-next-line @typescript-eslint/no-explicit-any
2727
useConnectorsMock.mockReturnValue({ data, isLoading } as any);
28-
render(<ConnectorsStatistics />);
28+
render(<ConnectorsStatistics connectors={data} isLoading={isLoading} />);
2929
}
3030

3131
describe('when data loading', () => {

0 commit comments

Comments
 (0)