Move mapping rules to respective component classes

kbss-cvut · May 1, 2021 · b31c840 · b31c840
1 parent 375043b
commit b31c840
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 27 deletions.
diff --git a/src/SmartComponents.js b/src/SmartComponents.js
@@ -34,23 +34,19 @@ export default class SmartComponents {
     return [
       {
         component: AnswerableSectionComposite,
-        mapRule: q => FormUtils.isSection(q) && FormUtils.isAnswerable(q)
+        mapRule: AnswerableSectionComposite.mappingRule
       },
       {
         component: CompositeQuestion,
-        mapRule: q => JsonLdUtils.getJsonAttValue(q, Constants.COMPOSITE_PATTERN)
+        mapRule: CompositeQuestion.mappingRule
       },
       {
         component: QuestionWithAdvanced,
-        mapRule: q => {
-          return SmartComponents._hasAdvancedQuestion(q) && !FormUtils.isWizardStep(q);
-        }
+        mapRule: QuestionWithAdvanced.mappingRule
       },
       {
         component: WizardStepWithAdvanced,
-        mapRule: q => {
-          return SmartComponents._hasAdvancedQuestion(q) && FormUtils.isWizardStep(q);
-        }
+        mapRule: WizardStepWithAdvanced.mappingRule
       },
       {
         component: NullQuestion,
@@ -74,21 +70,4 @@ export default class SmartComponents {
     ];
   }
 
-  static _hasAdvancedQuestion(q) {
-
-    if (!FormUtils.isSection(q) && !FormUtils.isAnswerable(q)) {
-      return false;
-    }
-    let subQuestions = q[SConstants.HAS_SUBQUESTION];
-    if (subQuestions && subQuestions.length) {
-      for (let subQuestion of subQuestions) {
-        if (JsonLdUtils.hasValue(subQuestion, Constants.SHOW_ADVANCED_QUESTION, true)) {
-          return true;
-        }
-      }
-    }
-    return false;
-
-  };
-
 }
diff --git a/src/Utils.js b/src/Utils.js
@@ -1,4 +1,5 @@
 import {Constants as SConstants} from "s-forms";
+import JsonLdUtils from "jsonld-utils";
 
 export default class Utils {
 
@@ -73,6 +74,20 @@ export default class Utils {
     return false;
   }
 
+  static hasSubQuestionWithValue(parent, property, value) {
+
+    let subQuestions = parent[SConstants.HAS_SUBQUESTION];
+    if (subQuestions && subQuestions.length) {
+      for (let subQuestion of subQuestions) {
+        if (JsonLdUtils.hasValue(subQuestion, property, value)) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+
   // static _findQuestion(question, id) {
   //
   //   if (question['@id'] === id) {

diff --git a/src/components/AnswerableSectionComposite.jsx b/src/components/AnswerableSectionComposite.jsx
@@ -10,14 +10,16 @@ import {QuestionWithAdvanced} from "../lib";
 
 export default class AnswerableSectionComposite extends Question {
 
+  static mappingRule = q => FormUtils.isSection(q) && FormUtils.isAnswerable(q);
+
   constructor(props) {
     super(props);
   }
 
   _renderShowAdvanced() {
     const question = this.props.question;
 
-    if (!SmartComponents._hasAdvancedQuestion(question)) {
+    if (!QuestionWithAdvanced.mappingRule(question)) {
       return null;
     }
 

diff --git a/src/components/CompositeQuestion.jsx b/src/components/CompositeQuestion.jsx
@@ -6,6 +6,8 @@ import Constants from "../Constants";
 
 export default class CompositeQuestion extends Question {
 
+  static mappingRule = q => JsonLdUtils.getJsonAttValue(q, Constants.COMPOSITE_PATTERN);
+
   constructor(props) {
     super(props);
   }

diff --git a/src/components/QuestionWithAdvanced.jsx b/src/components/QuestionWithAdvanced.jsx
@@ -6,9 +6,23 @@ import Constants from "../Constants";
 import classNames from 'classnames';
 import JsonldUtils from 'jsonld-utils';
 import PropTypes from "prop-types";
+import Utils from "../Utils";
 
 export default class QuestionWithAdvanced extends Question {
 
+  static mappingRule = q => {
+
+    if (FormUtils.isWizardStep(q)) {
+      return false;
+    }
+
+    if (!FormUtils.isSection(q) && !FormUtils.isAnswerable(q)) {
+      return false;
+    }
+
+    return Utils.hasSubQuestionWithValue(q, Constants.SHOW_ADVANCED_QUESTION, true);
+  }
+
   static findShowAdvancedQuestion(parent) {
 
     let subQuestions = parent[SConstants.HAS_SUBQUESTION];

diff --git a/src/components/WizardStepWithAdvanced.jsx b/src/components/WizardStepWithAdvanced.jsx
@@ -1,12 +1,23 @@
 import React from 'react';
-import {WizardStep, Question, Constants as SConstants, HelpIcon} from 's-forms';
+import {WizardStep, Question, Constants as SConstants, HelpIcon, FormUtils} from 's-forms';
 import {Card, Form} from 'react-bootstrap';
 import JsonLdUtils from 'jsonld-utils';
 import QuestionWithAdvanced from "./QuestionWithAdvanced";
+import Utils from "../Utils";
+import Constants from "../Constants";
 
 
 export default class WizardStepWithAdvanced extends WizardStep {
 
+  static mappingRule = q => {
+
+    if (!FormUtils.isWizardStep(q)) {
+      return false;
+    }
+
+    return Utils.hasSubQuestionWithValue(q, Constants.SHOW_ADVANCED_QUESTION, true);
+  }
+
   _toggleAdvanced = (e) => {
     e.stopPropagation();