refactor(component): Pass in the entire field meta and have the compo…

…nent figure out the values ref: #26 #27 nofusscomputing/centurion_erp#248 nofusscomputing/centurion_erp#388
nofusscomputing · Nov 11, 2024 · 619ceda · 619ceda
1 parent 2684ad7
commit 619ceda
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/components/form/Select.jsx b/src/components/form/Select.jsx
@@ -1,10 +1,6 @@
 
 const Select = ({
     id,
-    choices = [],
-    label,
-    helptext=null,
-    required=false,
     error_text=null,
     value = '',
     onChange = null,
@@ -22,16 +18,16 @@ const Select = ({
 
     return (
         <fieldset>
-            <label className="name" for={id}>{label}</label>
+            <label className="name" for={id}>{field_data.label}</label>
             <select
                 id={id}
-                required={required}
+                required={field_data.required}
                 className="common-field"
                 onChange={onChange}
                 multiple = {field_data.relationship_type == 'ManyToMany' ? true : false}
             >
                 <option value="">Please select an option</option>
-                {choices.map((choice) => {
+                {field_data.choices.map((choice) => {
 
                     let selected = false
 
@@ -54,7 +50,7 @@ const Select = ({
 
                 })}
             </select>
-            <span className="help-text">{helptext}</span>
+            <span className="help-text">{field_data.help_text}</span>
             <span className="error-text">{error_text}</span>
         </fieldset>
     );

diff --git a/src/layout/ModelForm.jsx b/src/layout/ModelForm.jsx
@@ -189,12 +189,8 @@ const ModelForm = ({
                                 case 'Relationship':
 
                                     return (<Select
-                                        choices={metadata.fields[field_key].choices}
                                         id = {field_key}
-                                        label = {metadata.fields[field_key].label}
-                                        helptext   = {metadata.fields[field_key].help_text}
                                         error_text = {form_error && form_error[field_key]}
-                                        required   = {metadata.fields[field_key].required}
                                         value={value}
                                         onChange={handleChange}
                                         field_data={metadata.fields[field_key]}