chore: rename grading strategy -> grading method

openedx · Feb 19, 2024 · 39ebc84 · 39ebc84
1 parent f61d254
commit 39ebc84
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 71 deletions.
diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/hooks.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/hooks.js
@@ -166,9 +166,9 @@ export const scoringCardHooks = (scoring, updateSettings, defaultValue) => {
     updateSettings({ scoring: { ...scoring, weight } });
   };
 
-  const handleGradingStrategyChange = (event) => {
+  const handleGradingMethodChange = (event) => {
     const { value } = event.target;
-    updateSettings({ scoring: { ...scoring, gradingStrategy: value } });
+    updateSettings({ scoring: { ...scoring, gradingMethod: value } });
   };
 
   return {
@@ -177,7 +177,7 @@ export const scoringCardHooks = (scoring, updateSettings, defaultValue) => {
     handleMaxAttemptChange,
     handleOnChange,
     handleWeightChange,
-    handleGradingStrategyChange,
+    handleGradingMethodChange,
   };
 };
 

diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/hooks.test.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/hooks.test.js
@@ -146,7 +146,7 @@ describe('Problem settings hooks', () => {
         unlimited: false,
         number: 5,
       },
-      gradingStrategy: 'last_score',
+      gradingMethod: 'last_score',
     };
     const defaultValue = 1;
     test('test scoringCardHooks initializes display value when attempts.number is null', () => {
@@ -269,10 +269,10 @@ describe('Problem settings hooks', () => {
       output.handleWeightChange({ target: { value } });
       expect(updateSettings).toHaveBeenCalledWith({ scoring: { ...scoring, weight: parseFloat(value) } });
     });
-    test('test handleGradingStrategyChange', () => {
+    test('test handleGradingMethodChange', () => {
       const value = 'first_score';
-      output.handleGradingStrategyChange({ target: { value } });
-      expect(updateSettings).toHaveBeenCalledWith({ scoring: { ...scoring, gradingStrategy: value } });
+      output.handleGradingMethodChange({ target: { value } });
+      expect(updateSettings).toHaveBeenCalledWith({ scoring: { ...scoring, gradingMethod: value } });
     });
   });
 

diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.jsx
@@ -171,7 +171,7 @@ SettingsWidget.propTypes = {
     showanswer: PropTypes.string,
     showResetButton: PropTypes.bool,
     rerandomize: PropTypes.string,
-    gradingStrategy: PropTypes.string,
+    gradingMethod: PropTypes.string,
   }).isRequired,
   // eslint-disable-next-line
   settings: PropTypes.any.isRequired,

diff --git a/...editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.test.jsx b/...editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/index.test.jsx
@@ -28,7 +28,7 @@ describe('SettingsWidget', () => {
       maxAttempts: 2,
       showanswer: 'finished',
       showResetButton: false,
-      gradingStrategy: 'last_score',
+      gradingMethod: 'last_score',
     },
   };
 

diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/messages.js b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/messages.js
@@ -82,15 +82,15 @@ const messages = defineMessages({
     defaultMessage: 'Points',
     description: 'Scoring weight input label',
   },
-  scoringGradingStrategyInputLabel: {
-    id: 'authoring.problemeditor.settings.scoring.gradingStrategy.inputLabel',
-    defaultMessage: 'Grading Strategy',
-    description: 'Grading strategy input label',
+  scoringGradingMethodInputLabel: {
+    id: 'authoring.problemeditor.settings.scoring.gradingMethod.inputLabel',
+    defaultMessage: 'Grading Method',
+    description: 'Grading method input label',
   },
-  gradingStrategySummary: {
-    id: 'authoring.problemeditor.settings.scoring.gradingStrategy',
-    defaultMessage: '{gradingStrategy}',
-    description: 'Summary text for scoring grading strategy',
+  gradingMethodSummary: {
+    id: 'authoring.problemeditor.settings.scoring.gradingMethod',
+    defaultMessage: '{gradingMethod}',
+    description: 'Summary text for scoring grading method',
   },
   unlimitedAttemptsSummary: {
     id: 'authoring.problemeditor.settings.scoring.unlimited',
@@ -114,7 +114,7 @@ const messages = defineMessages({
   },
   scoringSettingsLabel: {
     id: 'authoring.problemeditor.settings.scoring.label',
-    defaultMessage: 'Specify grading strategy, point weight and the number of answer attempts',
+    defaultMessage: 'Specify grading method, point weight and the number of answer attempts',
     description: 'Descriptive text for scoring settings',
   },
   attemptsHint: {
@@ -127,10 +127,10 @@ const messages = defineMessages({
     defaultMessage: 'If a value is not set, the problem is worth one point',
     description: 'Summary text for scoring weight',
   },
-  gradingStrategyHint: {
-    id: 'authoring.problemeditor.settings.scoring.gradingStrategy.hint',
-    defaultMessage: 'Define the grading strategy for this problem. By default, it is the score of the last submission made by the student.',
-    description: 'Summary text for scoring grading strategy',
+  gradingMethodHint: {
+    id: 'authoring.problemeditor.settings.scoring.gradingMethod.hint',
+    defaultMessage: 'Define the grading method for this problem. By default, it is the score of the last submission made by the student.',
+    description: 'Summary text for scoring grading method',
   },
   showAnswerSettingsTitle: {
     id: 'authoring.problemeditor.settings.showAnswer.title',

diff --git a/...roblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ScoringCard.jsx b/...roblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ScoringCard.jsx
@@ -8,7 +8,7 @@ import { selectors } from '../../../../../../data/redux';
 import SettingsOption from '../SettingsOption';
 import messages from '../messages';
 import { scoringCardHooks } from '../hooks';
-import { GradingStrategy, GradingStrategyKeys } from '../../../../../../data/constants/problem';
+import { GradingMethod, GradingMethodKeys } from '../../../../../../data/constants/problem';
 
 export const ScoringCard = ({
   scoring,
@@ -25,20 +25,20 @@ export const ScoringCard = ({
     handleUnlimitedChange,
     handleMaxAttemptChange,
     handleWeightChange,
-    handleGradingStrategyChange,
+    handleGradingMethodChange,
     handleOnChange,
     attemptDisplayValue,
   } = scoringCardHooks(scoring, updateSettings, defaultValue);
 
-  const getScoringSummary = (weight, attempts, unlimited, gradingStrategy) => {
+  const getScoringSummary = (weight, attempts, unlimited, gradingMethod) => {
     let summary = intl.formatMessage(messages.weightSummary, { weight });
     summary += ` ${String.fromCharCode(183)} `;
     summary += unlimited
       ? intl.formatMessage(messages.unlimitedAttemptsSummary)
       : intl.formatMessage(messages.attemptsSummary, { attempts: attempts || defaultValue });
     summary += ` ${String.fromCharCode(183)} `;
-    summary += intl.formatMessage(messages.gradingStrategySummary, {
-      gradingStrategy: intl.formatMessage(GradingStrategy[gradingStrategy]),
+    summary += intl.formatMessage(messages.gradingMethodSummary, {
+      gradingMethod: intl.formatMessage(GradingMethod[gradingMethod]),
     });
     return summary;
   };
@@ -51,7 +51,7 @@ export const ScoringCard = ({
           scoring.weight,
           scoring.attempts.number,
           scoring.attempts.unlimited,
-          scoring.gradingStrategy,
+          scoring.gradingMethod,
         )
       }
       className="scoringCard"
@@ -62,24 +62,24 @@ export const ScoringCard = ({
       <Form.Group>
         <Form.Control
           as="select"
-          value={scoring.gradingStrategy}
-          onChange={handleGradingStrategyChange}
-          floatingLabel={intl.formatMessage(messages.scoringGradingStrategyInputLabel)}
+          value={scoring.gradingMethod}
+          onChange={handleGradingMethodChange}
+          floatingLabel={intl.formatMessage(messages.scoringGradingMethodInputLabel)}
         >
-          {Object.values(GradingStrategyKeys).map((gradingStrategy) => {
-            const optionDisplayName = GradingStrategy[gradingStrategy];
+          {Object.values(GradingMethodKeys).map((gradingMethod) => {
+            const optionDisplayName = GradingMethod[gradingMethod];
             return (
               <option
-                key={gradingStrategy}
-                value={gradingStrategy}
+                key={gradingMethod}
+                value={gradingMethod}
               >
                 {intl.formatMessage(optionDisplayName)}
               </option>
             );
           })}
         </Form.Control>
         <Form.Control.Feedback>
-          <FormattedMessage {...messages.gradingStrategyHint} />
+          <FormattedMessage {...messages.gradingMethodHint} />
         </Form.Control.Feedback>
       </Form.Group>
       <Form.Group>

diff --git a/...mEditor/components/EditProblemView/SettingsWidget/settingsComponents/ScoringCard.test.jsx b/...mEditor/components/EditProblemView/SettingsWidget/settingsComponents/ScoringCard.test.jsx
@@ -15,7 +15,7 @@ describe('ScoringCard', () => {
       unlimited: false,
       number: 5,
     },
-    gradingStrategy: 'last_score',
+    gradingMethod: 'last_score',
     updateSettings: jest.fn().mockName('args.updateSettings'),
     intl: { formatMessage },
   };
@@ -30,7 +30,7 @@ describe('ScoringCard', () => {
     handleMaxAttemptChange: jest.fn().mockName('scoringCardHooks.handleMaxAttemptChange'),
     handleWeightChange: jest.fn().mockName('scoringCardHooks.handleWeightChange'),
     handleOnChange: jest.fn().mockName('scoringCardHooks.handleOnChange'),
-    handleGradingStrategyChange: jest.fn().mockName('scoringCardHooks.handleGradingStrategyChange'),
+    handleGradingMethodChange: jest.fn().mockName('scoringCardHooks.handleGradingMethodChange'),
     local: 5,
   };
 

diff --git a/...EditProblemView/SettingsWidget/settingsComponents/__snapshots__/ScoringCard.test.jsx.snap b/...EditProblemView/SettingsWidget/settingsComponents/__snapshots__/ScoringCard.test.jsx.snap
@@ -12,16 +12,16 @@ exports[`ScoringCard snapshot snapshot: scoring setting card 1`] = `
     className="mb-4"
   >
     <FormattedMessage
-      defaultMessage="Specify grading strategy, point weight and the number of answer attempts"
+      defaultMessage="Specify grading method, point weight and the number of answer attempts"
       description="Descriptive text for scoring settings"
       id="authoring.problemeditor.settings.scoring.label"
     />
   </div>
   <Form.Group>
     <Form.Control
       as="select"
-      floatingLabel="Grading Strategy"
-      onChange={[MockFunction scoringCardHooks.handleGradingStrategyChange]}
+      floatingLabel="Grading Method"
+      onChange={[MockFunction scoringCardHooks.handleGradingMethodChange]}
       value="last_score"
     >
       <option
@@ -51,9 +51,9 @@ exports[`ScoringCard snapshot snapshot: scoring setting card 1`] = `
     </Form.Control>
     <Form.Control.Feedback>
       <FormattedMessage
-        defaultMessage="Define the grading strategy for this problem. By default, it is the score of the last submission made by the student."
-        description="Summary text for scoring grading strategy"
-        id="authoring.problemeditor.settings.scoring.gradingStrategy.hint"
+        defaultMessage="Define the grading method for this problem. By default, it is the score of the last submission made by the student."
+        description="Summary text for scoring grading method"
+        id="authoring.problemeditor.settings.scoring.gradingMethod.hint"
       />
     </Form.Control.Feedback>
   </Form.Group>
@@ -127,16 +127,16 @@ exports[`ScoringCard snapshot snapshot: scoring setting card max attempts 1`] =
     className="mb-4"
   >
     <FormattedMessage
-      defaultMessage="Specify grading strategy, point weight and the number of answer attempts"
+      defaultMessage="Specify grading method, point weight and the number of answer attempts"
       description="Descriptive text for scoring settings"
       id="authoring.problemeditor.settings.scoring.label"
     />
   </div>
   <Form.Group>
     <Form.Control
       as="select"
-      floatingLabel="Grading Strategy"
-      onChange={[MockFunction scoringCardHooks.handleGradingStrategyChange]}
+      floatingLabel="Grading Method"
+      onChange={[MockFunction scoringCardHooks.handleGradingMethodChange]}
       value="last_score"
     >
       <option
@@ -166,9 +166,9 @@ exports[`ScoringCard snapshot snapshot: scoring setting card max attempts 1`] =
     </Form.Control>
     <Form.Control.Feedback>
       <FormattedMessage
-        defaultMessage="Define the grading strategy for this problem. By default, it is the score of the last submission made by the student."
-        description="Summary text for scoring grading strategy"
-        id="authoring.problemeditor.settings.scoring.gradingStrategy.hint"
+        defaultMessage="Define the grading method for this problem. By default, it is the score of the last submission made by the student."
+        description="Summary text for scoring grading method"
+        id="authoring.problemeditor.settings.scoring.gradingMethod.hint"
       />
     </Form.Control.Feedback>
   </Form.Group>
@@ -242,16 +242,16 @@ exports[`ScoringCard snapshot snapshot: scoring setting card zero zero weight 1`
     className="mb-4"
   >
     <FormattedMessage
-      defaultMessage="Specify grading strategy, point weight and the number of answer attempts"
+      defaultMessage="Specify grading method, point weight and the number of answer attempts"
       description="Descriptive text for scoring settings"
       id="authoring.problemeditor.settings.scoring.label"
     />
   </div>
   <Form.Group>
     <Form.Control
       as="select"
-      floatingLabel="Grading Strategy"
-      onChange={[MockFunction scoringCardHooks.handleGradingStrategyChange]}
+      floatingLabel="Grading Method"
+      onChange={[MockFunction scoringCardHooks.handleGradingMethodChange]}
       value="last_score"
     >
       <option
@@ -281,9 +281,9 @@ exports[`ScoringCard snapshot snapshot: scoring setting card zero zero weight 1`
     </Form.Control>
     <Form.Control.Feedback>
       <FormattedMessage
-        defaultMessage="Define the grading strategy for this problem. By default, it is the score of the last submission made by the student."
-        description="Summary text for scoring grading strategy"
-        id="authoring.problemeditor.settings.scoring.gradingStrategy.hint"
+        defaultMessage="Define the grading method for this problem. By default, it is the score of the last submission made by the student."
+        description="Summary text for scoring grading method"
+        id="authoring.problemeditor.settings.scoring.gradingMethod.hint"
       />
     </Form.Control.Feedback>
   </Form.Group>

diff --git a/src/editors/containers/ProblemEditor/data/ReactStateSettingsParser.js b/src/editors/containers/ProblemEditor/data/ReactStateSettingsParser.js
@@ -21,7 +21,7 @@ class ReactStateSettingsParser {
 
     settings = popuplateItem(settings, 'number', 'max_attempts', stateSettings.scoring.attempts, true);
     settings = popuplateItem(settings, 'weight', 'weight', stateSettings.scoring);
-    settings = popuplateItem(settings, 'gradingStrategy', 'grading_strategy', stateSettings.scoring);
+    settings = popuplateItem(settings, 'gradingMethod', 'grading_method', stateSettings.scoring);
     settings = popuplateItem(settings, 'on', 'showanswer', stateSettings.showAnswer);
     settings = popuplateItem(settings, 'afterAttempts', 'attempts_before_showanswer_button', stateSettings.showAnswer);
     settings = popuplateItem(settings, 'showResetButton', 'show_reset_button', stateSettings);

diff --git a/src/editors/containers/ProblemEditor/data/SettingsParser.js b/src/editors/containers/ProblemEditor/data/SettingsParser.js
@@ -38,7 +38,7 @@ export const parseScoringSettings = (metadata, defaultSettings) => {
 
   scoring = popuplateItem(scoring, 'weight', 'weight', metadata);
 
-  scoring = popuplateItem(scoring, 'grading_strategy', 'gradingStrategy', metadata);
+  scoring = popuplateItem(scoring, 'grading_method', 'gradingMethod', metadata);
 
   return scoring;
 };

diff --git a/src/editors/data/constants/problem.js b/src/editors/data/constants/problem.js
@@ -216,28 +216,28 @@ export const RandomizationTypes = StrictDict({
   },
 });
 
-export const GradingStrategyKeys = StrictDict({
+export const GradingMethodKeys = StrictDict({
   LAST_SCORE: 'last_score',
   HIGHEST_SCORE: 'highest_score',
   AVERAGE_SCORE: 'average_score',
   FIRST_SCORE: 'first_score',
 });
 
-export const GradingStrategy = StrictDict({
-  [GradingStrategyKeys.LAST_SCORE]: {
-    id: 'authoring.problemeditor.settings.gradingstrategy.last_score',
+export const GradingMethod = StrictDict({
+  [GradingMethodKeys.LAST_SCORE]: {
+    id: 'authoring.problemeditor.settings.gradingmethod.last_score',
     defaultMessage: 'Last Score',
   },
-  [GradingStrategyKeys.HIGHEST_SCORE]: {
-    id: 'authoring.problemeditor.settings.gradingstrategy.highest_score',
+  [GradingMethodKeys.HIGHEST_SCORE]: {
+    id: 'authoring.problemeditor.settings.gradingmethod.highest_score',
     defaultMessage: 'Highest Score',
   },
-  [GradingStrategyKeys.AVERAGE_SCORE]: {
-    id: 'authoring.problemeditor.settings.gradingstrategy.average_score',
+  [GradingMethodKeys.AVERAGE_SCORE]: {
+    id: 'authoring.problemeditor.settings.gradingmethod.average_score',
     defaultMessage: 'Average Score',
   },
-  [GradingStrategyKeys.FIRST_SCORE]: {
-    id: 'authoring.problemeditor.settings.gradingstrategy.first_score',
+  [GradingMethodKeys.FIRST_SCORE]: {
+    id: 'authoring.problemeditor.settings.gradingmethod.first_score',
     defaultMessage: 'First Score',
   },
 });
@@ -252,5 +252,5 @@ export const settingsOlxAttributes = [
   '@_show_reset_button',
   '@_submission_wait_seconds',
   '@_attempts_before_showanswer_button',
-  '@_grading_strategy',
+  '@_grading_method',
 ];
diff --git a/src/editors/data/redux/problem/reducers.js b/src/editors/data/redux/problem/reducers.js
@@ -2,7 +2,7 @@ import _ from 'lodash-es';
 import { createSlice } from '@reduxjs/toolkit';
 import { indexToLetterMap } from '../../../containers/ProblemEditor/data/OLXParser';
 import { StrictDict } from '../../../utils';
-import { GradingStrategyKeys, ProblemTypeKeys, RichTextProblems } from '../../constants/problem';
+import { GradingMethodKeys, ProblemTypeKeys, RichTextProblems } from '../../constants/problem';
 import { ToleranceTypes } from '../../../containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/Tolerance/constants';
 
 const nextAlphaId = (lastId) => String.fromCharCode(lastId.charCodeAt(0) + 1);
@@ -24,7 +24,7 @@ const initialState = {
         unlimited: false,
         number: null,
       },
-      gradingStrategy: GradingStrategyKeys.LAST_SCORE,
+      gradingMethod: GradingMethodKeys.LAST_SCORE,
     },
     hints: [],
     timeBetween: 0,