[Upd #52] Refactored for readability

kbss-cvut · Jan 31, 2022 · f6bfe62 · f6bfe62
1 parent 56efc32
commit f6bfe62
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/src/components/Question.jsx b/src/components/Question.jsx
@@ -122,12 +122,12 @@ export default class Question extends React.Component {
     const question = this.props.question;
     const subQuestion = question[Constants.HAS_SUBQUESTION];
     const options = this.context.options;
-    const renderQuestion = this.renderQuestion(question);
+    const renderQuestion = this.questionComponent(question);
     if (FormUtils.isHidden(question)) {
       return null;
     }
     if (!FormUtils.isRelevant(question) &&
-        (this.context.options.debugMode || FormUtils.isQuestionMatchingStartingQuestionId(subQuestion, options.startingQuestionId))) {
+        (this.context.options.debugMode || JsonLdObjectUtils.checkId(subQuestion, options.startingQuestionId))) {
       return (
           <div className="show-irrelevant">
             {renderQuestion}
@@ -141,7 +141,7 @@ export default class Question extends React.Component {
     return renderQuestion;
   }
 
-  renderQuestion(question) {
+  questionComponent(question) {
     if (FormUtils.isAnswerable(question) && !FormUtils.isSection(question)) {
       if (PRETTY_ANSWERABLE_LAYOUT) {
         return (
@@ -268,7 +268,7 @@ export default class Question extends React.Component {
     const startingQuestionId = this.context.options.startingQuestionId;
     const subQuestion = question[Constants.HAS_SUBQUESTION]
 
-    if ((debugMode || FormUtils.isQuestionMatchingStartingQuestionId(subQuestion, startingQuestionId)) && !FormUtils.hasAnswer(question)) {
+    if ((debugMode || JsonLdObjectUtils.checkId(subQuestion, startingQuestionId)) && !FormUtils.hasAnswer(question)) {
       return "show-irrelevant";
     }
     return "";
@@ -513,11 +513,10 @@ export default class Question extends React.Component {
 
     for (let i = 0; i < subQuestions.length; i++) {
       let question = subQuestions[i];
-      let questionId = question['@id'];
       let component = this.context.mapComponent(question, Question);
       let element = null;
 
-      if (debugMode || classname !== "show-irrelevant" || (!debugMode && questionId === startingQuestionId)) {
+      if (debugMode || classname !== "show-irrelevant" || (!debugMode && JsonLdObjectUtils.checkId(question, startingQuestionId))) {
         element = React.createElement(component, {
           key: 'sub-question-' + i,
           question: question,

diff --git a/src/util/FormUtils.js b/src/util/FormUtils.js
@@ -308,17 +308,4 @@ export default class FormUtils {
 
     return false;
   }
-
-  /**
-   * Evaluates if question is equal to the starting question ID, which we want to jump to.
-   * @param question
-   * @param startingQuestionId
-   * @returns {boolean}
-   */
-  static isQuestionMatchingStartingQuestionId(question, startingQuestionId) {
-    if (question === undefined) {
-      return;
-    }
-    return !!question.find(o => o['@id'] === startingQuestionId);
-  }
 }
diff --git a/src/util/JsonLdObjectUtils.js b/src/util/JsonLdObjectUtils.js
@@ -110,4 +110,22 @@ export default class JsonLdObjectUtils {
   static orderByLocalizedLabels(data, intl) {
     return data.sort(JsonLdObjectUtils.getCompareLocalizedLabelFunction(intl));
   }
+
+  /**
+   * Evaluates if jsonLdObject is equal to id.
+   * @param jsonLdObject
+   * @param id
+   * @returns {boolean}
+   */
+  static checkId(jsonLdObject, id) {
+    if (jsonLdObject === undefined) {
+      return;
+    }
+    if (jsonLdObject.constructor === Array) {
+      return !!jsonLdObject.find(o => o['@id'] === id);
+    }
+    if (jsonLdObject.constructor === Object) {
+      return jsonLdObject['@id'] === id;
+    }
+  }
 }