refactor(component): Pass field object directly to textarea

pasing the whole object as the component is to do ALL logic for the field ref: #26 #27 nofusscomputing/centurion_erp#248 nofusscomputing/centurion_erp#388
nofusscomputing · Nov 13, 2024 · 6a49468 · 6a49468
1 parent a8b86c6
commit 6a49468
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 14 deletions.
diff --git a/src/components/form/Textarea.jsx b/src/components/form/Textarea.jsx
@@ -1,26 +1,64 @@
 const TextArea = ({
     id,
-    label,
-    helptext=null,
-    required=false,
     error_text=null,
     value= '',
     onChange = null,
-    class_name = null
+    class_name = null,
+    field_data = null
 }) => {
 
     if( value === null ) {
         value = ''
     }
 
+    let field_class_name = "common-field"
+    let helptext = null
+    let required = false
+    let label = ''
+
+    if( field_data ) {
+
+        field_data = Object(field_data)
+
+
+
+        if( 'help_text' in field_data) {
+
+            helptext = field_data['help_text']
+
+        }
+
+        if( 'label' in field_data ) {
+
+            label = field_data['label']
+
+        }
+
+        if( 'required' in field_data) {
+
+            required = field_data['required']
+
+        }
+
+        if( 'style' in field_data ) {
+
+            if( 'class' in field_data.style ) {
+
+                field_class_name += String( ' ' + field_data['style']['class'])
+
+            }
+        }
+    }
+
+
     return (
         <fieldset className={class_name}>
             <label className="name" for={id}>{label}</label>
             <span className="help-text">{helptext}</span>
             <textarea
                 id={id}
                 required={required}
-                className="common-field"
+                className={field_class_name}
                 onChange={onChange}
                 onKeyUp={(e) =>{
 

diff --git a/src/layout/ModelForm.jsx b/src/layout/ModelForm.jsx
@@ -255,10 +255,8 @@ const ModelForm = ({
 
                                     return (<TextArea
                                         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}
+                                        field_data={metadata.fields[field_key]}
                                         value={value}
                                         onChange={handleChange}
                                     />)
@@ -267,10 +265,8 @@ const ModelForm = ({
 
                                     return (<TextArea
                                         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}
+                                        field_data={metadata.fields[field_key]}
                                         value={value}
                                         onChange={handleChange}
                                     />)
@@ -282,10 +278,8 @@ const ModelForm = ({
 
                                         return (<TextArea
                                             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}
+                                            field_data={metadata.fields[field_key]}
                                             value={value}
                                             onChange={handleChange}
                                         />)