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

[LANDGRIF-1532] scenario creation: display errors below inputs #1175

Merged
merged 1 commit into from
Jun 10, 2024
Merged

[LANDGRIF-1532] scenario creation: display errors below inputs #1175

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
12 changes: 11 additions & 1 deletion client/cypress/e2e/scenario-creation.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,19 @@ describe('Scenario creation', () => {
cy.get('[data-testid="create-scenario-button"]').should('be.disabled');
});

it('a user types an invalid name and submit is disabled', () => {
it('a user types a name with a single character', () => {
cy.url().should('contain', '/data/scenarios/new');
cy.get('[data-testid="scenario-name-input"]').type('?');
cy.get('[data-testid="create-scenario-button"]').should('be.disabled');
cy.contains('Name must be at least 2 characters.').should('exist');
});

it('a user types a name with more than 40 characters', () => {
cy.url().should('contain', '/data/scenarios/new');
cy.get('[data-testid="scenario-name-input"]').type(
'this is a very looong name for an scenario',
);
cy.get('[data-testid="create-scenario-button"]').should('be.disabled');
cy.contains('Name must be at most 40 characters.').should('exist');
});
});
26 changes: 15 additions & 11 deletions client/src/containers/scenarios/form/component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useForm, Controller } from 'react-hook-form';
import { yupResolver } from '@hookform/resolvers/yup';
import * as yup from 'yup';
import { zodResolver } from '@hookform/resolvers/zod';
import * as z from 'zod';

import Input from 'components/forms/input';
import Textarea from 'components/forms/textarea';
Expand All @@ -17,14 +17,17 @@ type ScenarioFormProps = {
onSubmit?: (scenario: ScenarioFormData) => void;
};

const schemaValidation = yup.object({
title: yup.string().min(2).max(40).required(),
isPublic: yup.boolean(),
description: yup.string().optional().nullable(),
const schemaValidation = z.object({
title: z
.string()
.min(2, {
message: 'Name must be at least 2 characters.',
})
.max(40, { message: 'Name must be at most 40 characters.' }),
isPublic: z.boolean(),
description: z.string().optional().nullable(),
});

type SubSchema = yup.InferType<typeof schemaValidation>;

const ScenarioForm: React.FC<React.PropsWithChildren<ScenarioFormProps>> = ({
children,
scenario,
Expand All @@ -36,13 +39,14 @@ const ScenarioForm: React.FC<React.PropsWithChildren<ScenarioFormProps>> = ({
control,
handleSubmit,
formState: { errors, isValid },
} = useForm<SubSchema>({
resolver: yupResolver(schemaValidation),
} = useForm<z.infer<typeof schemaValidation>>({
resolver: zodResolver(schemaValidation),
defaultValues: {
title: scenario?.title || null,
isPublic: scenario?.isPublic || false,
description: scenario?.description || null,
},
mode: 'onChange',
criteriaMode: 'all',
});

Expand Down Expand Up @@ -79,7 +83,7 @@ const ScenarioForm: React.FC<React.PropsWithChildren<ScenarioFormProps>> = ({
</div>
<div className="flex flex-col">
<label>Access</label>
<div className="flex h-full items-center space-x-1">
<div className="mt-[11px] flex items-center space-x-1">
<Controller
name="isPublic"
control={control}
Expand Down
Loading