8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2025-12-24 20:22:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

合并Master分支

Browse Source
This commit is contained in:
ZQKC
2023-07-07 13:09:28 +08:00
parent 9f6882cf0d 42195c3180
commit b1aa12bfa5
108 changed files with 2418 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
km-console/packages/layout-clusters-fe/src/api/index.ts
View File

@@ -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`),

9
km-console/packages/layout-clusters-fe/src/pages/ConsumerGroup/ResetOffsetDrawer.tsx
View File

@@ -19,18 +19,19 @@ const CustomSelectResetTime = (props: { value?: string; onChange?: (val: Number
}}
onChange={(e) => {
setTimeSetMode(e.target.value);
if (e.target.value === 'newest') {
onChange('newest');
if (e.target.value === 'newest' || e.target.value === 'oldest') {
onChange(e.target.value);
}
}}
value={timeSetMode}
>
<Radio value={'newest'}>最新Offset</Radio>
<Radio value={'oldest'}>最旧Offset</Radio>
<Radio value={'custom'}>自定义</Radio>
</Radio.Group>
{timeSetMode === 'custom' && (
<DatePicker
value={moment(value === 'newest' ? Date.now() : value)}
value={moment(value === 'newest' || value === 'oldest' ? Date.now() : value)}
style={{ width: '100%' }}
showTime={true}
onChange={(v) => {
@@ -88,7 +89,7 @@ export default (props: any) => {
topicName: record.topicName,
};
if (formData.resetType === 'assignedTime') {
resetParams.resetType = formData.timestamp === 'newest' ? 0 : 2;
resetParams.resetType = formData.timestamp === 'newest' ? 0 : formData.timestamp === 'oldest' ? 1 : 2;
if (resetParams.resetType === 2) {
resetParams.timestamp = formData.timestamp;
}

9
km-console/packages/layout-clusters-fe/src/pages/Consumers/ResetOffsetDrawer.tsx
View File

@@ -22,18 +22,19 @@ const CustomSelectResetTime = (props: { value?: string; onChange?: (val: number
}}
onChange={(e) => {
setTimeSetMode(e.target.value);
if (e.target.value === 'newest') {
onChange('newest');
if (e.target.value === 'newest' || e.target.value === 'oldest') {
onChange(e.target.value);
}
}}
value={timeSetMode}
>
<Radio value={'newest'}>最新Offset</Radio>
<Radio value={'oldest'}>最旧Offset</Radio>
<Radio value={'custom'}>自定义</Radio>
</Radio.Group>
{timeSetMode === 'custom' && (
<DatePicker
value={moment(value === 'newest' ? Date.now() : value)}
value={moment(value === 'newest' || value === 'oldest' ? Date.now() : value)}
style={{ width: '100%' }}
showTime={true}
onChange={(v) => {
@@ -91,7 +92,7 @@ export default (props: any) => {
topicName: record.topicName,
};
if (formData.resetType === 'assignedTime') {
resetParams.resetType = formData.timestamp === 'newest' ? 0 : 2;
resetParams.resetType = formData.timestamp === 'newest' ? 0 : formData.timestamp === 'oldest' ? 1 : 2;
if (resetParams.resetType === 2) {
resetParams.timestamp = formData.timestamp;
}

19
km-console/packages/layout-clusters-fe/src/pages/SecurityACLs/EditDrawer.tsx
View File

@@ -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`}
/>
</Form.Item>

9
km-console/packages/layout-clusters-fe/src/pages/TopicDetail/ResetOffsetDrawer.tsx
View File

@@ -19,18 +19,19 @@ const CustomSelectResetTime = (props: { value?: string; onChange?: (val: Number
}}
onChange={(e) => {
setTimeSetMode(e.target.value);
if (e.target.value === 'newest') {
onChange('newest');
if (e.target.value === 'newest' || e.target.value === 'oldest') {
onChange(e.target.value);
}
}}
value={timeSetMode}
>
<Radio value={'newest'}>最新Offset</Radio>
<Radio value={'oldest'}>最旧Offset</Radio>
<Radio value={'custom'}>自定义</Radio>
</Radio.Group>
{timeSetMode === 'custom' && (
<DatePicker
value={moment(value === 'newest' ? Date.now() : value)}
value={moment(value === 'newest' || value === 'oldest' ? Date.now() : value)}
style={{ width: '100%' }}
showTime={true}
onChange={(v) => {
@@ -88,7 +89,7 @@ export default (props: any) => {
topicName: record.topicName,
};
if (formData.resetType === 'assignedTime') {
resetParams.resetType = formData.timestamp === 'newest' ? 0 : 2;
resetParams.resetType = formData.timestamp === 'newest' ? 0 : formData.timestamp === 'oldest' ? 1 : 2;
if (resetParams.resetType === 2) {
resetParams.timestamp = formData.timestamp;
}