Skip to content
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

Jump to bottom

fix(NET-348): disable buggy user mgmt settings #108

Merged
merged 1 commit into from
Jun 19, 2023
Merged

fix(NET-348): disable buggy user mgmt settings #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 4 additions & 62 deletions src/components/modals/add-user-modal/AddUserModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Button, Col, Divider, Form, Input, Modal, notification, Row, Select, Switch } from 'antd';
import { MouseEvent, useCallback, useEffect, useMemo, useState } from 'react';
import { Button, Col, Divider, Form, Input, Modal, notification, Row, Switch } from 'antd';
import { MouseEvent, useCallback, useEffect, useState } from 'react';
import { useStore } from '@/store/store';
import '../CustomModal.scss';
import { extractErrorMsg } from '@/utils/ServiceUtils';
Expand All @@ -24,12 +24,6 @@ export default function AddUserModal({ isOpen, onCreateUser, onCancel }: AddUser
const isAdminVal = Form.useWatch('isadmin', form);
const passwordVal = Form.useWatch('password', form);

const userGroups = useMemo(() => {
const groups = new Set<string>();
users.forEach((u) => u.groups?.forEach((g) => groups.add(g)));
return Array.from(groups);
}, [users]);

const resetModal = () => {
form.resetFields();
};
Expand Down Expand Up @@ -88,7 +82,7 @@ export default function AddUserModal({ isOpen, onCreateUser, onCancel }: AddUser
>
<Divider style={{ margin: '0px 0px 2rem 0px' }} />
<div className="CustomModalBody">
<Form name="add-user-form" form={form} layout="vertical" initialValues={{ groups: ['*'] }}>
<Form name="add-user-form" form={form} layout="vertical" initialValues={{ groups: ['*'], isadmin: true }}>
<Form.Item label="Username" name="username" rules={[{ required: true }]}>
<Input placeholder="Username" />
</Form.Item>
Expand Down Expand Up @@ -119,6 +113,7 @@ export default function AddUserModal({ isOpen, onCreateUser, onCancel }: AddUser

<Form.Item label="Is admin" name="isadmin" valuePropName="checked">
<Switch
disabled
onChange={(newVal) => {
if (newVal) {
form.setFieldValue('networks', []);
Expand All @@ -127,59 +122,6 @@ export default function AddUserModal({ isOpen, onCreateUser, onCancel }: AddUser
/>
</Form.Item>

{isServerEE && (
<Form.Item label="User groups">
<Row>
<Col xs={18}>
<Form.Item name="groups" noStyle>
<Select
mode="multiple"
placeholder="Groups"
options={userGroups.map((g) => ({ label: g, value: g }))}
/>
</Form.Item>
</Col>
<Col xs={6} style={{ textAlign: 'right' }}>
<Button
onClick={() => {
form.setFieldValue('groups', userGroups);
}}
>
Select All
</Button>
</Col>
</Row>
</Form.Item>
)}

<Form.Item label="Allowed Networks">
<Row>
<Col xs={18}>
<Form.Item name="networks" noStyle>
<Select
disabled={isAdminVal}
mode="multiple"
placeholder="Networks"
options={store.networks.map((n) => ({ label: n.netid, value: n.netid }))}
/>
</Form.Item>
</Col>
<Col xs={6} style={{ textAlign: 'right' }}>
<Button
disabled={isAdminVal}
onClick={() => {
form.setFieldValue(
'networks',
store.networks.map((n) => n.netid)
);
}}
>
Select All
</Button>
</Col>
</Row>
</Form.Item>

<Row>
<Col xs={24} style={{ textAlign: 'right' }}>
<Form.Item>
Expand Down
Loading