(refactor) Refactor conditions form validation logic #1881
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Size Change: -77 B (0%) Total Size: 11.1 MB ℹ️ View Unchanged
|
denniskigen
force-pushed
the
refactor/conditions-form-custom-validation-logic
branch
4 times, most recently
from
35611f6 to
5effb23
Compare
denniskigen
force-pushed
the
refactor/conditions-form-custom-validation-logic
branch
from
5effb23 to
8beaa11
Compare
denniskigen
force-pushed
the
refactor/conditions-form-custom-validation-logic
branch
from
8beaa11 to
cc527f7
Compare
denniskigen
commented
Jul 1, 2024
Comment on lines
+19
to
+36
| const createSchema = (formContext: 'creating' | 'editing', t: TFunction) => { | ||
| const isCreating = formContext === 'creating'; | ||
|
|
||
| export type ConditionSchema = z.infer<typeof schema>; | ||
| const clinicalStatusValidation = z.string().refine((clinicalStatus) => !isCreating || !!clinicalStatus, { | ||
| message: t('clinicalStatusRequired', 'A clinical status is required'), | ||
| }); | ||
|
|
||
| const conditionNameValidation = z.string().refine((conditionName) => !isCreating || !!conditionName, { | ||
| message: t('conditionRequired', 'A condition is required'), | ||
| }); | ||
|
|
||
| return z.object({ | ||
| abatementDateTime: z.date().optional().nullable(), | ||
| clinicalStatus: clinicalStatusValidation, | ||
| conditionName: conditionNameValidation, | ||
| onsetDateTime: z.date().nullable(), | ||
| }); | ||
| }; |
There was a problem hiding this comment.
This is the key change. I've moved the validation logic into the Zod schema declaration. Previously, error handling was handled manually using the setError function. Following this change, errors are handled automatically based on the rules described in the schema.
|
@ibacher looks good? |
ibacher
approved these changes
Jul 1, 2024
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requirements
Summary
This PR refactors the conditions form's validation logic to use the zod schema as the source of truth instead of manual validation logic in the
onSubmithandler.Screenshots
Related Issue
Other