This is an automated email from the ASF dual-hosted git repository.
dockerzhang 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 0eb13c9d93 [INLONG-8502][Dashboard] Query data preview interface
exception (#8503)
0eb13c9d93 is described below
commit 0eb13c9d93cb92a0d1f46826e6e73859bea53721
Author: Lizhen <[email protected]>
AuthorDate: Wed Jul 12 18:27:46 2023 +0800
[INLONG-8502][Dashboard] Query data preview interface exception (#8503)
---
inlong-dashboard/src/ui/locales/cn.json | 8 ++++----
inlong-dashboard/src/ui/locales/en.json | 2 +-
.../src/ui/pages/GroupDetail/DataStream/PreviewModal.tsx | 11 +++--------
.../src/ui/pages/TenantManagement/DetailModal.tsx | 2 +-
inlong-dashboard/src/ui/pages/TenantManagement/index.tsx | 2 +-
5 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/inlong-dashboard/src/ui/locales/cn.json
b/inlong-dashboard/src/ui/locales/cn.json
index 5fb04d01a6..e2d567bbae 100644
--- a/inlong-dashboard/src/ui/locales/cn.json
+++ b/inlong-dashboard/src/ui/locales/cn.json
@@ -560,7 +560,7 @@
"pages.GroupDashboard.config.Restart": "重启",
"pages.GroupDashboard.config.Stop": "停止",
"pages.GroupDashboard.ConfirmDelete": "确认删除吗",
- "pages.GroupDashboard.Create": "新建数据流组",
+ "pages.GroupDashboard.Create": "新建接入",
"pages.GroupDashboard.SuccessfullyDeleted": "删除成功",
"pages.GroupDashboard.ConfirmRestart": "确认重启吗",
"pages.GroupDashboard.SuccessfullyRestart": "重启成功",
@@ -576,7 +576,7 @@
"pages.GroupDetail.Info.SubmittedWarn": "请先创建数据来源和数据目标",
"pages.GroupDetail.Info.CheckMsg": "请检查表单",
"pages.GroupDetail.Info.Previous": "上一步",
- "pages.GroupDetail.Info.Create": "新建数据流组",
+ "pages.GroupDetail.Info.Create": "新建接入",
"pages.GroupDetail.Sources.SaveSuccessfully": "保存成功",
"pages.GroupDetail.Sources.DeleteConfirm": "确认删除吗",
"pages.GroupDetail.Sources.DeleteSuccessfully": "删除成功",
@@ -632,7 +632,6 @@
"pages.GroupDetail.Audit.Day": "天",
"pages.GroupDetail.Audit.Sink": "数据目标",
"pages.GroupDetail.Stream.Preview": "数据预览",
- "pages.GroupDetail.Stream.NodeIp": "数据节点 IP",
"pages.GroupDetail.Stream.Dt": "数据时间 (dt)",
"pages.GroupDetail.Stream.Content": "数据内容",
"pages.GroupDetail.Stream.Number": "数据条数",
@@ -801,7 +800,8 @@
"components.FieldList.AddField": "添加字段",
"pages.Tenant.config.Description": "描述",
"pages.Tenant.config.Name": "租户名称",
- "pages.Tenant.New": "新建角色",
+ "pages.Tenant.New": "新建租户",
+ "pages.TenantRole.New": "新建角色",
"pages.Tenant.config.Username": "用户名称",
"pages.Tenant.config.TenantRole": "租户角色",
"pages.Tenant.config.Admin": "租户管理员",
diff --git a/inlong-dashboard/src/ui/locales/en.json
b/inlong-dashboard/src/ui/locales/en.json
index ec4c832359..4542a6bd57 100644
--- a/inlong-dashboard/src/ui/locales/en.json
+++ b/inlong-dashboard/src/ui/locales/en.json
@@ -632,7 +632,6 @@
"pages.GroupDetail.Audit.Day": "Day",
"pages.GroupDetail.Audit.Sink": "Sink",
"pages.GroupDetail.Stream.Preview": "Data Preview",
- "pages.GroupDetail.Stream.NodeIp": "DataNode IP",
"pages.GroupDetail.Stream.Dt": "Data Time(dt)",
"pages.GroupDetail.Stream.Content": "Data Content",
"pages.GroupDetail.Stream.Number": "Records Number",
@@ -802,6 +801,7 @@
"pages.Tenant.config.Description": "Description",
"pages.Tenant.config.Name": "Tenant Name",
"pages.Tenant.New": "Create",
+ "pages.TenantRole.New": "Create",
"pages.Tenant.config.Username": "User Name",
"pages.Tenant.config.TenantRole": "Tenant Role",
"pages.Tenant.config.Admin": "Tenant Admin",
diff --git
a/inlong-dashboard/src/ui/pages/GroupDetail/DataStream/PreviewModal.tsx
b/inlong-dashboard/src/ui/pages/GroupDetail/DataStream/PreviewModal.tsx
index 69620bf6bd..7481992245 100644
--- a/inlong-dashboard/src/ui/pages/GroupDetail/DataStream/PreviewModal.tsx
+++ b/inlong-dashboard/src/ui/pages/GroupDetail/DataStream/PreviewModal.tsx
@@ -35,7 +35,6 @@ const Comp: React.FC<Props> = ({ inlongGroupId,
inlongStreamId, ...modalProps })
const [position, setPosition] = useState(1);
interface DataType {
id: React.Key;
- nodeIp: string;
dt: string;
body: string;
}
@@ -45,10 +44,6 @@ const Comp: React.FC<Props> = ({ inlongGroupId,
inlongStreamId, ...modalProps })
title: 'ID',
dataIndex: 'id',
},
- {
- title: i18n.t('pages.GroupDetail.Stream.NodeIp'),
- dataIndex: 'nodeIp',
- },
{
title: i18n.t('pages.GroupDetail.Stream.Dt'),
dataIndex: 'dt',
@@ -64,11 +59,11 @@ const Comp: React.FC<Props> = ({ inlongGroupId,
inlongStreamId, ...modalProps })
const { data: previewData, run: getPreviewData } = useRequest(
{
- url: '/stream/listMessage',
+ url: '/stream/listMessages',
params: {
groupId: inlongGroupId,
streamId: inlongStreamId,
- position: position,
+ messageCount: position,
},
},
{
@@ -93,7 +88,7 @@ const Comp: React.FC<Props> = ({ inlongGroupId,
inlongStreamId, ...modalProps })
<Modal
{...modalProps}
title={i18n.t('pages.GroupDetail.Stream.Preview')}
- width={1000}
+ width={950}
footer={null}
>
<div style={{ marginBottom: 20, marginTop: 20 }}>
diff --git a/inlong-dashboard/src/ui/pages/TenantManagement/DetailModal.tsx
b/inlong-dashboard/src/ui/pages/TenantManagement/DetailModal.tsx
index 72e5d7b06b..97d779a8f8 100644
--- a/inlong-dashboard/src/ui/pages/TenantManagement/DetailModal.tsx
+++ b/inlong-dashboard/src/ui/pages/TenantManagement/DetailModal.tsx
@@ -188,7 +188,7 @@ const Comp: React.FC<Props> = ({ id, ...modalProps }) => {
<>
<Modal
{...modalProps}
- title={id ? i18n.t('basic.Edit') : i18n.t('pages.Tenant.New')}
+ title={id ? i18n.t('basic.Edit') : i18n.t('pages.TenantRole.New')}
width={600}
onOk={onOk}
>
diff --git a/inlong-dashboard/src/ui/pages/TenantManagement/index.tsx
b/inlong-dashboard/src/ui/pages/TenantManagement/index.tsx
index 85de5780f1..7796cc9d1c 100644
--- a/inlong-dashboard/src/ui/pages/TenantManagement/index.tsx
+++ b/inlong-dashboard/src/ui/pages/TenantManagement/index.tsx
@@ -95,7 +95,7 @@ const Comp: React.FC = () => {
<HighTable
suffix={
<Button type="primary" onClick={() => setCreateModal({ open:
true })}>
- {t('pages.Tenant.New')}
+ {t('pages.TenantRole.New')}
</Button>
}
filterForm={{
