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 643c21563 [INLONG-7613][Dashboard] Data reporting moved to Approval
Information (#7615)
643c21563 is described below
commit 643c21563bc065a48e00051c589ba3dce03082d3
Author: Lizhen <[email protected]>
AuthorDate: Wed Mar 15 14:11:27 2023 +0800
[INLONG-7613][Dashboard] Data reporting moved to Approval Information
(#7615)
---
inlong-dashboard/src/locales/cn.json | 8 +++----
inlong-dashboard/src/locales/en.json | 8 +++----
.../src/metas/groups/common/GroupDefaultInfo.ts | 24 --------------------
.../src/pages/ProcessDetail/GroupConfig.tsx | 26 ++++++++++++++++++++++
4 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/inlong-dashboard/src/locales/cn.json
b/inlong-dashboard/src/locales/cn.json
index 5d7b75580..65ec6b91d 100644
--- a/inlong-dashboard/src/locales/cn.json
+++ b/inlong-dashboard/src/locales/cn.json
@@ -364,10 +364,6 @@
"meta.Group.InlongGroupOwners": "责任人",
"meta.Group.InlongGroupOwnersExtra": "责任人，可查看、修改数据流组信息",
"meta.Group.InlongGroupIntroduction": "描述",
- "meta.Group.DataReportType": "数据上报",
- "meta.Group.DataReportType.DataProxyWithSource": "发往 DataProxy，待 DataProxy
接收到数据后再响应",
- "meta.Group.DataReportType.DataProxyWithSink": "发往 DataProxy，待 DataProxy
发送出数据后再响应",
- "meta.Group.DataReportType.MQ": "发往 MQ，待 MQ 接收到数据后再响应",
"meta.Group.MQType": "MQ 类型",
"meta.Group.Pulsar.QueueModule": "队列模型",
"meta.Group.Pulsar.Parallel": "并行",
@@ -599,6 +595,10 @@
"pages.ApprovalDetail.GroupConfig.BindClusterTag": "集群标签",
"pages.ApprovalDetail.ConsumeConfig.ConsumerGroup": "消费组",
"pages.ApprovalDetail.ConsumeConfig.ApprovalInfo": "审批信息",
+ "pages.ApprovalDetail.GroupConfig.DataReportType": "数据上报",
+ "pages.ApprovalDetail.GroupConfig.DataReportType.DataProxyWithSource": "发往
DataProxy，待 DataProxy 接收到数据后再响应",
+ "pages.ApprovalDetail.GroupConfig.DataReportType.DataProxyWithSink": "发往
DataProxy，待 DataProxy 发送出数据后再响应",
+ "pages.ApprovalDetail.GroupConfig.DataReportType.MQ": "发往 MQ，待 MQ 接收到数据后再响应",
"pages.ApprovalDetail.SubmitApplication": "提交申请",
"pages.ApprovalDetail.Process": "流程单",
"pages.ApprovalDetail.Ok": "通过",
diff --git a/inlong-dashboard/src/locales/en.json
b/inlong-dashboard/src/locales/en.json
index 4f8295887..17ff322d7 100644
--- a/inlong-dashboard/src/locales/en.json
+++ b/inlong-dashboard/src/locales/en.json
@@ -364,10 +364,6 @@
"meta.Group.InlongGroupOwners": "Inlong Group Owners",
"meta.Group.InlongGroupOwnersExtra": "Can view, modify group info",
"meta.Group.InlongGroupIntroduction": "Description",
- "meta.Group.DataReportType": "ReportDataTo",
- "meta.Group.DataReportType.DataProxyWithSource": "Report to DataProxy and
respond when the DataProxy received data",
- "meta.Group.DataReportType.DataProxyWithSink": "Report to DataProxy and
respond after DataProxy sends data",
- "meta.Group.DataReportType.MQ": "Report to MQ and respond when the MQ
received data",
"meta.Group.MQType": "MQ Type",
"meta.Group.Pulsar.QueueModule": "Queue Module",
"meta.Group.Pulsar.Parallel": "Parallel",
@@ -597,6 +593,10 @@
"pages.ApprovalDetail.GroupConfig.ApprovalInformation": "Approval
information",
"pages.ApprovalDetail.GroupConfig.DataFlowInformation": "Data stream
information",
"pages.ApprovalDetail.GroupConfig.BindClusterTag": "Cluster tag",
+ "pages.ApprovalDetail.GroupConfig.DataReportType": "ReportDataTo",
+ "pages.ApprovalDetail.GroupConfig.DataReportType.DataProxyWithSource":
"Report to DataProxy and respond when the DataProxy received data",
+ "pages.ApprovalDetail.GroupConfig.DataReportType.DataProxyWithSink": "Report
to DataProxy and respond after DataProxy sends data",
+ "pages.ApprovalDetail.GroupConfig.DataReportType.MQ": "Report to MQ and
respond when the MQ received data",
"pages.ApprovalDetail.ConsumeConfig.ConsumerGroup": "Consumer group",
"pages.ApprovalDetail.ConsumeConfig.ApprovalInfo": "Approval information",
"pages.ApprovalDetail.SubmitApplication": "Submit application",
diff --git a/inlong-dashboard/src/metas/groups/common/GroupDefaultInfo.ts
b/inlong-dashboard/src/metas/groups/common/GroupDefaultInfo.ts
index 3ee94c79e..db603bfe4 100644
--- a/inlong-dashboard/src/metas/groups/common/GroupDefaultInfo.ts
+++ b/inlong-dashboard/src/metas/groups/common/GroupDefaultInfo.ts
@@ -85,30 +85,6 @@ export class GroupDefaultInfo implements DataWithBackend,
RenderRow, RenderList
@I18n('meta.Group.InlongGroupIntroduction')
description: string;
- @FieldDecorator({
- type: 'select',
- initialValue: 0,
- rules: [{ required: true }],
- props: {
- options: [
- {
- label: i18n.t('meta.Group.DataReportType.DataProxyWithSource'),
- value: 0,
- },
- {
- label: i18n.t('meta.Group.DataReportType.DataProxyWithSink'),
- value: 1,
- },
- {
- label: i18n.t('meta.Group.DataReportType.MQ'),
- value: 2,
- },
- ],
- },
- })
- @I18n('meta.Group.DataReportType')
- dataReportType: string;
-
@FieldDecorator({
type: 'radio',
initialValue: defaultValue,
diff --git a/inlong-dashboard/src/pages/ProcessDetail/GroupConfig.tsx
b/inlong-dashboard/src/pages/ProcessDetail/GroupConfig.tsx
index ae34f5f6f..f4f62ed55 100644
--- a/inlong-dashboard/src/pages/ProcessDetail/GroupConfig.tsx
+++ b/inlong-dashboard/src/pages/ProcessDetail/GroupConfig.tsx
@@ -129,6 +129,32 @@ export const getFormContent = ({
},
},
},
+ {
+ type: 'select',
+ label: i18n.t('pages.ApprovalDetail.GroupConfig.DataReportType'),
+ initialValue: 0,
+ name: ['dataReportType'],
+ rules: [{ required: true }],
+ props: {
+ disabled: isFinished,
+ options: [
+ {
+ label: i18n.t(
+
'pages.ApprovalDetail.GroupConfig.DataReportType.DataProxyWithSource',
+ ),
+ value: 0,
+ },
+ {
+ label:
i18n.t('pages.ApprovalDetail.GroupConfig.DataReportType.DataProxyWithSink'),
+ value: 1,
+ },
+ {
+ label:
i18n.t('pages.ApprovalDetail.GroupConfig.DataReportType.MQ'),
+ value: 2,
+ },
+ ],
+ },
+ },
];
return isViwer
