diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/__snapshots__/index.test.jsx.snap b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/__snapshots__/index.test.jsx.snap index 4e27aad19..a9a780585 100644 --- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/__snapshots__/index.test.jsx.snap +++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/__snapshots__/index.test.jsx.snap @@ -23,18 +23,18 @@ exports[`RandomizationCard snapshot snapshot: renders randonmization setting car onChange={[MockFunction randomizationCardHooks.handleChange]} value="sOmE_vAlUE" > - + + + + diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.js index ed875f2c4..e95fc3246 100644 --- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.js +++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.js @@ -1,6 +1,5 @@ import { useState, useEffect } from 'react'; -import messages from './messages'; -import { RandomizationTypes } from '../../../../../../../data/constants/problem'; +import { RandomizationTypes, RandomizationTypesKeys } from '../../../../../../../data/constants/problem'; import * as module from './hooks'; export const state = { @@ -8,10 +7,13 @@ export const state = { }; export const useRandomizationSettingStatus = ({ randomization, updateSettings }) => { - const [summary, setSummary] = module.state.summary({ message: messages.noRandomizationSummary, values: {} }); + const [summary, setSummary] = module.state.summary({ + message: RandomizationTypes[RandomizationTypesKeys.NEVER], + values: {}, + }); useEffect(() => { setSummary({ - message: randomization ? RandomizationTypes[randomization] : messages.noRandomizationSummary, + message: randomization ? RandomizationTypes[randomization] : RandomizationTypes[RandomizationTypesKeys.NEVER], }); }, [randomization]); diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.test.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.test.js index 9650f0c23..cd202f555 100644 --- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.test.js +++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/hooks.test.js @@ -1,7 +1,7 @@ import { useEffect } from 'react'; import { MockUseState } from '../../../../../../../../testUtils'; -import messages from './messages'; import * as hooks from './hooks'; +import { RandomizationTypes, RandomizationTypesKeys } from '../../../../../../../data/constants/problem'; jest.mock('react', () => { const updateState = jest.fn(); @@ -36,7 +36,7 @@ describe('Problem settings hooks', () => { output = hooks.useRandomizationSettingStatus({ randomization, updateSettings }); }); test('test default state is false', () => { - expect(output.summary).toEqual({ message: messages.noRandomizationSummary, values: {} }); + expect(output.summary).toEqual({ message: RandomizationTypes[RandomizationTypesKeys.NEVER], values: {} }); }); test('test showAdvancedCards sets state to true', () => { const mockEvent = { target: { value: 'sOmE_otheR_ValUe' } }; diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/index.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/index.jsx index 6bae84fdf..0cb2817e4 100644 --- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/index.jsx +++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/index.jsx @@ -30,7 +30,7 @@ export const RandomizationCard = ({ value={randomization} onChange={handleChange} > - {randomization ? ( + { Object.values(RandomizationTypesKeys).map((randomizationType) => ( - )} + } diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/messages.js index 91fc1144e..3f622bd32 100644 --- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/messages.js +++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Randomization/messages.js @@ -15,11 +15,6 @@ const messages = defineMessages({ }`, description: 'Description of Possibilities for value in Randomization widget', }, - noRandomizationSummary: { - id: 'authoring.problemeditor.settings.randomization.noRandomizationSummary', - defaultMessage: 'Not Applicable', - description: 'text shown when no randomization option is given', - }, }); export default messages; diff --git a/src/editors/data/constants/problem.js b/src/editors/data/constants/problem.js index 9d58ed59c..da4db7831 100644 --- a/src/editors/data/constants/problem.js +++ b/src/editors/data/constants/problem.js @@ -191,8 +191,8 @@ export const ShowAnswerTypes = StrictDict({ }); export const RandomizationTypesKeys = StrictDict({ - ALWAYS: 'always', NEVER: 'never', + ALWAYS: 'always', ONRESET: 'on_reset', PERSTUDENT: 'per_student', });