feat: align files with commit 5d52a28 and f9dff0 (#210)

This PR aims to fix the commit mistakes I made when trying to merge with a refactored fork. This will keep the changes I made in the refactor.

src/editors/containers/ProblemEditor/data/OLXParser.js

@@ -280,7 +280,7 @@ export class OLXParser {
       the parsed OLX.
     */
     const tagMap = {
-      label: 'bold',
+      label: 'strong',
       description: 'em',
     };
 
@@ -331,10 +331,16 @@ export class OLXParser {
   getProblemType() {
     const problemKeys = Object.keys(this.problem);
     const intersectedProblems = _.intersection(Object.values(ProblemTypeKeys), problemKeys);
-
     if (intersectedProblems.length === 0) {
-      return null;
+      // a blank problem is a problem which contains only `<problem></problem>` as it's olx.
+      // blank problems are not given types, so that a type may be selected.
+      if (problemKeys.length === 1 && problemKeys[0] === '#text' && this.problem[problemKeys[0]] === '') {
+        return null;
+      }
+      // if we have no matching problem type, the problem is advanced.
+      return ProblemTypeKeys.ADVANCED;
     }
+    // make sure compound problems are treated as advanced
     if (intersectedProblems.length > 1) {
       return ProblemTypeKeys.ADVANCED;
     }
@@ -369,7 +375,10 @@ export class OLXParser {
         answersObject = this.parseMultipleChoiceAnswers(ProblemTypeKeys.SINGLESELECT, 'choicegroup', 'choice');
         break;
       case ProblemTypeKeys.ADVANCED:
-        break;
+        return {
+          problemType,
+          settings: {},
+        };
       default:
         // if problem is unset, return null
         return {};

src/editors/containers/ProblemEditor/data/OLXParser.test.js

@@ -7,6 +7,8 @@ import {
   textInputWithFeedbackAndHintsOLX,
   mutlipleChoiceWithFeedbackAndHintsOLX,
   textInputWithFeedbackAndHintsOLXWithMultipleAnswers,
+  advancedProblemOlX,
+  blankProblemOLX,
 } from './mockData/olxTestData';
 import { ProblemTypeKeys } from '../../../data/constants/problem';
 
@@ -36,6 +38,16 @@ describe('Check OLXParser problem type', () => {
     const problemType = olxparser.getProblemType();
     expect(problemType).toBe(ProblemTypeKeys.TEXTINPUT);
   });
+  test('Test Advanced Problem Type', () => {
+    const olxparser = new OLXParser(advancedProblemOlX.rawOLX);
+    const problemType = olxparser.getProblemType();
+    expect(problemType).toBe(ProblemTypeKeys.ADVANCED);
+  });
+  test('Test Blank Problem Type', () => {
+    const olxparser = new OLXParser(blankProblemOLX.rawOLX);
+    const problemType = olxparser.getProblemType();
+    expect(problemType).toBe(null);
+  });
 });
 
 describe('Check OLXParser hints', () => {

src/editors/containers/ProblemEditor/data/SettingsParser.js

@@ -16,10 +16,7 @@ export const parseScoringSettings = (metadata) => {
 
   let attempts = popuplateItem({}, 'max_attempts', 'number', metadata);
   if (!_.isEmpty(attempts)) {
-    let unlimited = true;
-    if (attempts.number > 0) {
-      unlimited = false;
-    }
+    const unlimited = _.isNaN(attempts.number);
     attempts = { ...attempts, unlimited };
     scoring = { ...scoring, attempts };
   }

src/editors/containers/ProblemEditor/data/SettingsParser.test.js

@@ -4,7 +4,7 @@ import {
   dropdownWithFeedbackHints,
   numericWithHints,
   textInputWithHints,
-  sigleSelectWithHints,
+  singleSelectWithHints,
 } from './mockData/problemTestData';
 
 describe('Test Settings to State Parser', () => {
@@ -38,7 +38,7 @@ describe('Test Settings to State Parser', () => {
   });
 
   test('Test score settings missing', () => {
-    const settings = parseSettings(sigleSelectWithHints.metadata);
+    const settings = parseSettings(singleSelectWithHints.metadata);
     expect(settings.scoring).toBeUndefined();
   });
 

src/editors/containers/ProblemEditor/data/mockData/olxTestData.js

@@ -82,11 +82,11 @@ export const checkboxesOLXWithFeedbackAndHintsOLX = {
       },
     ],
   },
-  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for checkboxes with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><bold>Add the question text, or prompt, here. This text is required.</bold><em>You can add an optional tip or note related to the prompt like this.</em>',
+  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for checkboxes with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><strong>Add the question text, or prompt, here. This text is required.</strong><em>You can add an optional tip or note related to the prompt like this.</em>',
   buildOLX: `<problem>
   <choiceresponse>
     <p>You can use this template as a guide to the simple editor markdown and OLX markup to use for checkboxes with hints and feedback problems. Edit this component to replace this template with your own assessment.</p>
-    <bold>Add the question text, or prompt, here. This text is required.</bold>
+    <strong>Add the question text, or prompt, here. This text is required.</strong>
     <em>You can add an optional tip or note related to the prompt like this.</em>
     <checkboxgroup>
       <choice correct="true">
@@ -160,11 +160,11 @@ export const dropdownOLXWithFeedbackAndHintsOLX = {
       },
     ],
   },
-  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for dropdown with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><bold>Add the question text, or prompt, here. This text is required.</bold><em>You can add an optional tip or note related to the prompt like this.</em>',
+  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for dropdown with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><strong>Add the question text, or prompt, here. This text is required.</strong><em>You can add an optional tip or note related to the prompt like this.</em>',
   buildOLX: `<problem>
   <optionresponse>
     <p>You can use this template as a guide to the simple editor markdown and OLX markup to use for dropdown with hints and feedback problems. Edit this component to replace this template with your own assessment.</p>
-    <bold>Add the question text, or prompt, here. This text is required.</bold>
+    <strong>Add the question text, or prompt, here. This text is required.</strong>
     <em>You can add an optional tip or note related to the prompt like this.</em>
     <optioninput>
       <option correct="false">
@@ -233,11 +233,11 @@ export const mutlipleChoiceWithFeedbackAndHintsOLX = {
       },
     ],
   },
-  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for multiple choice with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><bold>Add the question text, or prompt, here. This text is required.</bold><em>You can add an optional tip or note related to the prompt like this.</em>',
+  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for multiple choice with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><strong>Add the question text, or prompt, here. This text is required.</strong><em>You can add an optional tip or note related to the prompt like this.</em>',
   buildOLX: `<problem>
   <multiplechoiceresponse>
     <p>You can use this template as a guide to the simple editor markdown and OLX markup to use for multiple choice with hints and feedback problems. Edit this component to replace this template with your own assessment.</p>
-    <bold>Add the question text, or prompt, here. This text is required.</bold>
+    <strong>Add the question text, or prompt, here. This text is required.</strong>
     <em>You can add an optional tip or note related to the prompt like this.</em>
     <choicegroup>
       <choice correct="false">
@@ -299,10 +299,10 @@ export const numericInputWithFeedbackAndHintsOLX = {
       },
     ],
   },
-  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for numerical input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><bold>Add the question text, or prompt, here. This text is required.</bold><em>You can add an optional tip or note related to the prompt like this.</em>',
+  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for numerical input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><strong>Add the question text, or prompt, here. This text is required.</strong><em>You can add an optional tip or note related to the prompt like this.</em>',
   buildOLX: `<problem>
   <p>You can use this template as a guide to the simple editor markdown and OLX markup to use for numerical input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p>
-  <bold>Add the question text, or prompt, here. This text is required.</bold>
+  <strong>Add the question text, or prompt, here. This text is required.</strong>
   <em>You can add an optional tip or note related to the prompt like this.</em>
   <numericalresponse answer="100">
     <responseparam type="tolerance" default="5"></responseparam>
@@ -373,11 +373,11 @@ export const textInputWithFeedbackAndHintsOLX = {
       },
     },
   },
-  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for text input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><bold>Add the question text, or prompt, here. This text is required.</bold><em>You can add an optional tip or note related to the prompt like this.</em>',
+  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for text input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><strong>Add the question text, or prompt, here. This text is required.</strong><em>You can add an optional tip or note related to the prompt like this.</em>',
   buildOLX: `<problem>
   <stringresponse answer="the correct answer" type="ci">
     <p>You can use this template as a guide to the simple editor markdown and OLX markup to use for text input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p>
-    <bold>Add the question text, or prompt, here. This text is required.</bold>
+    <strong>Add the question text, or prompt, here. This text is required.</strong>
     <em>You can add an optional tip or note related to the prompt like this.</em>
     <correcthint>You can specify optional feedback like this, which appears after this answer is submitted.</correcthint>
     <additional_answer answer="optional acceptable variant of the correct answer"></additional_answer>
@@ -452,11 +452,11 @@ export const textInputWithFeedbackAndHintsOLXWithMultipleAnswers = {
       },
     },
   },
-  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for text input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><bold>Add the question text, or prompt, here. This text is required.</bold><em>You can add an optional tip or note related to the prompt like this.</em>',
+  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for text input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><strong>Add the question text, or prompt, here. This text is required.</strong><em>You can add an optional tip or note related to the prompt like this.</em>',
   buildOLX: `<problem>
   <stringresponse answer="the correct answer" type="ci">
     <p>You can use this template as a guide to the simple editor markdown and OLX markup to use for text input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p>
-    <bold>Add the question text, or prompt, here. This text is required.</bold>
+    <strong>Add the question text, or prompt, here. This text is required.</strong>
     <em>You can add an optional tip or note related to the prompt like this.</em>
     <correcthint>You can specify optional feedback like this, which appears after this answer is submitted.</correcthint>
     <additional_answer answer="300">
@@ -531,10 +531,10 @@ export const numericInputWithFeedbackAndHintsOLXException = {
       },
     ],
   },
