This is an automated email from the ASF dual-hosted git repository. aloyszhang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push: new b08cfff127 [INLONG-10846][Dashboard] Add cluster name to data source information display (#10848) b08cfff127 is described below commit b08cfff12739067720b46ed27d0ed5c418fdd537 Author: kamianlaida <165994047+wohainilao...@users.noreply.github.com> AuthorDate: Mon Aug 26 20:15:49 2024 +0800 [INLONG-10846][Dashboard] Add cluster name to data source information display (#10848) --- inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts | 4 ++++ inlong-dashboard/src/ui/locales/cn.json | 1 + inlong-dashboard/src/ui/locales/en.json | 1 + inlong-dashboard/src/ui/pages/GroupDetail/DataSources/index.tsx | 5 ++++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts b/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts index d5c768d8a9..970bd181a7 100644 --- a/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts +++ b/inlong-dashboard/src/plugins/sources/common/SourceDefaultInfo.ts @@ -118,6 +118,10 @@ export class SourceDefaultInfo implements DataWithBackend, RenderRow, RenderList @I18n('meta.Sources.Name') sourceName: string; + @ColumnDecorator() + @I18n('meta.Sources.ClusterName') + readonly inlongClusterName: string; + @FieldDecorator({ type: 'select', props: { diff --git a/inlong-dashboard/src/ui/locales/cn.json b/inlong-dashboard/src/ui/locales/cn.json index 379a5a83e1..f6b1e5a493 100644 --- a/inlong-dashboard/src/ui/locales/cn.json +++ b/inlong-dashboard/src/ui/locales/cn.json @@ -25,6 +25,7 @@ "basic.SuccessfullyRestart": "重启成功", "basic.SuccessfullyStop": "停止成功", "meta.Sources.Name": "数据源名称", + "meta.Sources.ClusterName": "集群名", "meta.Sources.NameRule": "只能包含英文字母、数字、点号(.)、中划线(-)、下划线(_)", "meta.Sources.Type": "类型", "meta.Sources.File.SerializationType": "文件类型", diff --git a/inlong-dashboard/src/ui/locales/en.json b/inlong-dashboard/src/ui/locales/en.json index bc1106fdd6..473f53d20d 100644 --- a/inlong-dashboard/src/ui/locales/en.json +++ b/inlong-dashboard/src/ui/locales/en.json @@ -25,6 +25,7 @@ "basic.SuccessfullyRestart": "Successfully restart", "basic.SuccessfullyStop": "Successfully stop", "meta.Sources.Name": "Source name", + "meta.Sources.ClusterName": "Cluster Name", "meta.Sources.NameRule": "Only English letters, numbers, dots(.), minus(-), and underscores(_)", "meta.Sources.Type": "Type", "meta.Sources.File.SerializationType": "File type", diff --git a/inlong-dashboard/src/ui/pages/GroupDetail/DataSources/index.tsx b/inlong-dashboard/src/ui/pages/GroupDetail/DataSources/index.tsx index e1050f61d6..6af108b3c1 100644 --- a/inlong-dashboard/src/ui/pages/GroupDetail/DataSources/index.tsx +++ b/inlong-dashboard/src/ui/pages/GroupDetail/DataSources/index.tsx @@ -209,6 +209,8 @@ const Comp = ({ inlongGroupId, inlongStreamId, readonly }: Props, ref) => { { title: i18n.t('basic.Operating'), dataIndex: 'action', + fixed: 'right', + width: 200, render: (text, record) => readonly ? ( '-' @@ -235,7 +237,7 @@ const Comp = ({ inlongGroupId, inlongStreamId, readonly }: Props, ref) => { }, ]); }, [entityColumns, onDelete, onEdit, readonly]); - + const scroll = { x: 850 }; return ( <> <Card @@ -330,6 +332,7 @@ const Comp = ({ inlongGroupId, inlongStreamId, readonly }: Props, ref) => { pagination, loading, onChange, + scroll, }} /> )}