Skip to content

Commit a776fcf

Browse files
authored
Merge branch 'main' into astandrik.1977
2 parents f912e0f + bc5d59d commit a776fcf

File tree

33 files changed

+525
-87
lines changed

33 files changed

+525
-87
lines changed

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "8.16.0"
2+
".": "8.17.0"
33
}

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [8.17.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v8.16.0...v8.17.0) (2025-03-26)
4+
5+
6+
### Features
7+
8+
* followerId for tablets ([#2025](https://github.com/ydb-platform/ydb-embedded-ui/issues/2025)) ([63d5afd](https://github.com/ydb-platform/ydb-embedded-ui/commit/63d5afd64754df291e0e5eec90142a37114ebf85))
9+
* parse logging link as default value ([#2036](https://github.com/ydb-platform/ydb-embedded-ui/issues/2036)) ([74f7a58](https://github.com/ydb-platform/ydb-embedded-ui/commit/74f7a5892a08a6a61cd6eff1bfe3acde9aac7f6e))
10+
11+
12+
### Bug Fixes
13+
14+
* add required field SubDomainKey to getNodes ([#2047](https://github.com/ydb-platform/ydb-embedded-ui/issues/2047)) ([cf1ddc3](https://github.com/ydb-platform/ydb-embedded-ui/commit/cf1ddc39225ada474d858f3ae8eb1f1f595da068))
15+
* supported changes of the transfer configuration structure ([#2032](https://github.com/ydb-platform/ydb-embedded-ui/issues/2032)) ([78965ed](https://github.com/ydb-platform/ydb-embedded-ui/commit/78965edd4caf013ec4a2aca91614cef7550a9f16))
16+
317
## [8.16.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v8.15.0...v8.16.0) (2025-03-20)
418

519

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ydb-embedded-ui",
3-
"version": "8.16.0",
3+
"version": "8.17.0",
44
"files": [
55
"dist"
66
],

src/containers/Cluster/Cluster.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export function Cluster({
7272
const clusterTitle = metaClusterTitle ?? viewerClusterTitle;
7373

7474
const {
75-
data: {clusterData: cluster = {}, groupsStats} = {},
75+
data: {clusterData: cluster, groupsStats} = {},
7676
isLoading: infoLoading,
7777
error,
7878
} = clusterApi.useGetClusterInfoQuery(clusterName ?? undefined);
@@ -121,7 +121,7 @@ export function Cluster({
121121
</div>
122122
{isClusterDashboardAvailable && (
123123
<ClusterDashboard
124-
cluster={cluster}
124+
cluster={cluster ?? {}}
125125
groupStats={groupsStats}
126126
loading={infoLoading}
127127
error={clusterError || cluster?.error}
@@ -193,7 +193,7 @@ export function Cluster({
193193
getLocationObjectFromHref(getClusterPath(clusterTabsIds.versions)).pathname
194194
}
195195
>
196-
<Versions cluster={cluster} />
196+
{cluster && <Versions cluster={cluster} />}
197197
</Route>
198198
<Route
199199
render={() => (

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ function Overview({type, path, database}: OverviewProps) {
9595
[EPathType.EPathTypeExternalDataSource]: () => <ExternalDataSourceInfo data={data} />,
9696
[EPathType.EPathTypeView]: () => <ViewInfo data={data} />,
9797
[EPathType.EPathTypeReplication]: () => <AsyncReplicationInfo data={data} />,
98-
[EPathType.EPathTypeTransfer]: () => <TransferInfo data={data} />,
98+
[EPathType.EPathTypeTransfer]: () => (
99+
<TransferInfo path={path} database={database} data={data} />
100+
),
99101
};
100102

101103
return (type && pathTypeToComponent[type]?.()) || <TableInfo data={data} type={type} />;

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

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,22 @@ import {Flex, Text} from '@gravity-ui/uikit';
44
import {AsyncReplicationState} from '../../../../../components/AsyncReplicationState';
55
import {YDBSyntaxHighlighter} from '../../../../../components/SyntaxHighlighter/YDBSyntaxHighlighter';
66
import {YDBDefinitionList} from '../../../../../components/YDBDefinitionList/YDBDefinitionList';
7+
import {replicationApi} from '../../../../../store/reducers/replication';
8+
import type {DescribeReplicationResult} from '../../../../../types/api/replication';
79
import type {TEvDescribeSchemeResult} from '../../../../../types/api/schema';
810
import {getEntityName} from '../../../utils';
911

1012
import {Credentials} from './Credentials';
1113
import i18n from './i18n';
1214

1315
interface TransferProps {
16+
path: string;
17+
database: string;
1418
data?: TEvDescribeSchemeResult;
1519
}
1620

1721
/** Displays overview for Transfer EPathType */
18-
export function TransferInfo({data}: TransferProps) {
22+
export function TransferInfo({path, database, data}: TransferProps) {
1923
const entityName = getEntityName(data?.PathDescription);
2024

2125
if (!data) {
@@ -26,7 +30,8 @@ export function TransferInfo({data}: TransferProps) {
2630
);
2731
}
2832

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

3136
return (
3237
<Flex direction="column" gap="4">
@@ -35,7 +40,10 @@ export function TransferInfo({data}: TransferProps) {
3540
);
3641
}
3742

38-
function prepareTransferItems(data: TEvDescribeSchemeResult) {
43+
function prepareTransferItems(
44+
data: TEvDescribeSchemeResult,
45+
replicationData: DescribeReplicationResult | undefined,
46+
) {
3947
const transferDescription = data.PathDescription?.ReplicationDescription || {};
4048
const state = transferDescription.State;
4149
const srcConnectionParams = transferDescription.Config?.SrcConnectionParams || {};
@@ -54,6 +62,18 @@ function prepareTransferItems(data: TEvDescribeSchemeResult) {
5462
});
5563
}
5664

65+
if (replicationData?.error?.issues && replicationData.error.issues[0]?.message) {
66+
info.push({
67+
name: i18n('state.error'),
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+
),
74+
});
75+
}
76+
5777
if (Endpoint) {
5878
info.push({
5979
name: i18n('srcConnection.endpoint.label'),

src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/en.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"srcConnection.database.label": "Source Database Path",
55
"srcConnection.endpoint.label": "Source Cluster Endpoint",
66
"state.label": "State",
7+
"state.error": "Error",
78
"srcPath.label": "Source Topic",
89
"dstPath.label": "Destination Table",
910
"transformLambda.label": "Transformation Lambda"

src/containers/Tenant/ObjectSummary/SchemaTree/SchemaTree.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export function SchemaTree(props: SchemaTreeProps) {
4848
{currentData: actionsSchemaData, isFetching: isActionsDataFetching},
4949
] = tableSchemaDataApi.useLazyGetTableSchemaDataQuery();
5050

51-
const [querySettings, setQueryExecutionSettings] = useQueryExecutionSettings();
51+
const [querySettings] = useQueryExecutionSettings();
5252
const [createDirectoryOpen, setCreateDirectoryOpen] = React.useState(false);
5353
const [parentPath, setParentPath] = React.useState('');
5454
const setSchemaTreeKey = useDispatchTreeKey();
@@ -128,8 +128,6 @@ export function SchemaTree(props: SchemaTreeProps) {
128128
dispatch,
129129
{
130130
setActivePath: onActivePathUpdate,
131-
updateQueryExecutionSettings: (settings) =>
132-
setQueryExecutionSettings({...querySettings, ...settings}),
133131
showCreateDirectoryDialog: createDirectoryFeatureAvailable
134132
? handleOpenCreateDirectoryDialog
135133
: undefined,
@@ -149,7 +147,6 @@ export function SchemaTree(props: SchemaTreeProps) {
149147
onActivePathUpdate,
150148
querySettings,
151149
rootPath,
152-
setQueryExecutionSettings,
153150
]);
154151

155152
return (

src/containers/Tenant/Query/QuerySettingsDialog/QuerySettingsDialog.scss

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,13 @@
2828
flex: 6;
2929
}
3030

31-
&__limit-rows,
32-
&__timeout {
33-
width: 33.3%;
31+
&__limit-rows {
32+
width: 50%;
3433
margin-right: var(--g-spacing-2);
3534
}
3635

37-
&__timeout-suffix {
38-
display: flex;
39-
align-items: center;
40-
41-
color: var(--g-color-text-secondary);
42-
}
43-
44-
&__documentation-link {
45-
display: flex;
46-
align-items: center;
47-
48-
margin-left: var(--g-spacing-4);
36+
&__postfix {
37+
margin-right: var(--g-spacing-2);
4938

5039
color: var(--g-color-text-secondary);
5140
}

0 commit comments

Comments
 (0)