Skip to content

Commit

Permalink
Align validation messages with recommendations (#896)
Browse files Browse the repository at this point in the history
* Remove pleases

* Add changeset
  • Loading branch information
tadhglewis authored Mar 3, 2023
1 parent 3f8185c commit 4757b44
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 11 deletions.
5 changes: 5 additions & 0 deletions .changeset/tame-cycles-leave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'wingman-fe': patch
---

Align validation messaging with recommendations
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default {
braidThemeName: defaultArgTypes.braidThemeName,
message: {
control: { type: 'radio' },
mapping: { undefined, requiredValidation: 'Please select a category.' },
mapping: { undefined, requiredValidation: 'Select a category' },
options: ['undefined', 'requiredValidation'],
},
showStorybookAction: defaultArgTypes.showStorybookAction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default {
braidThemeName: defaultArgTypes.braidThemeName,
message: {
control: { type: 'radio' },
mapping: { undefined, requiredValidation: 'Please select a category.' },
mapping: { undefined, requiredValidation: 'Select a category' },
options: ['undefined', 'requiredValidation'],
},
showStorybookAction: defaultArgTypes.showStorybookAction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default {
braidThemeName: defaultArgTypes.braidThemeName,
message: {
control: { type: 'radio' },
mapping: { undefined, requiredValidation: 'Please select a location.' },
mapping: { undefined, requiredValidation: 'Select a location' },
options: ['undefined', 'requiredValidation'],
},
showStorybookAction: defaultArgTypes.showStorybookAction,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ const resolver = createResolver<FormValues>((values, errors) => {
if (!values.description.trim()) {
errors.description = {
type: 'required',
message: 'Please enter a description.',
message: 'Enter a description',
};
}

if (!isWebUrl(values.url)) {
errors.url = {
type: 'validate',
message: 'Please enter a valid HTTP(S) URL.',
message: 'Enter a valid HTTP(S) URL',
};
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,30 @@ const resolver = createResolver<FormValues>((values, errors) => {
if (!values.questionType) {
errors.questionType = {
type: 'required',
message: 'Please select a question type.',
message: 'Select a question type',
};
} else if (
values.questionType === 'FreeText' &&
values.responseChoice?.length
) {
errors.questionType = {
type: 'validate',
message: 'Please omit any response options.',
message: 'Omit any response options',
};
} else if (
values.questionType !== 'FreeText' &&
(!values.responseChoice || values.responseChoice.length < 2)
) {
errors.questionType = {
type: 'validate',
message: 'Please provide at least two response options.',
message: 'Provide at least two response options',
};
}

if (!values.questionHtml) {
errors.questionHtml = {
type: 'required',
message: 'Please enter a question.',
message: 'Enter a question',
};
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ export default ({ options, setOptionList }: SelectOptionsProps) => {
if (!values.option) {
errors.option = {
type: 'required',
message: 'Please enter an option.',
message: 'Enter an option',
};
} else if (options.some((option) => option.value === values.option)) {
errors.option = {
type: 'validate',
message: 'This option already exists.',
message: 'This option already exists',
};
}
}),
Expand Down

0 comments on commit 4757b44

Please sign in to comment.