[Upd #101] Refactor for readability

kbss-cvut · Mar 23, 2024 · faefe19 · faefe19
1 parent 0a83c8f
commit faefe19
Showing 1 changed file with 20 additions and 34 deletions.
diff --git a/src/components/record/Record.jsx b/src/components/record/Record.jsx
@@ -61,51 +61,37 @@ class Record extends React.Component {
     this.setState({ form });
   };
 
+  _filterQuestionsBySeverity = (severity) => {
+    return filterObjectsByKeyValuePair(this.getFormQuestionsData(), SConstants.HAS_VALIDATION_SEVERITY, severity);
+  };
+
   _handleOnSave = () => {
     const { form } = this.state;
     if (form) {
       this.validateForm();
-      this.setState(
-        {
-          invalidQuestions: filterObjectsByKeyValuePair(
-            this.getFormQuestionsData(),
-            SConstants.HAS_VALIDATION_SEVERITY,
-            "error",
-          ),
-        },
-        () => {
-          const { invalidQuestions } = this.state;
-          if (invalidQuestions.length > 0) {
-            this.setState({ showModal: true });
-          } else {
-            this.props.handlers.onSave();
-          }
-        },
-      );
+      const invalidQuestions = this._filterQuestionsBySeverity("error");
+      this.setState({ invalidQuestions }, () => {
+        if (invalidQuestions.length > 0) {
+          this.setState({ showModal: true });
+        } else {
+          this.props.handlers.onSave();
+        }
+      });
     }
   };
 
   _handleOnComplete = () => {
     const { form } = this.state;
     if (form) {
       this.validateForm();
-      this.setState(
-        {
-          incompleteQuestions: filterObjectsByKeyValuePair(
-            this.getFormQuestionsData(),
-            SConstants.HAS_VALIDATION_SEVERITY,
-            "warning",
-          ),
-        },
-        () => {
-          const { incompleteQuestions } = this.state;
-          if (incompleteQuestions.length > 0) {
-            this.setState({ showModal: true });
-          } else {
-            this.props.handlers.onComplete();
-          }
-        },
-      );
+      const incompleteQuestions = this._filterQuestionsBySeverity("warning");
+      this.setState({ incompleteQuestions }, () => {
+        if (incompleteQuestions.length > 0) {
+          this.setState({ showModal: true });
+        } else {
+          this.props.handlers.onComplete();
+        }
+      });
     }
   };