+
Not supported
@@ -2230,12 +2042,24 @@ exports[`AdvanceTypeSelect snapshots snapshots: renders as expected with problem
}
placement="right"
>
-
+
+
+
+
`;
diff --git a/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/__snapshots__/Preview.test.jsx.snap b/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/__snapshots__/Preview.test.jsx.snap
index 8dd2e23bf..9cc84af14 100644
--- a/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/__snapshots__/Preview.test.jsx.snap
+++ b/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/__snapshots__/Preview.test.jsx.snap
@@ -3,13 +3,19 @@
exports[`Preview snapshots snapshots: renders as expected with default props 1`] = `""`;
exports[`Preview snapshots snapshots: renders as expected with problemType is choiceresponse 1`] = `
-
- Multi Select Problem
+ Multi-select problem
-
+
`;
exports[`Preview snapshots snapshots: renders as expected with problemType is multiplechoiceresponse 1`] = `
-
- Single Select Problem
+ Single select problem
-
+
`;
exports[`Preview snapshots snapshots: renders as expected with problemType is numericalresponse 1`] = `
-
- Numeric Response Problem
+ Numerical input problem
-
+
`;
exports[`Preview snapshots snapshots: renders as expected with problemType is optionresponse 1`] = `
-
- Dropdown Problem
+ Dropdown problem
-
+
`;
exports[`Preview snapshots snapshots: renders as expected with problemType is stringresponse 1`] = `
-
- Text Input Problem
+ Text input problem
-
+
`;
diff --git a/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/__snapshots__/ProblemTypeSelect.test.jsx.snap b/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/__snapshots__/ProblemTypeSelect.test.jsx.snap
index bf2f8389e..775965cf3 100644
--- a/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/__snapshots__/ProblemTypeSelect.test.jsx.snap
+++ b/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/__snapshots__/ProblemTypeSelect.test.jsx.snap
@@ -1,7 +1,14 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`ProblemTypeSelect snapshot DROPDOWN 1`] = `
-
+
- Single Select Problem
+ Single select
- Multi Select Problem
+ Multi-select
- Dropdown Problem
+ Dropdown
- Numeric Response Problem
+ Numerical input
- Text Input Problem
+ Text input
-
+
`;
exports[`ProblemTypeSelect snapshot MULTISELECT 1`] = `
-
+
- Single Select Problem
+ Single select
- Multi Select Problem
+ Multi-select
- Dropdown Problem
+ Dropdown
- Numeric Response Problem
+ Numerical input
- Text Input Problem
+ Text input
-
+
`;
exports[`ProblemTypeSelect snapshot NUMERIC 1`] = `
-
+
- Single Select Problem
+ Single select
- Multi Select Problem
+ Multi-select
- Dropdown Problem
+ Dropdown
- Numeric Response Problem
+ Numerical input
- Text Input Problem
+ Text input
-
+
`;
exports[`ProblemTypeSelect snapshot SINGLESELECT 1`] = `
-
+
- Single Select Problem
+ Single select
- Multi Select Problem
+ Multi-select
- Dropdown Problem
+ Dropdown
- Numeric Response Problem
+ Numerical input
- Text Input Problem
+ Text input
-
+
`;
exports[`ProblemTypeSelect snapshot TEXTINPUT 1`] = `
-
+
- Single Select Problem
+ Single select
- Multi Select Problem
+ Multi-select
- Dropdown Problem
+ Dropdown
- Numeric Response Problem
+ Numerical input
- Text Input Problem
+ Text input
-
+
`;
diff --git a/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/messages.js b/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/messages.js
index dae097bb7..9d220f1a1 100644
--- a/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/messages.js
+++ b/src/editors/containers/ProblemEditor/components/SelectTypeModal/content/messages.js
@@ -1,7 +1,7 @@
export const messages = {
advanceProblemButtonLabel: {
id: 'authoring.problemEditor.problemSelect.advanceButton.label',
- defaultMessage: 'Advance problem types',
+ defaultMessage: 'Advanced problem types',
description: 'Button label for advance problem types option',
},
advanceMenuTitle: {
@@ -39,7 +39,7 @@ export const messages = {
},
previewTitle: {
id: 'authoring.problemEditor.preview.title',
- defaultMessage: '{previewTitle}',
+ defaultMessage: '{previewTitle} problem',
description: 'Title for the problem preview column',
},
previewAltText: {
@@ -61,8 +61,13 @@ export const messages = {
},
learnMoreButtonLabel: {
id: 'authoring.problemEditor.learnMoreButtonLabel.label',
- defaultMessage: 'Learn More',
- description: 'Label for Learn More button',
+ defaultMessage: 'Learn more',
+ description: 'Label for Learn more button',
+ },
+ learnMoreAdvancedButtonLabel: {
+ id: 'authoring.problemEditor.advanceProblem.learnMoreButtonLabel.label',
+ defaultMessage: 'Learn more about advanced problem types',
+ description: 'Label for Learn more about advanced problem types button',
},
};
diff --git a/src/editors/containers/ProblemEditor/components/SelectTypeModal/hooks.js b/src/editors/containers/ProblemEditor/components/SelectTypeModal/hooks.js
index f1dace285..f6cf10143 100644
--- a/src/editors/containers/ProblemEditor/components/SelectTypeModal/hooks.js
+++ b/src/editors/containers/ProblemEditor/components/SelectTypeModal/hooks.js
@@ -4,6 +4,7 @@ import {
} from '../../../../data/constants/problem';
import { StrictDict } from '../../../../utils';
import * as module from './hooks';
+import { getDataFromOlx } from '../../../../data/redux/thunkActions/problem';
export const state = StrictDict({
selected: (val) => useState(val),
@@ -17,11 +18,16 @@ export const selectHooks = () => {
};
};
-export const onSelect = (setProblemType, selected, updateField) => () => {
+export const onSelect = ({ selected, updateField, setBlockTitle }) => () => {
if (Object.values(AdvanceProblemKeys).includes(selected)) {
- updateField({ rawOLX: AdvanceProblems[selected].template });
+ updateField({ problemType: ProblemTypeKeys.ADVANCED, rawOLX: AdvanceProblems[selected].template });
+ setBlockTitle(AdvanceProblems[selected].title);
+ } else {
+ const newOLX = ProblemTypes[selected].template;
+ const { settings, ...newState } = getDataFromOlx({ rawOLX: newOLX, rawSettings: {} });
+ updateField({ ...newState });
+ setBlockTitle(ProblemTypes[selected].title);
}
- setProblemType({ selected });
};
export const useArrowNav = (selected, setSelected) => {
diff --git a/src/editors/containers/ProblemEditor/components/SelectTypeModal/hooks.test.js b/src/editors/containers/ProblemEditor/components/SelectTypeModal/hooks.test.js
index 50829221e..b44cc4eef 100644
--- a/src/editors/containers/ProblemEditor/components/SelectTypeModal/hooks.test.js
+++ b/src/editors/containers/ProblemEditor/components/SelectTypeModal/hooks.test.js
@@ -2,7 +2,8 @@
import React from 'react';
import { MockUseState } from '../../../../../testUtils';
import * as module from './hooks';
-import { AdvanceProblems, ProblemTypeKeys } from '../../../../data/constants/problem';
+import { AdvanceProblems, ProblemTypeKeys, ProblemTypes } from '../../../../data/constants/problem';
+import { OLXParser } from '../../data/OLXParser';
jest.mock('react', () => ({
...jest.requireActual('react'),
@@ -11,11 +12,11 @@ jest.mock('react', () => ({
}));
const state = new MockUseState(module);
-const mockSetProblemType = jest.fn().mockName('setProblemType');
const mockUpdateField = jest.fn().mockName('updateField');
-const mockSelected = 'vAl';
-const mockAdvancedSelected = 'blankadvanced';
+const mockSelected = 'multiplechoiceresponse';
+const mockAdvancedSelected = 'circuitschematic';
const mockSetSelected = jest.fn().mockName('setSelected');
+const mocksetBlockTitle = jest.fn().mockName('setBlockTitle');
let hook;
@@ -45,14 +46,26 @@ describe('SelectTypeModal hooks', () => {
describe('onSelect', () => {
test('updateField is called with selected templated if selected is an Advanced Problem', () => {
- module.onSelect(mockSetProblemType, mockAdvancedSelected, mockUpdateField)();
+ module.onSelect({
+ selected: mockAdvancedSelected,
+ updateField: mockUpdateField,
+ setBlockTitle: mocksetBlockTitle,
+ })();
expect(mockUpdateField).toHaveBeenCalledWith({
+ problemType: ProblemTypeKeys.ADVANCED,
rawOLX: AdvanceProblems[mockAdvancedSelected].template,
});
+ expect(mocksetBlockTitle).toHaveBeenCalledWith(AdvanceProblems[mockAdvancedSelected].title);
});
- test('setProblemType is called with selected', () => {
- module.onSelect(mockSetProblemType, mockSelected, mockUpdateField)();
- expect(mockSetProblemType).toHaveBeenCalledWith({ selected: mockSelected });
+ test('updateField is called with selected on visual propblems', () => {
+ module.onSelect({ selected: mockSelected, updateField: mockUpdateField, setBlockTitle: mocksetBlockTitle })();
+ const testOlXParser = new OLXParser(ProblemTypes[mockSelected].template);
+ const { settings, ...testState } = testOlXParser.getParsedOLXData();
+ expect(mockUpdateField).toHaveBeenCalledWith({
+ ...testState,
+ rawOLX: ProblemTypes[mockSelected].template,
+ });
+ expect(mocksetBlockTitle).toHaveBeenCalledWith(ProblemTypes[mockSelected].title);
});
});
diff --git a/src/editors/containers/ProblemEditor/components/SelectTypeModal/index.jsx b/src/editors/containers/ProblemEditor/components/SelectTypeModal/index.jsx
index 49d2ca7b7..0c02e0647 100644
--- a/src/editors/containers/ProblemEditor/components/SelectTypeModal/index.jsx
+++ b/src/editors/containers/ProblemEditor/components/SelectTypeModal/index.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
-import { Col, Row } from '@edx/paragon';
+import { Row, Stack } from '@edx/paragon';
import ProblemTypeSelect from './content/ProblemTypeSelect';
import Preview from './content/Preview';
import AdvanceTypeSelect from './content/AdvanceTypeSelect';
@@ -17,16 +17,12 @@ export const SelectTypeModal = ({
return (
-
+
{(!Object.values(AdvanceProblemKeys).includes(selected)) ? (
- <>
-
-
-
-
-
-
-
+
+
+
+
) : }
diff --git a/src/editors/containers/ProblemEditor/data/OLXParser.js b/src/editors/containers/ProblemEditor/data/OLXParser.js
index 18126a039..865a14999 100644
--- a/src/editors/containers/ProblemEditor/data/OLXParser.js
+++ b/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 `
` 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 {};
diff --git a/src/editors/containers/ProblemEditor/data/OLXParser.test.js b/src/editors/containers/ProblemEditor/data/OLXParser.test.js
index 3ae946638..5823e4b6e 100644
--- a/src/editors/containers/ProblemEditor/data/OLXParser.test.js
+++ b/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', () => {
diff --git a/src/editors/containers/ProblemEditor/data/SettingsParser.js b/src/editors/containers/ProblemEditor/data/SettingsParser.js
index 8c038efe7..1de0708a0 100644
--- a/src/editors/containers/ProblemEditor/data/SettingsParser.js
+++ b/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 };
}
diff --git a/src/editors/containers/ProblemEditor/data/SettingsParser.test.js b/src/editors/containers/ProblemEditor/data/SettingsParser.test.js
index cf3ddc763..871262aa7 100644
--- a/src/editors/containers/ProblemEditor/data/SettingsParser.test.js
+++ b/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();
});
diff --git a/src/editors/containers/ProblemEditor/data/mockData/olxTestData.js b/src/editors/containers/ProblemEditor/data/mockData/olxTestData.js
index cc9e2de9d..187ce6514 100644
--- a/src/editors/containers/ProblemEditor/data/mockData/olxTestData.js
+++ b/src/editors/containers/ProblemEditor/data/mockData/olxTestData.js
@@ -82,11 +82,11 @@ export const checkboxesOLXWithFeedbackAndHintsOLX = {
},
],
},
- question: '
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.
Add the question text, or prompt, here. This text is required.You can add an optional tip or note related to the prompt like this.',
+ question: '
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.
Add the question text, or prompt, here. This text is required.You can add an optional tip or note related to the prompt like this.',
buildOLX: `
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.
- Add the question text, or prompt, here. This text is required.
+ Add the question text, or prompt, here. This text is required.
You can add an optional tip or note related to the prompt like this.
@@ -160,11 +160,11 @@ export const dropdownOLXWithFeedbackAndHintsOLX = {
},
],
},
- question: '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.
Add the question text, or prompt, here. This text is required.You can add an optional tip or note related to the prompt like this.',
+ question: '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.
Add the question text, or prompt, here. This text is required.You can add an optional tip or note related to the prompt like this.',
buildOLX: `
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.
- Add the question text, or prompt, here. This text is required.
+ Add the question text, or prompt, here. This text is required.
You can add an optional tip or note related to the prompt like this.