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

2128 ensure Role Info form validates correctly #2133

Merged
merged 2 commits into from
Jul 11, 2024
Merged

2128 ensure Role Info form validates correctly #2133

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd7fa24
ensure roleInfo form validates
Da-Colon Jul 11, 2024
fab4cf3
just meta.error
Da-Colon Jul 11, 2024
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
27 changes: 6 additions & 21 deletions src/components/pages/Roles/forms/RoleFormInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,14 @@ export default function RoleFormInfo() {
>
<FormControl>
<Field name={`roleEditing.name`}>
{({
field,
form: { setFieldValue, setFieldTouched },
meta,
}: FieldProps<string, RoleFormValues>) => (
{({ field, form: { setFieldValue }, meta }: FieldProps<string, RoleFormValues>) => (
<LabelWrapper
label="Role Name"
errorMessage={meta.touched && meta.error ? meta.error : undefined}
errorMessage={meta.error ? meta.error : undefined}
adamgall marked this conversation as resolved.
Show resolved Hide resolved
>
<InputComponent
value={field.value}
onChange={e => {
setFieldTouched(field.name, true);
setFieldValue(field.name, e.target.value);
}}
testId="role-name"
Expand All @@ -51,20 +46,15 @@ export default function RoleFormInfo() {
</FormControl>
<FormControl>
<Field name={`roleEditing.description`}>
{({
field,
form: { setFieldValue, setFieldTouched },
meta,
}: FieldProps<string, RoleFormValues>) => (
{({ field, form: { setFieldValue }, meta }: FieldProps<string, RoleFormValues>) => (
<LabelWrapper
label="Description"
errorMessage={meta.touched && meta.error ? meta.error : undefined}
errorMessage={meta.error ? meta.error : undefined}
>
<TextareaComponent
value={field.value}
onChange={e => {
setFieldValue(field.name, e.target.value);
setFieldTouched(field.name, true);
}}
isRequired
gridContainerProps={{
Expand All @@ -83,20 +73,15 @@ export default function RoleFormInfo() {
</FormControl>
<FormControl>
<Field name={`roleEditing.wearer`}>
{({
field,
form: { setFieldValue, setFieldTouched },
meta,
}: FieldProps<string, RoleFormValues>) => (
{({ field, form: { setFieldValue }, meta }: FieldProps<string, RoleFormValues>) => (
<LabelWrapper
label="Member"
errorMessage={meta.touched && meta.error ? meta.error : undefined}
errorMessage={meta.error ? meta.error : undefined}
>
<AddressInput
value={field.value}
onChange={e => {
setFieldValue(field.name, e.target.value);
setFieldTouched(field.name, true);
}}
/>
</LabelWrapper>
Expand Down
15 changes: 6 additions & 9 deletions src/hooks/schemas/roles/useRolesSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
import { useMemo } from 'react';
import * as Yup from 'yup';
import { RoleValue } from '../../../components/pages/Roles/types';
import { useValidationAddress } from '../common/useValidationAddress';

export const useRolesSchema = () => {
const { addressValidationTest } = useValidationAddress();
const rolesSchema = useMemo(
() =>
Yup.object().when('roleEditing', {
is: (property: RoleValue) => !!property,
then: _schema =>
_schema.shape({
name: Yup.string().required('Role name is required'),
description: Yup.string().required('Role description is required'),
wearer: Yup.string().required('Member is required').test(addressValidationTest),
}),
Yup.object().shape({
roleEditing: Yup.object().shape({
name: Yup.string().required('Role name is required'),
description: Yup.string().required('Role description is required'),
wearer: Yup.string().required('Member is required').test(addressValidationTest),
}),
}),
[addressValidationTest],
);
Expand Down