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 688edd4b2a [INLONG-8546][Dashboard] Resource details abnormal display
repair (#8574)
688edd4b2a is described below
commit 688edd4b2ad201dbf8e550556316fb274c5e3ee5
Author: Lizhen <[email protected]>
AuthorDate: Thu Jul 20 19:00:36 2023 +0800
[INLONG-8546][Dashboard] Resource details abnormal display repair (#8574)
---
.../ui/pages/GroupDetail/ResourceInfo/index.tsx | 35 ++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/inlong-dashboard/src/ui/pages/GroupDetail/ResourceInfo/index.tsx
b/inlong-dashboard/src/ui/pages/GroupDetail/ResourceInfo/index.tsx
index 89c329fb85..faa6984c38 100644
--- a/inlong-dashboard/src/ui/pages/GroupDetail/ResourceInfo/index.tsx
+++ b/inlong-dashboard/src/ui/pages/GroupDetail/ResourceInfo/index.tsx
@@ -54,19 +54,32 @@ const Comp = ({ inlongGroupId, isCreate }: Props, ref) => {
for (const key in data[item]) {
content.push({
label: key,
- name: key,
+ name: item + '_' + key,
type: 'text',
initialValue: data[item][key],
});
}
return content;
}
+ if (data[item].constructor === Array) {
+ const infoData = [];
+ for (const key in data[item]) {
+ infoData.push(data[item][key].url);
+ }
+ content.push({
+ label: 'url',
+ name: 'kafkaUrl',
+ type: 'text',
+ initialValue: infoData.join(','),
+ });
+ return content;
+ }
};
const dividerInfo = data => {
let info = [];
for (const item in data) {
- if (data[item] !== null && item !== 'SortInfo' && item !== 'PULSAR') {
+ if (data[item] !== null && item !== 'SortInfo' && item !== 'PULSAR' &&
item !== 'TUBEMQ') {
info.push(item);
}
}
@@ -111,6 +124,24 @@ const Comp = ({ inlongGroupId, isCreate }: Props, ref) => {
></Table>
</>
)}
+ {data?.hasOwnProperty('TUBEMQ') && (
+ <>
+ <Divider orientation="left" style={{ marginTop: 40 }}>
+ TubeMQ {t('pages.GroupDetail.Resource.Info')}
+ </Divider>
+ <Table
+ size="small"
+ columns={[
+ { title: 'RPC Url', dataIndex: 'RPC Url' },
+ { title: 'Web Url', dataIndex: 'Web url' },
+ ]}
+ style={{ marginTop: 20, width: 1100 }}
+ dataSource={data?.TUBEMQ}
+ pagination={false}
+ rowKey="name"
+ ></Table>
+ </>
+ )}
{data?.hasOwnProperty('SortInfo') && (
<>
<Divider orientation="left" style={{ marginTop: 60 }}>