-  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for numerical input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><bold>Add the question text, or prompt, here. This text is required.</bold><em>You can add an optional tip or note related to the prompt like this.</em>',
+  question: '<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for numerical input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p><strong>Add the question text, or prompt, here. This text is required.</strong><em>You can add an optional tip or note related to the prompt like this.</em>',
   buildOLX: `<problem>
   <p>You can use this template as a guide to the simple editor markdown and OLX markup to use for numerical input with hints and feedback problems. Edit this component to replace this template with your own assessment.</p>
-  <bold>Add the question text, or prompt, here. This text is required.</bold>
+  <strong>Add the question text, or prompt, here. This text is required.</strong>
   <em>You can add an optional tip or note related to the prompt like this.</em>
   <numericalresponse answer="300">
     <additional_answer answer="100">
@@ -553,3 +553,17 @@ export const numericInputWithFeedbackAndHintsOLXException = {
 </problem>
 `,
 };
+export const advancedProblemOlX = {
+  rawOLX: `<problem>
+  <formularesponse type="ci" samples="R_1,R_2,R_3@1,2,3:3,4,5#10" answer="R_1*R_2/R_3">
+      <p>You can use this template as a guide to the OLX markup to use for math expression problems. Edit this component to replace the example with your own assessment.</p>
+      <label>Add the question text, or prompt, here. This text is required. Example: Write an expression for the product of R_1, R_2, and the inverse of R_3.</label>
+      <description>You can add an optional tip or note related to the prompt like this. Example: To test this example, the correct answer is R_1*R_2/R_3</description>
+      <responseparam type="tolerance" default="0.00001"/>
+      <formulaequationinput size="40"/>
+  </formularesponse>
+</problem>`,
+};
+export const blankProblemOLX = {
+  rawOLX: '<problem></problem>',
+};

