From 3d666c6611ea805b7ce726a1524a4a5cc64394ed Mon Sep 17 00:00:00 2001
From: Nikolay Shestakov <tesseract@ydb.tech>
Date: Wed, 5 Mar 2025 14:57:30 +0500
Subject: [PATCH 01/10] WIP
---
package-lock.json | 8 +-
package.json | 2 +-
.../Tenant/Diagnostics/DiagnosticsPages.ts | 3 +
.../Tenant/Diagnostics/Overview/Overview.tsx | 2 +
.../Overview/TransferInfo/Credentials.tsx | 27 +++++++
.../Overview/TransferInfo/TransferInfo.tsx | 78 +++++++++++++++++++
.../Overview/TransferInfo/i18n/en.json | 7 ++
.../Overview/TransferInfo/i18n/index.ts | 7 ++
.../Overview/TransferInfo/index.ts | 1 +
.../Tenant/ObjectSummary/ObjectSummary.tsx | 14 ++++
src/containers/Tenant/Query/NewSQL/NewSQL.tsx | 17 ++++
.../Tenant/Query/NewSQL/i18n/en.json | 6 +-
src/containers/Tenant/i18n/en.json | 3 +
src/containers/Tenant/utils/controls.tsx | 1 +
.../Tenant/utils/newSQLQueryActions.ts | 6 ++
src/containers/Tenant/utils/schema.ts | 7 ++
src/containers/Tenant/utils/schemaActions.tsx | 19 +++++
.../Tenant/utils/schemaQueryTemplates.ts | 50 ++++++++++++
src/types/api/schema/schema.ts | 1 +
19 files changed, 253 insertions(+), 6 deletions(-)
create mode 100644 src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx
create mode 100644 src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
create mode 100644 src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/en.json
create mode 100644 src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/index.ts
create mode 100644 src/containers/Tenant/Diagnostics/Overview/TransferInfo/index.ts
diff --git a/package-lock.json b/package-lock.json
index 3dc345fcf..b17d7284b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,7 +56,7 @@
"use-query-params": "^2.2.1",
"uuid": "^10.0.0",
"web-vitals": "^1.1.2",
- "ydb-ui-components": "^4.5.0",
+ "ydb-ui-components": "^4.6.0",
"zod": "^3.24.1"
},
"devDependencies": {
@@ -29305,9 +29305,9 @@
}
},
"node_modules/ydb-ui-components": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/ydb-ui-components/-/ydb-ui-components-4.5.0.tgz",
- "integrity": "sha512-XefBB6dWHXbtyZ9jaxkmCJM5tl19V6VYrJ0nB2WcERCbb8ZG0GYJgywi5BBqQgOL8wH1Z5iut8WX7sQPcj+WNA==",
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/ydb-ui-components/-/ydb-ui-components-4.6.0.tgz",
+ "integrity": "sha512-9gkD6KBda3Jo/zt8SpTgrmUckXP6gophDiL4E41CKjORCmi5umT5C7D/D98awzaB+ZltVL0L5ySdnZKizfD9Yw==",
"license": "MIT",
"dependencies": {
"@bem-react/classname": "^1.6.0",
diff --git a/package.json b/package.json
index 8dc2e7ca0..d8903aaad 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
"use-query-params": "^2.2.1",
"uuid": "^10.0.0",
"web-vitals": "^1.1.2",
- "ydb-ui-components": "^4.5.0",
+ "ydb-ui-components": "^4.6.0",
"zod": "^3.24.1"
},
"scripts": {
diff --git a/src/containers/Tenant/Diagnostics/DiagnosticsPages.ts b/src/containers/Tenant/Diagnostics/DiagnosticsPages.ts
index 96bb6b46d..9ea138ce8 100644
--- a/src/containers/Tenant/Diagnostics/DiagnosticsPages.ts
+++ b/src/containers/Tenant/Diagnostics/DiagnosticsPages.ts
@@ -82,6 +82,8 @@ const operations = {
const ASYNC_REPLICATION_PAGES = [overview, tablets, describe];
+const TRANSFER_PAGES = [overview, tablets, describe];
+
const DATABASE_PAGES = [
overview,
topQueries,
@@ -133,6 +135,7 @@ const pathTypeToPages: Record<EPathType, Page[] | undefined> = {
[EPathType.EPathTypeView]: VIEW_PAGES,
[EPathType.EPathTypeReplication]: ASYNC_REPLICATION_PAGES,
+ [EPathType.EPathTypeTransfer]: TRANSFER_PAGES,
[EPathType.EPathTypeResourcePool]: DIR_PAGES,
};
diff --git a/src/containers/Tenant/Diagnostics/Overview/Overview.tsx b/src/containers/Tenant/Diagnostics/Overview/Overview.tsx
index 762eca8ea..18feb9d39 100644
--- a/src/containers/Tenant/Diagnostics/Overview/Overview.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/Overview.tsx
@@ -20,6 +20,7 @@ import {AsyncReplicationInfo} from './AsyncReplicationInfo';
import {ChangefeedInfo} from './ChangefeedInfo';
import {TableInfo} from './TableInfo';
import {TopicInfo} from './TopicInfo';
+import {TransferInfo} from './TransferInfo';
interface OverviewProps {
type?: EPathType;
@@ -94,6 +95,7 @@ function Overview({type, path, database}: OverviewProps) {
[EPathType.EPathTypeExternalDataSource]: () => <ExternalDataSourceInfo data={data} />,
[EPathType.EPathTypeView]: () => <ViewInfo data={data} />,
[EPathType.EPathTypeReplication]: () => <AsyncReplicationInfo data={data} />,
+ [EPathType.EPathTypeTransfer]: () => <TransferInfo data={data} />,
};
return (type && pathTypeToComponent[type]?.()) || <TableInfo data={data} type={type} />;
diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx
new file mode 100644
index 000000000..3a6839a33
--- /dev/null
+++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/Credentials.tsx
@@ -0,0 +1,27 @@
+import {Label} from '@gravity-ui/uikit';
+
+import type {TConnectionParams} from '../../../../../types/api/schema/replication';
+
+interface CredentialsProps {
+ connection?: TConnectionParams;
+}
+
+export function Credentials({connection}: CredentialsProps) {
+ if (!connection) {
+ return null;
+ }
+
+ if (connection.StaticCredentials) {
+ return (
+ <Label value={connection.StaticCredentials.User} theme="normal">
+ user
+ </Label>
+ );
+ }
+
+ if ('OAuthToken' in connection) {
+ return 'OAuth';
+ }
+
+ return 'unknown';
+}
diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
new file mode 100644
index 000000000..fc2487281
--- /dev/null
+++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
@@ -0,0 +1,78 @@
+import type {DefinitionListItem} from '@gravity-ui/components';
+import {Flex, Text} from '@gravity-ui/uikit';
+
+import {AsyncReplicationState} from '../../../../../components/AsyncReplicationState';
+import {YDBDefinitionList} from '../../../../../components/YDBDefinitionList/YDBDefinitionList';
+import type {TEvDescribeSchemeResult} from '../../../../../types/api/schema';
+import {getEntityName} from '../../../utils';
+import {AsyncReplicationPaths} from '../AsyncReplicationPaths';
+
+import {Credentials} from './Credentials';
+import i18n from './i18n';
+
+interface TransferProps {
+ data?: TEvDescribeSchemeResult;
+}
+
+/** Displays overview for Transfer EPathType */
+export function TransferInfo({data}: TransferProps) {
+ const entityName = getEntityName(data?.PathDescription);
+
+ if (!data) {
+ return (
+ <div className="error">
+ {i18n('noData')} {entityName}
+ </div>
+ );
+ }
+
+ const transferItems = prepareTransferItems(data);
+
+ return (
+ <Flex direction="column" gap="4">
+ <YDBDefinitionList title={entityName} items={transferItems} />
+ <AsyncReplicationPaths config={data.PathDescription?.ReplicationDescription?.Config} />
+ </Flex>
+ );
+}
+
+function prepareTransferItems(data: TEvDescribeSchemeResult) {
+ const transferDescription = data.PathDescription?.ReplicationDescription || {};
+ const state = transferDescription.State;
+ const srcConnectionParams = transferDescription.Config?.SrcConnectionParams || {};
+ const {Endpoint, Database} = srcConnectionParams;
+
+ const info: DefinitionListItem[] = [];
+
+ if (state) {
+ info.push({
+ name: i18n('state.label'),
+ content: <AsyncReplicationState state={state} />,
+ });
+ }
+
+ if (Endpoint) {
+ info.push({
+ name: i18n('srcConnection.endpoint.label'),
+ copyText: Endpoint,
+ content: <Text variant="code-inline-2">{Endpoint}</Text>,
+ });
+ }
+
+ if (Database) {
+ info.push({
+ name: i18n('srcConnection.database.label'),
+ copyText: Database,
+ content: <Text variant="code-inline-2">{Database}</Text>,
+ });
+ }
+
+ if (srcConnectionParams) {
+ info.push({
+ name: i18n('credentials.label'),
+ content: <Credentials connection={srcConnectionParams} />,
+ });
+ }
+
+ return info;
+}
diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/en.json b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/en.json
new file mode 100644
index 000000000..ecd7f0044
--- /dev/null
+++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/en.json
@@ -0,0 +1,7 @@
+{
+ "credentials.label": "Credentials",
+ "noData": "No data for entity:",
+ "srcConnection.database.label": "Source Database Path",
+ "srcConnection.endpoint.label": "Source Cluster Endpoint",
+ "state.label": "State"
+}
diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/index.ts b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/index.ts
new file mode 100644
index 000000000..83f1ad759
--- /dev/null
+++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/index.ts
@@ -0,0 +1,7 @@
+import {registerKeysets} from '../../../../../../utils/i18n';
+
+import en from './en.json';
+
+const COMPONENT = 'ydb-diagnostics-transfer-info';
+
+export default registerKeysets(COMPONENT, {en});
diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/index.ts b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/index.ts
new file mode 100644
index 000000000..0206c28be
--- /dev/null
+++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/index.ts
@@ -0,0 +1 @@
+export * from './TransferInfo';
diff --git a/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx b/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
index 301638bae..f1a05e509 100644
--- a/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
+++ b/src/containers/Tenant/ObjectSummary/ObjectSummary.tsx
@@ -310,6 +310,20 @@ export function ObjectSummary({
return [];
}
+ return [
+ {
+ name: i18n('field_state'),
+ content: <AsyncReplicationState state={state} />,
+ },
+ ];
+ },
+ [EPathType.EPathTypeTransfer]: () => {
+ const state = PathDescription?.ReplicationDescription?.State;
+
+ if (!state) {
+ return [];
+ }
+
return [
{
name: i18n('field_state'),
diff --git a/src/containers/Tenant/Query/NewSQL/NewSQL.tsx b/src/containers/Tenant/Query/NewSQL/NewSQL.tsx
index d772ded26..b48028eb7 100644
--- a/src/containers/Tenant/Query/NewSQL/NewSQL.tsx
+++ b/src/containers/Tenant/Query/NewSQL/NewSQL.tsx
@@ -106,6 +106,23 @@ export function NewSQL() {
},
],
},
+ {
+ text: i18n('menu.transfer'),
+ items: [
+ {
+ text: i18n('action.create-transfer'),
+ action: actions.createTransfer,
+ },
+ {
+ text: i18n('action.alter-transfer'),
+ action: actions.alterTransfer,
+ },
+ {
+ text: i18n('action.drop-transfer'),
+ action: actions.dropTransfer,
+ },
+ ],
+ },
{
text: i18n('menu.capture'),
items: [
diff --git a/src/containers/Tenant/Query/NewSQL/i18n/en.json b/src/containers/Tenant/Query/NewSQL/i18n/en.json
index dface2060..9e6916686 100644
--- a/src/containers/Tenant/Query/NewSQL/i18n/en.json
+++ b/src/containers/Tenant/Query/NewSQL/i18n/en.json
@@ -16,12 +16,14 @@
"menu.topics": "Topics",
"menu.capture": "Change data capture",
"menu.replication": "Async replication",
+ "menu.transfer": "Transfer",
"menu.users": "Users",
"action.create-topic": "Create Topic",
"action.drop-topic": "Drop Topic",
"action.alter-topic": "Alter Topic",
"action.create-cdc-stream": "Create changefeed",
"action.create-async-replication": "Create async replication",
+ "action.create-transfer": "Create transfer",
"action.create-user": "Create user",
"action.create-group": "Create group",
"action.drop-user": "Drop user",
@@ -29,5 +31,7 @@
"action.grant-privilege": "Grant privilege",
"action.revoke-privilege": "Revoke privilege",
"action.alter-async-replication": "Alter async replication",
- "action.drop-async-replication": "Drop async replication"
+ "action.drop-async-replication": "Drop async replication",
+ "action.alter-transfer": "Alter transfer",
+ "action.drop-transfer": "Drop transfer"
}
diff --git a/src/containers/Tenant/i18n/en.json b/src/containers/Tenant/i18n/en.json
index 399969a2e..a7d9313e4 100644
--- a/src/containers/Tenant/i18n/en.json
+++ b/src/containers/Tenant/i18n/en.json
@@ -33,6 +33,7 @@
"actions.createTopic": "Create topic...",
"actions.createColumnTable": "Create column table...",
"actions.createAsyncReplication": "Create async replication...",
+ "actions.createTransfer": "Create transfer...",
"actions.createView": "Create view...",
"actions.dropTable": "Drop table...",
"actions.dropTopic": "Drop topic...",
@@ -46,7 +47,9 @@
"actions.selectQuery": "Select query...",
"actions.upsertQuery": "Upsert query...",
"actions.alterReplication": "Alter async replicaton...",
+ "actions.alterTransfer": "Alter transfer...",
"actions.dropReplication": "Drop async replicaton...",
+ "actions.dropTransfer": "Drop transfer...",
"actions.createDirectory": "Create directory",
"schema.tree.dialog.placeholder": "Relative path",
"schema.tree.dialog.invalid": "Invalid path",
diff --git a/src/containers/Tenant/utils/controls.tsx b/src/containers/Tenant/utils/controls.tsx
index dc6a3c5d4..5e4f2a656 100644
--- a/src/containers/Tenant/utils/controls.tsx
+++ b/src/containers/Tenant/utils/controls.tsx
@@ -61,6 +61,7 @@ export const getSchemaControls =
const nodeTypeToControls: Record<NavigationTreeNodeType, Controls> = {
async_replication: undefined,
+ transfer: undefined,
database: undefined,
directory: undefined,
diff --git a/src/containers/Tenant/utils/newSQLQueryActions.ts b/src/containers/Tenant/utils/newSQLQueryActions.ts
index 9baf9dbb3..ed1526c24 100644
--- a/src/containers/Tenant/utils/newSQLQueryActions.ts
+++ b/src/containers/Tenant/utils/newSQLQueryActions.ts
@@ -3,6 +3,7 @@ import {
alterAsyncReplicationTemplate,
alterTableTemplate,
alterTopicTemplate,
+ alterTransferTemplate,
createAsyncReplicationTemplate,
createCdcStreamTemplate,
createColumnTableTemplate,
@@ -10,6 +11,7 @@ import {
createGroupTemplate,
createTableTemplate,
createTopicTemplate,
+ createTransferTemplate,
createUserTemplate,
createViewTemplate,
deleteRowsTemplate,
@@ -19,6 +21,7 @@ import {
dropTableIndex,
dropTableTemplate,
dropTopicTemplate,
+ dropTransferTemplate,
dropUserTemplate,
grantPrivilegeTemplate,
revokePrivilegeTemplate,
@@ -38,6 +41,9 @@ export const bindActions = (changeUserInput: (input: string) => void) => {
createAsyncReplication: inputQuery(createAsyncReplicationTemplate),
alterAsyncReplication: inputQuery(alterAsyncReplicationTemplate),
dropAsyncReplication: inputQuery(dropAsyncReplicationTemplate),
+ createTransfer: inputQuery(createTransferTemplate),
+ alterTransfer: inputQuery(alterTransferTemplate),
+ dropTransfer: inputQuery(dropTransferTemplate),
alterTable: inputQuery(alterTableTemplate),
selectQuery: inputQuery(selectQueryTemplate),
upsertQuery: inputQuery(upsertQueryTemplate),
diff --git a/src/containers/Tenant/utils/schema.ts b/src/containers/Tenant/utils/schema.ts
index b468b724a..aba1549f0 100644
--- a/src/containers/Tenant/utils/schema.ts
+++ b/src/containers/Tenant/utils/schema.ts
@@ -39,6 +39,7 @@ const pathTypeToNodeType: Record<EPathType, NavigationTreeNodeType | undefined>
[EPathType.EPathTypeView]: 'view',
[EPathType.EPathTypeReplication]: 'async_replication',
+ [EPathType.EPathTypeTransfer]: 'transfer',
[EPathType.EPathTypeResourcePool]: 'resource_pool',
};
@@ -87,6 +88,7 @@ const pathTypeToEntityName: Record<EPathType, string | undefined> = {
[EPathType.EPathTypeView]: 'View',
[EPathType.EPathTypeReplication]: 'Async Replication',
+ [EPathType.EPathTypeTransfer]: 'Transfer',
[EPathType.EPathTypeResourcePool]: 'Resource Pool',
};
@@ -128,6 +130,7 @@ const pathTypeToIsTable: Record<EPathType, boolean> = {
[EPathType.EPathTypePersQueueGroup]: false,
[EPathType.EPathTypeExternalDataSource]: false,
[EPathType.EPathTypeReplication]: false,
+ [EPathType.EPathTypeTransfer]: false,
[EPathType.EPathTypeResourcePool]: false,
};
@@ -169,6 +172,7 @@ const pathTypeToIsColumn: Record<EPathType, boolean> = {
[EPathType.EPathTypeView]: false,
[EPathType.EPathTypeReplication]: false,
+ [EPathType.EPathTypeTransfer]: false,
[EPathType.EPathTypeResourcePool]: false,
};
@@ -195,6 +199,7 @@ const pathTypeToIsDatabase: Record<EPathType, boolean> = {
[EPathType.EPathTypeView]: false,
[EPathType.EPathTypeReplication]: false,
+ [EPathType.EPathTypeTransfer]: false,
[EPathType.EPathTypeResourcePool]: false,
};
@@ -226,6 +231,7 @@ const pathTypeToEntityWithMergedImplementation: Record<EPathType, boolean> = {
[EPathType.EPathTypeView]: false,
[EPathType.EPathTypeReplication]: false,
+ [EPathType.EPathTypeTransfer]: false,
[EPathType.EPathTypeResourcePool]: false,
};
@@ -253,6 +259,7 @@ const pathTypeToChildless: Record<EPathType, boolean> = {
[EPathType.EPathTypeResourcePool]: true,
[EPathType.EPathTypeReplication]: true,
+ [EPathType.EPathTypeTransfer]: true,
[EPathType.EPathTypeInvalid]: false,
[EPathType.EPathTypeColumnStore]: false,
diff --git a/src/containers/Tenant/utils/schemaActions.tsx b/src/containers/Tenant/utils/schemaActions.tsx
index 60c0f4e18..52857ff2d 100644
--- a/src/containers/Tenant/utils/schemaActions.tsx
+++ b/src/containers/Tenant/utils/schemaActions.tsx
@@ -20,18 +20,21 @@ import {
alterAsyncReplicationTemplate,
alterTableTemplate,
alterTopicTemplate,
+ alterTransferTemplate,
createAsyncReplicationTemplate,
createCdcStreamTemplate,
createColumnTableTemplate,
createExternalTableTemplate,
createTableTemplate,
createTopicTemplate,
+ createTransferTemplate,
createViewTemplate,
dropAsyncReplicationTemplate,
dropExternalTableTemplate,
dropTableIndex,
dropTableTemplate,
dropTopicTemplate,
+ dropTransferTemplate,
dropViewTemplate,
manageAutoPartitioningTemplate,
selectQueryTemplate,
@@ -100,6 +103,9 @@ const bindActions = (
createAsyncReplication: inputQuery(createAsyncReplicationTemplate),
alterAsyncReplication: inputQuery(alterAsyncReplicationTemplate),
dropAsyncReplication: inputQuery(dropAsyncReplicationTemplate),
+ createTransfer: inputQuery(createTransferTemplate),
+ alterTransfer: inputQuery(alterTransferTemplate),
+ dropTransfer: inputQuery(dropTransferTemplate),
alterTable: inputQuery(alterTableTemplate),
dropTable: inputQuery(dropTableTemplate),
manageAutoPartitioning: inputQuery(manageAutoPartitioningTemplate),
@@ -181,6 +187,10 @@ export const getActions =
text: i18n('actions.createAsyncReplication'),
action: actions.createAsyncReplication,
},
+ {
+ text: i18n('actions.createTransfer'),
+ action: actions.createTransfer,
+ },
{text: i18n('actions.createTopic'), action: actions.createTopic},
{text: i18n('actions.createView'), action: actions.createView},
];
@@ -276,6 +286,14 @@ export const getActions =
],
];
+ const TRANSFER_SET: ActionsSet = [
+ [copyItem],
+ [
+ {text: i18n('actions.alterTransfer'), action: actions.alterTransfer},
+ {text: i18n('actions.dropTransfer'), action: actions.dropTransfer},
+ ],
+ ];
+
const INDEX_SET: ActionsSet = [
[copyItem, {text: i18n('actions.dropIndex'), action: actions.dropIndex}],
];
@@ -286,6 +304,7 @@ export const getActions =
// TS will error when a new type is added in the lib but is not mapped here
const nodeTypeToActions: Record<NavigationTreeNodeType, ActionsSet> = {
async_replication: ASYNC_REPLICATION_SET,
+ transfer: TRANSFER_SET,
database: DB_SET,
diff --git a/src/containers/Tenant/utils/schemaQueryTemplates.ts b/src/containers/Tenant/utils/schemaQueryTemplates.ts
index 93e692a2e..b54796c80 100644
--- a/src/containers/Tenant/utils/schemaQueryTemplates.ts
+++ b/src/containers/Tenant/utils/schemaQueryTemplates.ts
@@ -78,6 +78,30 @@ WITH (
-- PASSWORD_SECRET_NAME="your_password"
);`;
};
+export const createTransferTemplate = () => {
+ return `-- docs: https://ydb.tech/docs/en/yql/reference/syntax/create-transfer
+CREATE OBJECT secret_name (TYPE SECRET) WITH value="secret_value";
+
+$l = ($x) -> {
+ return [
+ <|
+ offset:$x._offset,
+ message:$x._data
+ |>
+ ];
+};
+
+CREATE TRANSFER my_transfer
+FROM \${1:<original_topic>} TO \${2:target_table} USING $l
+WITH (
+ CONNECTION_STRING="\${3:grpcs://mydb.ydb.tech:2135/?database=/remote_database}",
+ TOKEN_SECRET_NAME = "secret_name"
+ -- ENDPOINT="mydb.ydb.tech:2135",
+ -- DATABASE=\`/remote_database\`,
+ -- USER="user",
+ -- PASSWORD_SECRET_NAME="your_password"
+);`;
+};
export const alterTableTemplate = (params?: SchemaQueryParams) => {
const path = params?.relativePath
? `\`${normalizeParameter(params.relativePath)}\``
@@ -240,6 +264,13 @@ export const dropAsyncReplicationTemplate = (params?: SchemaQueryParams) => {
return `DROP ASYNC REPLICATION ${path};`;
};
+export const dropTransferTemplate = (params?: SchemaQueryParams) => {
+ const path = params?.relativePath
+ ? `\`${normalizeParameter(params.relativePath)}\``
+ : '${1:<my_transfer>}';
+ return `DROP TRANSFER ${path};`;
+};
+
export const alterAsyncReplicationTemplate = (params?: SchemaQueryParams) => {
const path = params?.relativePath
? `\`${normalizeParameter(params.relativePath)}\``
@@ -248,6 +279,25 @@ export const alterAsyncReplicationTemplate = (params?: SchemaQueryParams) => {
ALTER ASYNC REPLICATION ${path} SET (STATE = "DONE", FAILOVER_MODE = "FORCE");`;
};
+export const alterTransferTemplate = (params?: SchemaQueryParams) => {
+ const path = params?.relativePath
+ ? `\`${normalizeParameter(params.relativePath)}\``
+ : '${1:<my_transfer>}';
+ return `-- docs: https://ydb.tech/docs/en/yql/reference/syntax/alter-transfer
+
+$l = ($x) -> {
+ return [
+ <|
+ offset:$x._offset,
+ message:$x._data
+ |>
+ ];
+};
+
+ALTER TRANSFER ${path}
+SET USING $l;`;
+};
+
export const addTableIndex = (params?: SchemaQueryParams) => {
const path = params?.relativePath
? `\`${normalizeParameter(params.relativePath)}\``
diff --git a/src/types/api/schema/schema.ts b/src/types/api/schema/schema.ts
index 0742d8601..4d50a15e0 100644
--- a/src/types/api/schema/schema.ts
+++ b/src/types/api/schema/schema.ts
@@ -297,6 +297,7 @@ export enum EPathType {
EPathTypeView = 'EPathTypeView',
EPathTypeReplication = 'EPathTypeReplication',
+ EPathTypeTransfer = 'EPathTypeTransfer',
EPathTypeResourcePool = 'EPathTypeResourcePool',
}
From 17dbc1b104c2567ab74411b7d0893c41d1678ac4 Mon Sep 17 00:00:00 2001
From: Nikolay Shestakov <tesseract@ydb.tech>
Date: Wed, 5 Mar 2025 15:52:00 +0500
Subject: [PATCH 02/10] WIP
---
.../Overview/TransferInfo/TransferInfo.tsx | 28 +++++++++++++++++--
.../Overview/TransferInfo/i18n/en.json | 5 +++-
src/types/api/schema/replication.ts | 11 ++++++++
3 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
index fc2487281..d7846a5a0 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
@@ -5,7 +5,6 @@ import {AsyncReplicationState} from '../../../../../components/AsyncReplicationS
import {YDBDefinitionList} from '../../../../../components/YDBDefinitionList/YDBDefinitionList';
import type {TEvDescribeSchemeResult} from '../../../../../types/api/schema';
import {getEntityName} from '../../../utils';
-import {AsyncReplicationPaths} from '../AsyncReplicationPaths';
import {Credentials} from './Credentials';
import i18n from './i18n';
@@ -31,7 +30,6 @@ export function TransferInfo({data}: TransferProps) {
return (
<Flex direction="column" gap="4">
<YDBDefinitionList title={entityName} items={transferItems} />
- <AsyncReplicationPaths config={data.PathDescription?.ReplicationDescription?.Config} />
</Flex>
);
}
@@ -41,6 +39,10 @@ function prepareTransferItems(data: TEvDescribeSchemeResult) {
const state = transferDescription.State;
const srcConnectionParams = transferDescription.Config?.SrcConnectionParams || {};
const {Endpoint, Database} = srcConnectionParams;
+ const target = transferDescription.Config?.TransferSpecific?.Targets[0];
+ const srcPath = target?.SrcPath;
+ const dstPath = target?.DstPath;
+ const transformLambda = target?.TransformLambda;
const info: DefinitionListItem[] = [];
@@ -74,5 +76,27 @@ function prepareTransferItems(data: TEvDescribeSchemeResult) {
});
}
+ info.push({
+ name: i18n('srcPath.label'),
+ copyText: srcPath,
+ content: <Text variant="code-inline-2">{srcPath}</Text>,
+ });
+
+ info.push({
+ name: i18n('dstPath.label'),
+ copyText: dstPath,
+ content: <Text variant="code-inline-2">{dstPath}</Text>,
+ });
+
+ info.push({
+ name: i18n('transformLambda.label'),
+ copyText: transformLambda,
+ content: (
+ <Text variant="code-2" whiteSpace="nowrap">
+ <pre>{transformLambda}</pre>
+ </Text>
+ ),
+ });
+
return info;
}
diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/en.json b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/en.json
index ecd7f0044..bf3ff975c 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/en.json
+++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/i18n/en.json
@@ -3,5 +3,8 @@
"noData": "No data for entity:",
"srcConnection.database.label": "Source Database Path",
"srcConnection.endpoint.label": "Source Cluster Endpoint",
- "state.label": "State"
+ "state.label": "State",
+ "srcPath.label": "Source Topic",
+ "dstPath.label": "Destination Table",
+ "transformLambda.label": "Transformation Lambda"
}
diff --git a/src/types/api/schema/replication.ts b/src/types/api/schema/replication.ts
index 95c39a53e..480c796fd 100644
--- a/src/types/api/schema/replication.ts
+++ b/src/types/api/schema/replication.ts
@@ -33,6 +33,16 @@ interface TTargetSpecific {
Targets: TTarget[];
}
+export interface TTransformTarget {
+ SrcPath?: string;
+ DstPath?: string;
+ TransformLambda?: string;
+}
+
+interface TTransformTargetSpecific {
+ Targets: TTransformTarget[];
+}
+
/**
* source: https://github.com/ydb-platform/ydb/blob/main/ydb/core/protos/replication.proto
*/
@@ -40,6 +50,7 @@ export interface TReplicationConfig {
SrcConnectionParams?: TConnectionParams;
Everything?: TTargetEverything;
Specific?: TTargetSpecific;
+ TransferSpecific?: TTransformTargetSpecific;
InitialSync?: boolean;
}
From dfa6436e7a0bab0604b49d33dbdc017609108900 Mon Sep 17 00:00:00 2001
From: Nikolay Shestakov <tesseract@ydb.tech>
Date: Wed, 5 Mar 2025 16:00:11 +0500
Subject: [PATCH 03/10] fix query templates
---
.../Tenant/utils/schemaQueryTemplates.ts | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/containers/Tenant/utils/schemaQueryTemplates.ts b/src/containers/Tenant/utils/schemaQueryTemplates.ts
index b54796c80..bcbbded19 100644
--- a/src/containers/Tenant/utils/schemaQueryTemplates.ts
+++ b/src/containers/Tenant/utils/schemaQueryTemplates.ts
@@ -82,17 +82,17 @@ export const createTransferTemplate = () => {
return `-- docs: https://ydb.tech/docs/en/yql/reference/syntax/create-transfer
CREATE OBJECT secret_name (TYPE SECRET) WITH value="secret_value";
-$l = ($x) -> {
+\\$l = (\\$x) -> {
return [
<|
- offset:$x._offset,
- message:$x._data
+ offset:\\$x._offset,
+ message:\\$x._data
|>
];
};
CREATE TRANSFER my_transfer
-FROM \${1:<original_topic>} TO \${2:target_table} USING $l
+FROM \${1:<original_topic>} TO \${2:<target_table>} USING \\$l
WITH (
CONNECTION_STRING="\${3:grpcs://mydb.ydb.tech:2135/?database=/remote_database}",
TOKEN_SECRET_NAME = "secret_name"
@@ -285,17 +285,17 @@ export const alterTransferTemplate = (params?: SchemaQueryParams) => {
: '${1:<my_transfer>}';
return `-- docs: https://ydb.tech/docs/en/yql/reference/syntax/alter-transfer
-$l = ($x) -> {
+\\$l = (\\$x) -> {
return [
<|
- offset:$x._offset,
- message:$x._data
+ offset:\\$x._offset,
+ message:\\$x._data
|>
];
};
ALTER TRANSFER ${path}
-SET USING $l;`;
+SET USING \\$l;`;
};
export const addTableIndex = (params?: SchemaQueryParams) => {
From fca01358f7e2cfd9b975bdda07ca22df3cecd656 Mon Sep 17 00:00:00 2001
From: Nikolay Shestakov <tesseract@ydb.tech>
Date: Wed, 5 Mar 2025 16:06:03 +0500
Subject: [PATCH 04/10] revert packages-lock
---
package-lock.json | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index b17d7284b..bde8f1c13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "ydb-embedded-ui",
- "version": "8.12.0",
+ "version": "8.13.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "ydb-embedded-ui",
- "version": "8.12.0",
+ "version": "8.13.0",
"dependencies": {
"@bem-react/classname": "^1.6.0",
"@ebay/nice-modal-react": "^1.2.13",
@@ -997,7 +997,12 @@
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
- }
+ }⚠
+Error: Parse error on line 1000:
+...: "^7.0.0-0" }
+----------------------^
+Expecting '}', ',', got 'EOF'
+
},
"node_modules/@babel/plugin-syntax-typescript": {
"version": "7.25.9",
@@ -29305,9 +29310,9 @@
}
},
"node_modules/ydb-ui-components": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/ydb-ui-components/-/ydb-ui-components-4.6.0.tgz",
- "integrity": "sha512-9gkD6KBda3Jo/zt8SpTgrmUckXP6gophDiL4E41CKjORCmi5umT5C7D/D98awzaB+ZltVL0L5ySdnZKizfD9Yw==",
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/ydb-ui-components/-/ydb-ui-components-4.5.0.tgz",
+ "integrity": "sha512-XefBB6dWHXbtyZ9jaxkmCJM5tl19V6VYrJ0nB2WcERCbb8ZG0GYJgywi5BBqQgOL8wH1Z5iut8WX7sQPcj+WNA==",
"license": "MIT",
"dependencies": {
"@bem-react/classname": "^1.6.0",
From f7b4efb1b9bb21d00e9e7d0fa22e4ea0e0776a83 Mon Sep 17 00:00:00 2001
From: Nikolay Shestakov <tesseract@ydb.tech>
Date: Wed, 5 Mar 2025 16:10:01 +0500
Subject: [PATCH 05/10] revert packages-lock
---
package-lock.json | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index bde8f1c13..bbe276409 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -998,11 +998,6 @@
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}⚠
-Error: Parse error on line 1000:
-...: "^7.0.0-0" }
-----------------------^
-Expecting '}', ',', got 'EOF'
-
},
"node_modules/@babel/plugin-syntax-typescript": {
"version": "7.25.9",
@@ -29310,8 +29305,8 @@ Expecting '}', ',', got 'EOF'
}
},
"node_modules/ydb-ui-components": {
- "version": "4.5.0",
- "resolved": "https://registry.npmjs.org/ydb-ui-components/-/ydb-ui-components-4.5.0.tgz",
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/ydb-ui-components/-/ydb-ui-components-4.6.0.tgz",
"integrity": "sha512-XefBB6dWHXbtyZ9jaxkmCJM5tl19V6VYrJ0nB2WcERCbb8ZG0GYJgywi5BBqQgOL8wH1Z5iut8WX7sQPcj+WNA==",
"license": "MIT",
"dependencies": {
From 5531c65d631cae9a403dea9b5af3741ef4ad7699 Mon Sep 17 00:00:00 2001
From: Nikolay Shestakov <tesseract@ydb.tech>
Date: Wed, 5 Mar 2025 16:11:12 +0500
Subject: [PATCH 06/10] revert packages-lock
---
package-lock.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package-lock.json b/package-lock.json
index bbe276409..4399ec6ac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -997,7 +997,7 @@
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
- }⚠
+ }
},
"node_modules/@babel/plugin-syntax-typescript": {
"version": "7.25.9",
From b2f10aeff60f94f3179bf39e02a54b664a75517d Mon Sep 17 00:00:00 2001
From: Nikolay Shestakov <tesseract@ydb.tech>
Date: Wed, 5 Mar 2025 16:26:47 +0500
Subject: [PATCH 07/10] revert packages-lock
---
package-lock.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package-lock.json b/package-lock.json
index 4399ec6ac..aa5fc93c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29307,7 +29307,7 @@
"node_modules/ydb-ui-components": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/ydb-ui-components/-/ydb-ui-components-4.6.0.tgz",
- "integrity": "sha512-XefBB6dWHXbtyZ9jaxkmCJM5tl19V6VYrJ0nB2WcERCbb8ZG0GYJgywi5BBqQgOL8wH1Z5iut8WX7sQPcj+WNA==",
+ "integrity": "sha512-9gkD6KBda3Jo/zt8SpTgrmUckXP6gophDiL4E41CKjORCmi5umT5C7D/D98awzaB+ZltVL0L5ySdnZKizfD9Yw==",
"license": "MIT",
"dependencies": {
"@bem-react/classname": "^1.6.0",
From fa71cb9df6195ace77a38713d9d4da1e9efaab75 Mon Sep 17 00:00:00 2001
From: Nikolay Shestakov <tesseract@ydb.tech>
Date: Wed, 5 Mar 2025 17:06:48 +0500
Subject: [PATCH 08/10] for rebuild
---
.../Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
index d7846a5a0..42730d477 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
@@ -88,6 +88,7 @@ function prepareTransferItems(data: TEvDescribeSchemeResult) {
content: <Text variant="code-inline-2">{dstPath}</Text>,
});
+ // TODO use true pre
info.push({
name: i18n('transformLambda.label'),
copyText: transformLambda,
From d6b914504b80073bc290c5eba6cfe6d6f52347a6 Mon Sep 17 00:00:00 2001
From: Nikolay Shestakov <tesseract@ydb.tech>
Date: Wed, 5 Mar 2025 20:54:01 +0500
Subject: [PATCH 09/10] use YqlHighlighter
---
.../Diagnostics/Overview/TransferInfo/TransferInfo.tsx | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
index 42730d477..dd49ec4d0 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
@@ -3,6 +3,7 @@ import {Flex, Text} from '@gravity-ui/uikit';
import {AsyncReplicationState} from '../../../../../components/AsyncReplicationState';
import {YDBDefinitionList} from '../../../../../components/YDBDefinitionList/YDBDefinitionList';
+import {YqlHighlighter} from '../../../../../components/YqlHighlighter/YqlHighlighter';
import type {TEvDescribeSchemeResult} from '../../../../../types/api/schema';
import {getEntityName} from '../../../utils';
@@ -88,15 +89,10 @@ function prepareTransferItems(data: TEvDescribeSchemeResult) {
content: <Text variant="code-inline-2">{dstPath}</Text>,
});
- // TODO use true pre
info.push({
name: i18n('transformLambda.label'),
copyText: transformLambda,
- content: (
- <Text variant="code-2" whiteSpace="nowrap">
- <pre>{transformLambda}</pre>
- </Text>
- ),
+ content: <YqlHighlighter>{transformLambda}</YqlHighlighter>,
});
return info;
From a067c7b20db5886a921b96422ad617463512a63a Mon Sep 17 00:00:00 2001
From: Nikolay Shestakov <tesseract@ydb.tech>
Date: Wed, 5 Mar 2025 21:30:44 +0500
Subject: [PATCH 10/10] use YqlHighlighter 2
---
.../Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
index dd49ec4d0..6981941f1 100644
--- a/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
+++ b/src/containers/Tenant/Diagnostics/Overview/TransferInfo/TransferInfo.tsx
@@ -92,7 +92,7 @@ function prepareTransferItems(data: TEvDescribeSchemeResult) {
info.push({
name: i18n('transformLambda.label'),
copyText: transformLambda,
- content: <YqlHighlighter>{transformLambda}</YqlHighlighter>,
+ content: transformLambda ? <YqlHighlighter>{transformLambda}</YqlHighlighter> : null,
});
return info;