diff --git a/src/containers/ReviewActions/__snapshots__/index.test.jsx.snap b/src/containers/ReviewActions/__snapshots__/index.test.jsx.snap index 8152820..bf3264c 100644 --- a/src/containers/ReviewActions/__snapshots__/index.test.jsx.snap +++ b/src/containers/ReviewActions/__snapshots__/index.test.jsx.snap @@ -20,7 +20,17 @@ exports[`ReviewActions component component snapshot: do not show rubric 1`] = ` - Score: 3/10 +
- Show - Rubric + @@ -68,8 +81,11 @@ exports[`ReviewActions component component snapshot: show rubric, no score 1`] = onClick={[MockFunction this.props.toggleShowRubric]} variant="outline-primary" > - Hide - Rubric + diff --git a/src/containers/ReviewActions/components/OverrideGradeConfirmModal.jsx b/src/containers/ReviewActions/components/OverrideGradeConfirmModal.jsx index 43a7a2f..27cbd52 100644 --- a/src/containers/ReviewActions/components/OverrideGradeConfirmModal.jsx +++ b/src/containers/ReviewActions/components/OverrideGradeConfirmModal.jsx @@ -1,18 +1,22 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; + import ConfirmModal from 'components/ConfirmModal'; +import messages from './messages'; export const OverrideGradeConfirmModal = ({ + intl, isOpen, onCancel, onConfirm, }) => ( 'ConfirmModal'); describe('OverrideGradeConfirmModal', () => { const props = { + intl: { formatMessage }, isOpen: false, onCancel: jest.fn().mockName('this.props.onCancel'), onConfirm: jest.fn().mockName('this.props.onConfirm'), diff --git a/src/containers/ReviewActions/components/StartGradingButton.jsx b/src/containers/ReviewActions/components/StartGradingButton.jsx index a34bca9..22105e5 100644 --- a/src/containers/ReviewActions/components/StartGradingButton.jsx +++ b/src/containers/ReviewActions/components/StartGradingButton.jsx @@ -2,10 +2,9 @@ import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; -import { - Button, -} from '@edx/paragon'; +import { Button } from '@edx/paragon'; import { Cancel, Highlight } from '@edx/paragon/icons'; +import { FormattedMessage } from '@edx/frontend-platform/i18n'; import selectors from 'data/selectors'; import thunkActions from 'data/thunkActions'; @@ -13,18 +12,19 @@ import { gradingStatuses as statuses } from 'data/services/lms/constants'; import StopGradingConfirmModal from './StopGradingConfirmModal'; import OverrideGradeConfirmModal from './OverrideGradeConfirmModal'; +import messages from './messages'; export const buttonArgs = { [statuses.ungraded]: { - label: 'Start Grading', + label: messages.startGrading, iconAfter: Highlight, }, [statuses.graded]: { - label: 'Override grade', + label: messages.overrideGrade, iconAfter: Highlight, }, [statuses.inProgress]: { - label: 'Stop grading this response', + label: messages.stopGrading, iconAfter: Cancel, }, }; @@ -95,7 +95,7 @@ export class StartGradingButton extends React.Component { iconAfter={args.iconAfter} onClick={this.handleClick} > - {args.label} + ({ }, }, })); +jest.mock('./OverrideGradeConfirmModal', () => 'OverrideGradeConfirmModal'); +jest.mock('./StopGradingConfirmModal', () => 'StopGradingConfirmModal'); let el; diff --git a/src/containers/ReviewActions/components/StopGradingConfirmModal.jsx b/src/containers/ReviewActions/components/StopGradingConfirmModal.jsx index 1e75cfb..edce7c8 100644 --- a/src/containers/ReviewActions/components/StopGradingConfirmModal.jsx +++ b/src/containers/ReviewActions/components/StopGradingConfirmModal.jsx @@ -1,25 +1,27 @@ import React from 'react'; import PropTypes from 'prop-types'; +import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; + import ConfirmModal from 'components/ConfirmModal'; +import messages from './messages'; export const StopGradingConfirmModal = ({ + intl, isOpen, isOverride, onCancel, onConfirm, }) => ( 'ConfirmModal'); describe('StopGradingConfirmModal', () => { const props = { + intl: { formatMessage }, isOpen: false, isOverride: false, onCancel: jest.fn().mockName('this.props.onCancel'), diff --git a/src/containers/ReviewActions/components/SubmissionNavigation.jsx b/src/containers/ReviewActions/components/SubmissionNavigation.jsx index 8cbf6b7..f755737 100644 --- a/src/containers/ReviewActions/components/SubmissionNavigation.jsx +++ b/src/containers/ReviewActions/components/SubmissionNavigation.jsx @@ -4,14 +4,17 @@ import { connect } from 'react-redux'; import { Icon, IconButton } from '@edx/paragon'; import { ChevronLeft, ChevronRight } from '@edx/paragon/icons'; +import { FormattedMessage, injectIntl, intlShape } from '@edx/frontend-platform/i18n'; import selectors from 'data/selectors'; import thunkActions from 'data/thunkActions'; +import messages from './messages'; /** * */ export const SubmissionNavigation = ({ + intl, hasPrevSubmission, hasNextSubmission, loadPrev, @@ -21,18 +24,25 @@ export const SubmissionNavigation = ({ }) => ( - {activeIndex + 1} of {selectionLength} + + + ({ describe('SubmissionNavigation component', () => { describe('component', () => { const props = { + intl: { formatMessage }, activeIndex: 4, selectionLength: 5, }; diff --git a/src/containers/ReviewActions/components/__snapshots__/OverrideGradeConfirmModal.test.jsx.snap b/src/containers/ReviewActions/components/__snapshots__/OverrideGradeConfirmModal.test.jsx.snap index a62f2f9..5cc823a 100644 --- a/src/containers/ReviewActions/components/__snapshots__/OverrideGradeConfirmModal.test.jsx.snap +++ b/src/containers/ReviewActions/components/__snapshots__/OverrideGradeConfirmModal.test.jsx.snap @@ -4,7 +4,7 @@ exports[`OverrideGradeConfirmModal snapshot: closed 1`] = ` - Override grade + - Stop grading this response + - Start Grading + - - 5 - of - 5 + + - - 1 - of - 5 + + {username} - {pointsPossible && `Score: ${pointsEarned}/${pointsPossible}`} + {pointsEarned && ( + + )}
diff --git a/src/containers/ReviewActions/messages.js b/src/containers/ReviewActions/messages.js new file mode 100644 index 0000000..16b03ab --- /dev/null +++ b/src/containers/ReviewActions/messages.js @@ -0,0 +1,21 @@ +import { defineMessages } from '@edx/frontend-platform/i18n'; + +const messages = defineMessages({ + scoreDisplay: { + id: 'ora-grading.ReviewActions.scoreDisplay', + defaultMessage: 'Score: {pointsEarned}/{pointsPossible}', + description: 'Review pane action bar score display', + }, + hideRubric: { + id: 'ora-grading.ReviewActions.hideRubric', + defaultMessage: 'Hide Rubric', + description: 'Review pane action bar Hide Rubric button text', + }, + showRubric: { + id: 'ora-grading.ReviewActions.showRubric', + defaultMessage: 'Show Rubric', + description: 'Review pane action bar Show Rubric button text', + }, +}); + +export default messages;