Skip to content

Commit 2c8c889

Browse files
committed
fix
1 parent a2b4262 commit 2c8c889

File tree

2 files changed

+14
-29
lines changed

2 files changed

+14
-29
lines changed

src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {AsyncReplicationState} from '../../../../../components/AsyncReplicationS
55
import {YDBSyntaxHighlighter} from '../../../../../components/SyntaxHighlighter/YDBSyntaxHighlighter';
66
import {YDBDefinitionList} from '../../../../../components/YDBDefinitionList/YDBDefinitionList';
77
import {replicationApi} from '../../../../../store/reducers/replication';
8+
import type {DescribeReplicationResult} from '../../../../../types/api/replication';
89
import type {TEvDescribeSchemeResult} from '../../../../../types/api/schema';
910
import {getEntityName} from '../../../utils';
1011

@@ -29,7 +30,8 @@ export function TransferInfo({path, database, data}: TransferProps) {
2930
);
3031
}
3132

32-
const transferItems = prepareTransferItems(path, database, data);
33+
const {data: replicationData} = replicationApi.useGetReplicationQuery({path, database}, {});
34+
const transferItems = prepareTransferItems(data, replicationData);
3335

3436
return (
3537
<Flex direction="column" gap="4">
@@ -38,29 +40,10 @@ export function TransferInfo({path, database, data}: TransferProps) {
3840
);
3941
}
4042

41-
function prepareErrors(path: string, database: string) {
42-
const {data, error} = replicationApi.useGetReplicationQuery({path, database}, {});
43-
44-
if (data?.error?.issues) {
45-
return (
46-
<Text variant="code-inline-2" color="danger">
47-
{data.error.issues[0].message}
48-
</Text>
49-
);
50-
}
51-
52-
if (error) {
53-
return (
54-
<Text variant="code-inline-2" color="danger">
55-
Error
56-
</Text>
57-
);
58-
}
59-
60-
return '';
61-
}
62-
63-
function prepareTransferItems(path: string, database: string, data: TEvDescribeSchemeResult) {
43+
function prepareTransferItems(
44+
data: TEvDescribeSchemeResult,
45+
replicationData: DescribeReplicationResult | undefined,
46+
) {
6447
const transferDescription = data.PathDescription?.ReplicationDescription || {};
6548
const state = transferDescription.State;
6649
const srcConnectionParams = transferDescription.Config?.SrcConnectionParams || {};
@@ -69,7 +52,6 @@ function prepareTransferItems(path: string, database: string, data: TEvDescribeS
6952
const srcPath = target?.SrcPath;
7053
const dstPath = target?.DstPath;
7154
const transformLambda = target?.TransformLambda;
72-
const errors = prepareErrors(path, database);
7355

7456
const info: DefinitionListItem[] = [];
7557

@@ -80,10 +62,15 @@ function prepareTransferItems(path: string, database: string, data: TEvDescribeS
8062
});
8163
}
8264

83-
if (errors) {
65+
if (replicationData?.error?.issues && replicationData.error.issues[0]?.message) {
8466
info.push({
8567
name: i18n('state.error'),
86-
content: errors,
68+
copyText: replicationData.error.issues[0].message,
69+
content: (
70+
<Text variant="code-inline-2" color="danger">
71+
{replicationData.error.issues[0].message}
72+
</Text>
73+
),
8774
});
8875
}
8976

src/store/reducers/replication.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/* eslint-disable camelcase */
2-
31
import {api} from './api';
42

53
export const replicationApi = api.injectEndpoints({

0 commit comments

Comments
 (0)