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 9402693e6c [INLONG-10640][Dashboard] Approval page display item
modification (#10642)
9402693e6c is described below
commit 9402693e6c5644ac3d3f417af2258b4249b00fe7
Author: kamianlaida <165994047+wohainilao...@users.noreply.github.com>
AuthorDate: Wed Jul 17 20:49:43 2024 +0800
[INLONG-10640][Dashboard] Approval page display item modification (#10642)
---
inlong-dashboard/src/ui/locales/cn.json | 1 +
inlong-dashboard/src/ui/locales/en.json | 1 +
inlong-dashboard/src/ui/pages/Clusters/CreateModal.tsx | 2 ++
inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx | 13 ++++++++++++-
4 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/inlong-dashboard/src/ui/locales/cn.json
b/inlong-dashboard/src/ui/locales/cn.json
index 858945290a..5e0fb31416 100644
--- a/inlong-dashboard/src/ui/locales/cn.json
+++ b/inlong-dashboard/src/ui/locales/cn.json
@@ -712,6 +712,7 @@
"pages.Approvals.status.Canceled": "已取消",
"pages.Approvals.status.Ok": "审批通过",
"pages.Approvals.ApplicationTime": "申请时间",
+ "pages.Approvals.ProcessingTime": "审批时间",
"pages.Approvals.ApplicationType": "申请类型",
"pages.Approvals.Approval": "审批",
"pages.Approvals.Approver": "审批人",
diff --git a/inlong-dashboard/src/ui/locales/en.json
b/inlong-dashboard/src/ui/locales/en.json
index 7956346c2b..165e6deec6 100644
--- a/inlong-dashboard/src/ui/locales/en.json
+++ b/inlong-dashboard/src/ui/locales/en.json
@@ -712,6 +712,7 @@
"pages.Approvals.status.Canceled": "Canceled",
"pages.Approvals.status.Ok": "Approved",
"pages.Approvals.ApplicationTime": "Time",
+ "pages.Approvals.ProcessingTime": "Processing Time",
"pages.Approvals.ApplicationType": "Type",
"pages.Approvals.Approval": "Approval",
"pages.Approvals.Approver": "Approver",
diff --git a/inlong-dashboard/src/ui/pages/Clusters/CreateModal.tsx
b/inlong-dashboard/src/ui/pages/Clusters/CreateModal.tsx
index 35b5b3641d..bf5645c58c 100644
--- a/inlong-dashboard/src/ui/pages/Clusters/CreateModal.tsx
+++ b/inlong-dashboard/src/ui/pages/Clusters/CreateModal.tsx
@@ -69,6 +69,8 @@ const Comp: React.FC<Props> = ({ id, defaultType,
...modalProps }) => {
values.type === 'AGENT' ||
values.type === 'SORT_CLS' ||
values.type === 'SORT_ES' ||
+ values.type === 'SORT_CKAFKA' ||
+ values.type === 'SORT_KAFKA' ||
values.type === 'SORT_PULSAR'
) {
submitData.name = values.displayName;
diff --git a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
index cc15f5fdc0..177b59ff37 100644
--- a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
+++ b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
@@ -126,6 +126,17 @@ export const getColumns = activedName => [
dataIndex: 'startTime',
render: text => timestampFormat(text),
},
+ {
+ title: i18n.t('pages.Approvals.ProcessingTime'),
+ dataIndex: 'endTime',
+ render: (text, record) => {
+ if (record.status === 'PENDING') {
+ return '';
+ } else {
+ return timestampFormat(text);
+ }
+ },
+ },
{
title: i18n.t('basic.Status'),
dataIndex: 'status',
@@ -138,7 +149,7 @@ export const getColumns = activedName => [
<Link
to={`/process/${activedName}/${record.processId}?taskId=${record.id}&inlongGroupMode=${record.showInList?.[0]?.inlongGroupMode}`}
>
- {i18n.t('pages.Approvals.Approval')}
+ {record.status === 'PENDING' ? i18n.t('pages.Approvals.Approval') :
i18n.t('basic.Detail')}
</Link>
),
},
