修复一些前端问题 (#1195)

请不要在没有先创建Issue的情况下创建Pull Request。

## 变更的目的是什么

XXXXX

## 简短的更新日志

[[Optimize]Security、Consumer权限点更新
[BugFix]JMX端口维护信息错误

## 验证这一变化

XXXX

请遵循此清单,以帮助我们快速轻松地整合您的贡献:

* [ ] 一个 PR(Pull Request的简写)只解决一个问题,禁止一个 PR 解决多个问题;
* [ ] 确保 PR 有对应的 Issue(通常在您开始处理之前创建),除非是书写错误之类的琐碎更改不需要 Issue ;
* [ ] 格式化 PR 及 Commit-Log 的标题及内容,例如 #861 。PS:Commit-Log 需要在 Git Commit
代码时进行填写,在 GitHub 上修改不了;
* [ ] 编写足够详细的 PR 描述,以了解 PR 的作用、方式和原因;
* [ ] 编写必要的单元测试来验证您的逻辑更正。如果提交了新功能或重大更改,请记住在 test 模块中添加 integration-test;
* [ ] 确保编译通过,集成测试通过;
This commit is contained in:
erge
2023-11-27 20:26:42 +08:00
committed by GitHub
4 changed files with 77 additions and 45 deletions

View File

@@ -33,6 +33,9 @@ export enum ClustersPermissionMap {
TOPIC_CANCEL_REPLICATOR = 'Topic-详情-取消Topic复制', TOPIC_CANCEL_REPLICATOR = 'Topic-详情-取消Topic复制',
// Consumers // Consumers
CONSUMERS_RESET_OFFSET = 'Consumers-重置Offset', CONSUMERS_RESET_OFFSET = 'Consumers-重置Offset',
GROUP_DELETE = 'Group-删除',
GROUP_TOPIC_DELETE = 'GroupOffset-Topic纬度删除',
GROUP_PARTITION_DELETE = 'GroupOffset-Partition纬度删除',
// Test // Test
TEST_CONSUMER = 'Test-Consumer', TEST_CONSUMER = 'Test-Consumer',
TEST_PRODUCER = 'Test-Producer', TEST_PRODUCER = 'Test-Producer',
@@ -54,6 +57,7 @@ export enum ClustersPermissionMap {
SECURITY_USER_ADD = 'Security-User新增', SECURITY_USER_ADD = 'Security-User新增',
SECURITY_USER_DELETE = 'Security-User删除', SECURITY_USER_DELETE = 'Security-User删除',
SECURITY_USER_EDIT_PASSWORD = 'Security-User修改密码', SECURITY_USER_EDIT_PASSWORD = 'Security-User修改密码',
SECURITY_USER_VIEW_PASSWORD = 'Security-User查看密码',
} }
export interface PermissionNode { export interface PermissionNode {

View File

@@ -22,7 +22,8 @@ export const defaultPagination = {
}; };
export const getGroupColumns = (arg?: any) => { export const getGroupColumns = (arg?: any) => {
const columns = [ const [global] = AppContainer.useGlobalValue();
const columns: any = [
{ {
title: 'ConsumerGroup', title: 'ConsumerGroup',
dataIndex: 'name', dataIndex: 'name',
@@ -63,7 +64,9 @@ export const getGroupColumns = (arg?: any) => {
width: 200, width: 200,
render: (t: number) => (t ? t.toLocaleString() : '-'), render: (t: number) => (t ? t.toLocaleString() : '-'),
}, },
{ ];
if (global.hasPermission && global.hasPermission(ClustersPermissionMap.GROUP_DELETE)) {
columns.push({
title: '操作', title: '操作',
dataIndex: 'options', dataIndex: 'options',
key: 'options', key: 'options',
@@ -77,8 +80,8 @@ export const getGroupColumns = (arg?: any) => {
</div> </div>
); );
}, },
}, });
]; }
return columns; return columns;
}; };
@@ -114,7 +117,7 @@ export const getGtoupTopicColumns = (arg?: any) => {
render: (t: number) => (t ? t.toLocaleString() : '-'), render: (t: number) => (t ? t.toLocaleString() : '-'),
}, },
]; ];
if (global.hasPermission && global.hasPermission(ClustersPermissionMap.CONSUMERS_RESET_OFFSET)) { if (global.hasPermission) {
columns.push({ columns.push({
title: '操作', title: '操作',
dataIndex: 'desc', dataIndex: 'desc',
@@ -123,7 +126,12 @@ export const getGtoupTopicColumns = (arg?: any) => {
render: (value: any, record: any) => { render: (value: any, record: any) => {
return ( return (
<div> <div>
{global.hasPermission(ClustersPermissionMap.CONSUMERS_RESET_OFFSET) ? (
<a onClick={() => arg.resetOffset(record)}>Offset</a> <a onClick={() => arg.resetOffset(record)}>Offset</a>
) : (
<></>
)}
{global.hasPermission(ClustersPermissionMap.GROUP_TOPIC_DELETE) ? (
<Popconfirm <Popconfirm
placement="top" placement="top"
title={`是否要删除当前Topic`} title={`是否要删除当前Topic`}
@@ -133,6 +141,9 @@ export const getGtoupTopicColumns = (arg?: any) => {
> >
<Button type="link"></Button> <Button type="link"></Button>
</Popconfirm> </Popconfirm>
) : (
<></>
)}
</div> </div>
); );
}, },

View File

@@ -537,7 +537,7 @@ const ConnectorForm = (props: {
setSelectedTabKey(undefined); setSelectedTabKey(undefined);
try { try {
const jmxPortInfo = JSON.parse(initFieldsValue.jmxProperties) || {}; const jmxPortInfo = JSON.parse(initFieldsValue.jmxProperties) || {};
form.setFieldsValue({ ...initFieldsValue, jmxProperties: jmxPortInfo.jmxProperties }); form.setFieldsValue({ ...initFieldsValue, jmxProperties: jmxPortInfo.jmxPort });
} catch { } catch {
form.setFieldsValue({ ...initFieldsValue }); form.setFieldsValue({ ...initFieldsValue });
} }
@@ -546,7 +546,7 @@ const ConnectorForm = (props: {
useLayoutEffect(() => { useLayoutEffect(() => {
try { try {
const jmxPortInfo = JSON.parse(initFieldsValue.jmxProperties) || {}; const jmxPortInfo = JSON.parse(initFieldsValue.jmxProperties) || {};
form.setFieldsValue({ ...initFieldsValue, jmxProperties: jmxPortInfo.jmxProperties }); form.setFieldsValue({ ...initFieldsValue, jmxProperties: jmxPortInfo.jmxPort });
} catch { } catch {
form.setFieldsValue({ ...initFieldsValue }); form.setFieldsValue({ ...initFieldsValue });
} }

View File

@@ -23,7 +23,7 @@ import api from '@src/api';
import { useParams } from 'react-router-dom'; import { useParams } from 'react-router-dom';
import { regKafkaPassword } from '@src/constants/reg'; import { regKafkaPassword } from '@src/constants/reg';
import { tableHeaderPrefix } from '@src/constants/common'; import { tableHeaderPrefix } from '@src/constants/common';
import { ClustersPermissionMap } from '../CommonConfig';
export const randomString = (len = 32, chars = 'abcdefghijklmnopqrstuvwxyz1234567890'): string => { export const randomString = (len = 32, chars = 'abcdefghijklmnopqrstuvwxyz1234567890'): string => {
const maxPos = chars.length; const maxPos = chars.length;
let str = ''; let str = '';
@@ -85,7 +85,7 @@ const PasswordContent = (props: { clusterId: string; name: string }) => {
const { clusterId, name } = props; const { clusterId, name } = props;
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [pw, setPw] = useState(initialShowPassword); const [pw, setPw] = useState(initialShowPassword);
const [global] = AppContainer.useGlobalValue();
const switchPwStatus = () => { const switchPwStatus = () => {
if (!loading) { if (!loading) {
setLoading(true); setLoading(true);
@@ -113,9 +113,13 @@ const PasswordContent = (props: { clusterId: string; name: string }) => {
<Tooltip title={pw} placement="bottom"> <Tooltip title={pw} placement="bottom">
<div style={{ maxWidth: '80%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{pw}</div> <div style={{ maxWidth: '80%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{pw}</div>
</Tooltip> </Tooltip>
{global.hasPermission(ClustersPermissionMap.SECURITY_USER_VIEW_PASSWORD) ? (
<span style={{ marginLeft: 6 }} onClick={switchPwStatus}> <span style={{ marginLeft: 6 }} onClick={switchPwStatus}>
{loading ? <LoadingOutlined /> : pw === initialShowPassword ? <EyeInvisibleOutlined /> : <EyeOutlined />} {loading ? <LoadingOutlined /> : pw === initialShowPassword ? <EyeInvisibleOutlined /> : <EyeOutlined />}
</span> </span>
) : (
<></>
)}
</div> </div>
); );
}; };
@@ -323,7 +327,7 @@ const SecurityUsers = (): JSX.Element => {
}; };
const columns = () => { const columns = () => {
const baseColumns = [ const baseColumns: any = [
{ {
title: 'KafkaUser', title: 'KafkaUser',
dataIndex: 'name', dataIndex: 'name',
@@ -348,13 +352,16 @@ const SecurityUsers = (): JSX.Element => {
return <PasswordContent clusterId={clusterId} name={record.name} />; return <PasswordContent clusterId={clusterId} name={record.name} />;
}, },
}, },
{ ];
if (global.hasPermission) {
baseColumns.push({
title: '操作', title: '操作',
dataIndex: '', dataIndex: '',
width: 240, width: 240,
render(record: UsersProps) { render(record: UsersProps) {
return ( return (
<> <>
{global.hasPermission(ClustersPermissionMap.SECURITY_USER_EDIT_PASSWORD) ? (
<Button <Button
type="link" type="link"
size="small" size="small"
@@ -363,15 +370,21 @@ const SecurityUsers = (): JSX.Element => {
> >
</Button> </Button>
) : (
<></>
)}
{global.hasPermission(ClustersPermissionMap.SECURITY_USER_DELETE) ? (
<Button type="link" size="small" onClick={() => onDelete(record)}> <Button type="link" size="small" onClick={() => onDelete(record)}>
</Button> </Button>
) : (
<></>
)}
</> </>
); );
}, },
}, });
]; }
return baseColumns; return baseColumns;
}; };
@@ -454,6 +467,7 @@ const SecurityUsers = (): JSX.Element => {
setSearchKeywordsInput(e.target.value); setSearchKeywordsInput(e.target.value);
}} }}
/> />
{global.hasPermission && global.hasPermission(ClustersPermissionMap.SECURITY_USER_ADD) ? (
<Button <Button
type="primary" type="primary"
// icon={<PlusOutlined />} // icon={<PlusOutlined />}
@@ -461,6 +475,9 @@ const SecurityUsers = (): JSX.Element => {
> >
KafkaUser KafkaUser
</Button> </Button>
) : (
<></>
)}
</div> </div>
</div> </div>