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 08d1e5dddd [INLONG-10417][Dashboard] Fixed the group mode display
error (#10418)
08d1e5dddd is described below
commit 08d1e5ddddf67f72badd473b6632caf6f380d128
Author: wohainilaodou <[email protected]>
AuthorDate: Fri Jun 14 17:29:57 2024 +0800
[INLONG-10417][Dashboard] Fixed the group mode display error (#10418)
---
inlong-dashboard/src/i18n.ts | 4 ++--
inlong-dashboard/src/ui/pages/Process/Applies/config.tsx | 10 +++++-----
inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/inlong-dashboard/src/i18n.ts b/inlong-dashboard/src/i18n.ts
index eebff6c37f..959941e358 100644
--- a/inlong-dashboard/src/i18n.ts
+++ b/inlong-dashboard/src/i18n.ts
@@ -28,7 +28,7 @@ const resources = {
'configs.menus.Process': 'Approval',
'configs.menus.Groups': 'Ingestion',
'configs.menus.GroupsManagement': 'Ingestion Management',
- 'configs.menus.Groups.Template': 'Template',
+ 'configs.menus.Groups.Template': 'Template Management',
'configs.menus.Subscribe': 'Subscription',
'configs.menus.Clusters': 'Clusters',
'configs.menus.ClusterTags': 'ClusterTags',
@@ -49,7 +49,7 @@ const resources = {
'configs.menus.Process': '审批管理',
'configs.menus.Groups': '数据接入',
'configs.menus.GroupsManagement': '接入管理',
- 'configs.menus.Groups.Template': '模板',
+ 'configs.menus.Groups.Template': '模板管理',
'configs.menus.Subscribe': '数据订阅',
'configs.menus.Clusters': '集群管理',
'configs.menus.ClusterTags': '标签管理',
diff --git a/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
b/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
index f7491e9417..7fa8889dd2 100644
--- a/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
+++ b/inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
@@ -55,7 +55,7 @@ export const getColumns = activedName => [
width: 90,
render: (text, record) => (
<Link
-
to={`/process/${activedName}/${text}?inlongGroupMode=${record.showInList?.inlongGroupMode}`}
+
to={`/process/${activedName}/${text}?inlongGroupMode=${record.showInList[0]?.inlongGroupMode}`}
>
{text}
</Link>
@@ -70,13 +70,13 @@ export const getColumns = activedName => [
title: i18n.t('pages.Approvals.GroupId'),
dataIndex: 'inlongGroupId',
width: 200,
- render: (text, record) => record.showInList?.inlongGroupId,
+ render: (text, record) => record.showInList[0]?.inlongGroupId,
},
{
title: i18n.t('pages.Approvals.ConsumeName'),
dataIndex: 'consumerGroup',
width: 200,
- render: (text, record) => record.showInList?.consumerGroup,
+ render: (text, record) => record.showInList[0]?.consumerGroup,
},
{
title: i18n.t('pages.Approvals.GroupMode'),
@@ -92,7 +92,7 @@ export const getColumns = activedName => [
/>
);
}
- return record.showInList?.inlongGroupMode === 1 ? (
+ return record.showInList[0]?.inlongGroupMode === 1 ? (
<StatusTag
type={'success'}
icon={<span />}
@@ -131,7 +131,7 @@ export const getColumns = activedName => [
width: 100,
render: (text, record) => (
<Link
-
to={`/process/${activedName}/${record.id}?inlongGroupMode=${record.showInList?.inlongGroupMode}`}
+
to={`/process/${activedName}/${record.id}?inlongGroupMode=${record.showInList[0]?.inlongGroupMode}`}
>
{i18n.t('basic.Detail')}
</Link>
diff --git a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
index 0956f5dba7..f1d020067f 100644
--- a/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
+++ b/inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
@@ -59,7 +59,7 @@ export const getColumns = activedName => [
dataIndex: 'processId',
render: (text, record) => (
<Link
-
to={`/process/${activedName}/${text}?taskId=${record.id}&inlongGroupMode=${record.showInList?.inlongGroupMode}`}
+
to={`/process/${activedName}/${text}?taskId=${record.id}&inlongGroupMode=${record.showInList[0]?.inlongGroupMode}`}
>
{text}
</Link>
@@ -105,7 +105,7 @@ export const getColumns = activedName => [
/>
);
}
- return record.showInList?.inlongGroupMode === 1 ? (
+ return record.showInList[0]?.inlongGroupMode === 1 ? (
<StatusTag
type={'success'}
icon={<span />}
@@ -135,7 +135,7 @@ export const getColumns = activedName => [
dataIndex: 'action',
render: (text, record) => (
<Link
-
to={`/process/${activedName}/${record.processId}?taskId=${record.id}&inlongGroupMode=${record.showInList?.inlongGroupMode}`}
+
to={`/process/${activedName}/${record.processId}?taskId=${record.id}&inlongGroupMode=${record.showInList[0]?.inlongGroupMode}`}
>
{i18n.t('pages.Approvals.Approval')}
</Link>
