Skip to content
This repository has been archived by the owner on Feb 14, 2025. It is now read-only.

feat: allowing studio asides for course-authoring MFE #452

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
updateField,
updateAnswer,
defaultSettings,
asidesURL,
asidesEnabled,
}) => {
const { isAdvancedCardsVisible, showAdvancedCards } = showAdvancedSettingsCards();

Expand Down Expand Up @@ -88,6 +90,17 @@
<HintsCard problemType={problemType} hints={settings.hints} updateSettings={updateSettings} />
</div>
{feedbackCard()}
{asidesEnabled && (
<div>

Check warning on line 94 in src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.jsx

View check run for this annotation

Codecov / codecov/patch

src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.jsx#L94

Added line #L94 was not covered by tests
<iframe
title="asides-iframe"
src={asidesURL}
allowFullScreen
frameBorder="0"
width={500}
/>
</div>
)}
<div>
<Collapsible.Advanced open={!isAdvancedCardsVisible}>
<Collapsible.Body className="collapsible-body small">
Expand Down Expand Up @@ -174,6 +187,8 @@
}).isRequired,
// eslint-disable-next-line
settings: PropTypes.any.isRequired,
asidesURL: PropTypes.string.isRequired,
asidesEnabled: PropTypes.bool.isRequired,
};

const mapStateToProps = (state) => ({
Expand All @@ -183,6 +198,10 @@
blockTitle: selectors.app.blockTitle(state),
correctAnswerCount: selectors.problem.correctAnswerCount(state),
defaultSettings: selectors.problem.defaultSettings(state),
asidesURL: `${selectors.app.studioEndpointUrl(state)
}/asides/${
selectors.app.blockId(state)}`,
asidesEnabled: selectors.problem.hasAsides(state),
});

export const mapDispatchToProps = {
Expand Down
1 change: 1 addition & 0 deletions src/editors/data/redux/problem/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
settings: mkSimpleSelector(problemData => problemData.settings),
question: mkSimpleSelector(problemData => problemData.question),
defaultSettings: mkSimpleSelector(problemData => problemData.defaultSettings),
hasAsides: mkSimpleSelector(problemData => problemData.hasAsides),

Check warning on line 15 in src/editors/data/redux/problem/selectors.js

View check run for this annotation

Codecov / codecov/patch

src/editors/data/redux/problem/selectors.js#L15

Added line #L15 was not covered by tests
completeState: mkSimpleSelector(problemData => problemData),
};

Expand Down
26 changes: 20 additions & 6 deletions src/editors/data/redux/thunkActions/problem.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,22 @@ export const getDataFromOlx = ({ rawOLX, rawSettings, defaultSettings }) => {
return { settings: parsedSettings };
};

export const loadProblem = ({ rawOLX, rawSettings, defaultSettings }) => (dispatch) => {
export const loadProblem = ({
rawOLX, rawSettings, hasAsides, defaultSettings,
}) => (dispatch) => {
if (isBlankProblem({ rawOLX })) {
dispatch(actions.problem.setEnableTypeSelection(camelizeKeys(defaultSettings)));
} else {
dispatch(actions.problem.load(getDataFromOlx({ rawOLX, rawSettings, defaultSettings })));
dispatch(actions.problem.load({
...getDataFromOlx({
rawOLX, rawSettings, hasAsides, defaultSettings,
}),
hasAsides,
}));
}
};

export const fetchAdvancedSettings = ({ rawOLX, rawSettings }) => (dispatch) => {
export const fetchAdvancedSettings = ({ rawOLX, rawSettings, hasAsides }) => (dispatch) => {
const advancedProblemSettingKeys = ['max_attempts', 'showanswer', 'show_reset_button', 'rerandomize'];
dispatch(requests.fetchAdvancedSettings({
onSuccess: (response) => {
Expand All @@ -66,16 +73,23 @@ export const fetchAdvancedSettings = ({ rawOLX, rawSettings }) => (dispatch) =>
}
});
dispatch(actions.problem.updateField({ defaultSettings: camelizeKeys(defaultSettings) }));
loadProblem({ rawOLX, rawSettings, defaultSettings })(dispatch);
loadProblem({
rawOLX, rawSettings, hasAsides, defaultSettings,
})(dispatch);
},
onFailure: () => {
loadProblem({
rawOLX, rawSettings, hasAsides, defaultSettings: {},
})(dispatch);
},
onFailure: () => { loadProblem({ rawOLX, rawSettings, defaultSettings: {} })(dispatch); },
}));
};

export const initializeProblem = (blockValue) => (dispatch) => {
const rawOLX = _.get(blockValue, 'data.data', {});
const rawSettings = _.get(blockValue, 'data.metadata', {});
dispatch(fetchAdvancedSettings({ rawOLX, rawSettings }));
const hasAsides = _.get(blockValue, 'data.has_cms_asides', false);
dispatch(fetchAdvancedSettings({ rawOLX, rawSettings, hasAsides }));
};

export default { initializeProblem, switchToAdvancedEditor, fetchAdvancedSettings };
Loading