From 3f518c9e63b7e7a8836df4e6b70cb3b5165a0527 Mon Sep 17 00:00:00 2001 From: SUZJ <905430093@qq.com> Date: Tue, 6 Jun 2023 19:01:08 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90ACL?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=AD=EF=BC=8C=E6=B6=88=E8=B4=B9=E7=BB=84?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98(#991)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout-clusters-fe/src/api/index.ts | 1 + .../src/pages/SecurityACLs/EditDrawer.tsx | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/km-console/packages/layout-clusters-fe/src/api/index.ts b/km-console/packages/layout-clusters-fe/src/api/index.ts index 1c6bc77e..7dadd9ec 100755 --- a/km-console/packages/layout-clusters-fe/src/api/index.ts +++ b/km-console/packages/layout-clusters-fe/src/api/index.ts @@ -94,6 +94,7 @@ const api = { getTopicGroupPartitionsHistory: (clusterPhyId: number, groupName: string) => getApi(`/clusters/${clusterPhyId}/groups/${groupName}/partitions`), resetGroupOffset: () => getApi('/group-offsets'), + getGroupOverview: (clusterPhyId: number) => getApi(`/clusters/${clusterPhyId}/groups-overview`), // topics列表 getTopicsList: (clusterPhyId: number) => getApi(`/clusters/${clusterPhyId}/topics-overview`), diff --git a/km-console/packages/layout-clusters-fe/src/pages/SecurityACLs/EditDrawer.tsx b/km-console/packages/layout-clusters-fe/src/pages/SecurityACLs/EditDrawer.tsx index 8afcdccc..a325a9bc 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/SecurityACLs/EditDrawer.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/SecurityACLs/EditDrawer.tsx @@ -85,6 +85,7 @@ const AddDrawer = forwardRef((_, ref) => { return; }); const [topicMetaData, setTopicMetaData] = React.useState([]); + const [groupMetaData, setGroupMetaData] = React.useState([]); // 获取 Topic 元信息 const getTopicMetaData = (newValue: any) => { @@ -102,6 +103,21 @@ const AddDrawer = forwardRef((_, ref) => { }); }; + // 获取 Group 元信息 + const getGroupMetaData = () => { + Utils.request(api.getGroupOverview(+clusterId), { + method: 'GET', + }).then((res: any) => { + const groups = res?.bizData.map((item: any) => { + return { + label: item.name, + value: item.name, + }; + }); + setGroupMetaData(groups); + }); + }; + // 获取 kafkaUser 列表 const getKafkaUserList = () => { Utils.request(api.getKafkaUsers(clusterId), { @@ -209,6 +225,7 @@ const AddDrawer = forwardRef((_, ref) => { useEffect(() => { getKafkaUserList(); getTopicMetaData(''); + getGroupMetaData(); }, []); return ( @@ -321,7 +338,7 @@ const AddDrawer = forwardRef((_, ref) => { } return false; }} - options={topicMetaData} + options={type === 'topic' ? topicMetaData : groupMetaData} placeholder={`请输入 ${type}Name`} />