dvkei/Pterodactyl-Panel
1
0
Fork 0
forked from Alex/Pterodactyl-Panel
Code Issues Pull Requests Projects Releases Wiki Activity

ui(admin): fix validation rules on UserForm

Browse Source
This commit is contained in:
Matthew Penner 2021-09-12 17:24:31 -06:00
parent 38ff35873e
commit c7ab6b9e6c
No known key found for this signature in database
GPG Key ID: 030E4AB751DC756F
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/scripts/api/admin/users/updateUser.ts
View File

@ -12,6 +12,10 @@ export interface Values {
export default (id: number, values: Partial<Values>, include: string[] = []): Promise<User> => {
const data = {};
Object.keys(values).forEach(k => {
// Don't set password if it is empty.
if (k === 'password' && values[k] === '') {
return;
}
// @ts-ignore
data[k.replace(/[A-Z]/g, l => `_${l.toLowerCase()}`)] = values[k];
});

1
resources/scripts/components/admin/users/UserAboutContainer.tsx
View File

@ -47,7 +47,6 @@ const UserAboutContainer = () => {
}}
onSubmit={submit}
role={user?.relationships.role || null}
exists
>
<div css={tw`flex`}>
<UserDeleteButton

4
resources/scripts/components/admin/users/UserForm.tsx
View File

@ -32,12 +32,11 @@ export interface Params {
children?: React.ReactNode;
onSubmit: (values: Values, helpers: FormikHelpers<Values>) => void;
exists?: boolean;
role: Role | null;
}
export default function UserForm ({ title, initialValues, children, onSubmit, exists, role }: Params) {
export default function UserForm ({ title, initialValues, children, onSubmit, role }: Params) {
const submit = (values: Values, helpers: FormikHelpers<Values>) => {
onSubmit(values, helpers);
};
@ -59,7 +58,6 @@ export default function UserForm ({ title, initialValues, children, onSubmit, ex
validationSchema={object().shape({
username: string().min(1).max(32),
email: string(),
password: exists ? string() : string().required(),
rootAdmin: bool().required(),
})}
>