Making "setFieldValue" in "componentDidUpdate" of forms more typed

BenjaVR · Feb 3, 2019 · 8c37e12 · 8c37e12 · BenjaVR · Feb 3, 2019
1 parent e162342
commit 8c37e12
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/web/src/components/departments/DepartmentsFormModal.tsx b/web/src/components/departments/DepartmentsFormModal.tsx
@@ -68,7 +68,6 @@ class DepartmentFormModal extends React.Component<DepartmentFormModalProps, IDep
                 initialValue: departmentToEdit.name,
             });
             capacityFieldIds.forEach((capacityFieldId) => {
-                // TODO: extract this string interpolation thing to a central place (it's being used multiple times)
                 this.props.form.getFieldDecorator(`${this.capacityPerEducationFieldName}[${capacityFieldId}].${this.educationIdFieldName}`, {
                     initialValue: departmentToEdit.capacityPerEducation[capacityFieldId].educationId,
                 });

diff --git a/web/src/components/educations/EducationsFormModal.tsx b/web/src/components/educations/EducationsFormModal.tsx
@@ -41,9 +41,11 @@ class EducationFormModal extends React.Component<EducationFormModalProps, IEduca
         if (this.props.educationToEdit !== undefined
             && this.props.isVisible === true
             && prevProps.isVisible === false) {
-            this.props.form.setFieldsValue({
+
+            const educationFields: Partial<Education> = {
                 name: this.props.educationToEdit.name,
-            });
+            };
+            this.props.form.setFieldsValue(educationFields);
         }
     }
 

diff --git a/web/src/components/planning/PlanningsFormModal.tsx b/web/src/components/planning/PlanningsFormModal.tsx
@@ -49,14 +49,15 @@ class PlanningsFormModal extends React.Component<PlanningsFormModalProps, IPlann
             && prevProps.isVisible === false
             && this.props.studentToPlan !== undefined
             && this.props.internshipToEdit !== undefined) {
+
             const internship = this.props.internshipToEdit;
-            const fields: Partial<Internship> = {
+            const internshipFields: Partial<Internship> = {
                 hours: internship.hours,
                 startDate: internship.startDate,
                 endDate: internship.endDate,
                 departmentId: internship.departmentId,
             };
-            this.props.form.setFieldsValue(fields);
+            this.props.form.setFieldsValue(internshipFields);
         }
     }
 

diff --git a/web/src/components/schools/SchoolsFormModal.tsx b/web/src/components/schools/SchoolsFormModal.tsx
@@ -41,9 +41,11 @@ class SchoolsFormModal extends React.Component<SchoolFormModalProps, ISchoolsFor
         if (this.props.schoolToEdit !== undefined
             && this.props.isVisible === true
             && prevProps.isVisible === false) {
-            this.props.form.setFieldsValue({
+
+            const schoolFields: Partial<School> = {
                 name: this.props.schoolToEdit.name,
-            });
+            };
+            this.props.form.setFieldsValue(schoolFields);
         }
     }
 

diff --git a/web/src/components/students/StudentsFormModal.tsx b/web/src/components/students/StudentsFormModal.tsx
@@ -64,13 +64,15 @@ class StudentsFormModal extends React.Component<StudentFormModalProps, IStudents
                     : undefined;
             }
 
-            this.props.form.setFieldsValue({ // TODO: fill these keys dynamically
+            const studentFields: Partial<Student> = {
                 firstName: this.props.studentToEdit.firstName,
                 lastName: this.props.studentToEdit.lastName,
                 isConfirmed: this.props.studentToEdit.isConfirmed,
                 schoolId,
                 educationId,
-            });
+            };
+
+            this.props.form.setFieldsValue(studentFields);
         }
     }