Merge pull request #1583 from danieldkim42/dk.1581

feat: refactor ValidationTextField to accept required property
hackforla · Feb 12, 2024 · 5e2edee · 5e2edee
2 parents 6f58556 + a6325d3
commit 5e2edee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/client/src/components/data.js b/client/src/components/data.js
@@ -61,7 +61,8 @@ export const simpleInputs = [
  name: 'hflaWebsiteUrl',
  type: 'text',
  placeholder: 'htttps://hackforla.org/projects/',
- disabled: false
+ disabled: false,
+ required: false
  },
 ];
 

diff --git a/client/src/components/parts/form/ValidatedTextField.js b/client/src/components/parts/form/ValidatedTextField.js
@@ -24,9 +24,7 @@ function ValidatedTextField({
  locationRadios,
  input,
 }) {
- const registerObj = {
- ...register(input.name, {
- required: `${input.name} is required`,
+ const inputObj = {
  pattern:
  input.name === 'location'
  ? locationType === 'remote'
@@ -39,8 +37,15 @@ function ValidatedTextField({
  message: input.addressError,
  }
  : { value: input.value, message: input.errorMessage },
- }
- )}
+ };
+ if ('required' in input && input.required === false) {
+ // if required is set to false, don't add required attribute to object
+ } else {
+ inputObj.required = `${input.name} is required`;
+ }
+ const registerObj = {
+ ...register(input.name, inputObj),
+ }
 
  return (
  <Box sx={{ mb: 1 }} key={input.name}>