src/editors/containers/ProblemEditor/data/mockData/problemTestData.js

@@ -217,7 +217,7 @@ export const numericWithHints = {
       scoring: {
         weight: 2.5,
         attempts: {
-          unlimited: true,
+          unlimited: false,
           number: 0,
         },
       },
@@ -288,7 +288,7 @@ export const textInputWithHints = {
       scoring: {
         weight: 2.5,
         attempts: {
-          unlimited: true,
+          unlimited: false,
           number: 0,
         },
       },
@@ -315,7 +315,7 @@ not=optional incorrect answer such as a frequent misconception {{You can specify
   },
 };
 
-export const sigleSelectWithHints = {
+export const singleSelectWithHints = {
   state: {
     rawOLX: '<problem>\n<p>You can use this template as a guide to the simple editor markdown and OLX markup to use for checkboxes with hints and feedback problems. Edit this component to replace this template with your own assessment.</p>\n\n<label>Add the question text, or prompt, here. This text is required.</label>\n<description>You can add an optional tip or note related to the prompt like this.</description>\n<multiplechoiceresponse>\n  <choicegroup type="MultipleChoice">\n    <choice correct="true">a correct answer <choicehint>selected: You can specify optional feedback that appears after the learner selects and submits this answer. }, { unselected: You can specify optional feedback that appears after the learner clears and submits this answer.</choicehint></choice>\n    <choice correct="false">an incorrect answer</choice>\n    <choice correct="false">an incorrect answer <choicehint>selected: You can specify optional feedback for none, all, or a subset of the answers. }, { unselected: You can specify optional feedback for selected answers, cleared answers, or both.</choicehint></choice>\n    <choice correct="false">an incorrect answer again</choice>\n  </choicegroup>\n</multiplechoiceresponse>\n<choiceresponse>\n  <checkboxgroup>\n    <compoundhint value="A B D">You can specify optional feedback for a combination of answers which appears after the specified set of answers is submitted.</compoundhint>\n    <compoundhint value="A B C D">You can specify optional feedback for one, several, or all answer combinations.</compoundhint>\n  </checkboxgroup>\n</choiceresponse>\n\n\n<demandhint>\n  <hint>You can add an optional hint like this. Problems that have a hint include a hint button, and this text appears the first time learners select the button.</hint>\n  <hint>If you add more than one hint, a different hint appears each time learners select the hint button.</hint>\n</demandhint>\n</problem>',
     problemType: 'SINGLESELECT',
@@ -362,7 +362,7 @@ export const sigleSelectWithHints = {
         weight: 0,
         attempts: {
           unlimited: true,
-          number: 0,
+          number: null,
         },
       },
       timeBetween: 0,