Skip to content

[INLONG-10417][Dashboard] Fixed the group mode display error #10418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dockerzhang merged 2 commits into from
Jun 14, 2024
Merged

[INLONG-10417][Dashboard] Fixed the group mode display error #10418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f678a31
[Bug][Dashboard] There is an issue with the MODE display on the appro…
wohainilaodou Jun 14, 2024
40dae7c
[Bug][Dashboard] There is an issue with the MODE display on the appro…
wohainilaodou Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions inlong-dashboard/src/i18n.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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': '标签管理',
Expand Down
10 changes: 5 additions & 5 deletions inlong-dashboard/src/ui/pages/Process/Applies/config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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'),
Expand All @@ -92,7 +92,7 @@ export const getColumns = activedName => [
/>
);
}
return record.showInList?.inlongGroupMode === 1 ? (
return record.showInList[0]?.inlongGroupMode === 1 ? (
<StatusTag
type={'success'}
icon={<span />}
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions inlong-dashboard/src/ui/pages/Process/Approvals/config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -105,7 +105,7 @@ export const getColumns = activedName => [
/>
);
}
return record.showInList?.inlongGroupMode === 1 ? (
return record.showInList[0]?.inlongGroupMode === 1 ? (
<StatusTag
type={'success'}
icon={<span />}
Expand Down Expand Up @@ -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>
Expand Down