[Enhancement #62] It is now possible to turn-off/on the comments in t…

…he options
kbss-cvut · Oct 19, 2021 · 344d3ed · 344d3ed
1 parent 297c2b2
commit 344d3ed
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 18 deletions.
diff --git a/src/components/Answer.jsx b/src/components/Answer.jsx
@@ -146,20 +146,28 @@ const Answer = (props) => {
       />
     ) : null;
 
+    const _renderQuestionCommentIcon = () => {
+      if (options.enableComments) {
+        return (
+            <Col className="no-padding-left" lg="auto">
+              <QuestionCommentIcon
+                  question={question}
+                  onChange={props.onCommentChange}
+              />
+            </Col>
+        );
+      } else return null;
+    }
+
     return (
         <Row>
           <Col className="no-padding-right" lg="auto">{label}</Col>
           {questionHelp ?
               <>
                 <Col className="no-padding-left" lg="1" >{questionHelp}</Col>
-                <Col className="no-padding-left" lg="auto"><QuestionCommentIcon question={question} onChange={props.onCommentChange}/></Col>
+                {_renderQuestionCommentIcon()}
               </>
-              : <Col className="no-padding-left" lg="auto">
-                <QuestionCommentIcon
-                  question={question}
-                  onChange={props.onCommentChange}
-                />
-              </Col>
+              : _renderQuestionCommentIcon()
           }
         </Row>
     );

diff --git a/src/components/Question.jsx b/src/components/Question.jsx
@@ -160,11 +160,9 @@ export default class Question extends React.Component {
                         <Col className="no-padding-left" lg="auto">
                           {this._renderQuestionHelp()}
                         </Col>
-                        <Col className="no-padding-left" lg="auto">
                           {this._renderQuestionComment()}
-                        </Col>
                       </>
-                      : <Col className="no-padding-left" lg="auto">{this._renderQuestionComment()}</Col>
+                      : this._renderQuestionComment()
                   }
                 </Row>
               </Accordion.Toggle>
@@ -337,10 +335,15 @@ export default class Question extends React.Component {
   }
 
   _renderQuestionComment() {
-    return <QuestionCommentIcon
-        question={this.props.question}
-        onChange={this.onCommentChange}
-    />
+    if (this.context.options.enableComments) {
+      return (
+          <Col className="no-padding-left" lg="auto">
+            <QuestionCommentIcon
+                question={this.props.question}
+                onChange={this.onCommentChange} />
+          </Col>
+      );
+    } else return null;
   }
 
   _renderPrefixes() {

diff --git a/src/components/wizard/WizardStep.jsx b/src/components/wizard/WizardStep.jsx
@@ -39,7 +39,16 @@ export default class WizardStep extends React.Component {
   _renderQuestionCommentIcon = () => {
     const question = this.context.getFormQuestionsData([this.props.stepIndex]);
 
-    return <QuestionCommentIcon question={question} onChange={this.onCommentChange} />
+    if (this.props.options.enableComments) {
+      return (
+          <Col className="no-padding-left" lg="auto">
+            <QuestionCommentIcon
+                question={question}
+                onChange={this.onCommentChange}
+            />
+          </Col>
+      );
+    } else return null;
   }
 
   onCommentChange = (commentIndex, change) => {
@@ -96,9 +105,9 @@ export default class WizardStep extends React.Component {
               {this._renderHelpIcon() ?
                   <>
                     <Col className="no-padding-left" lg="auto">{this._renderHelpIcon()}</Col>
-                    <Col className="no-padding-left" lg="auto">{this._renderQuestionCommentIcon()}</Col>
+                    {this._renderQuestionCommentIcon()}
                   </>
-                  : <Col className="no-padding-left" lg="auto">{this._renderQuestionCommentIcon()}</Col>
+                  : this._renderQuestionCommentIcon()
               }
             </Row>
           </Card.Header>

diff --git a/test/rendering/TestApp.jsx b/test/rendering/TestApp.jsx
@@ -65,7 +65,8 @@ class TestApp extends React.Component {
       users: [
           {id: "http://fel.cvut.cz/people/max-chopart", label: "Max Chopart"},
           {id: "http://fel.cvut.cz/people/miroslav-blasko", label: "Miroslav Blasko"}],
-      currentUser: "http://fel.cvut.cz/people/max-chopart"
+      currentUser: "http://fel.cvut.cz/people/max-chopart",
+      enableComments: false
     };
 
     return (