diff --git a/src/course-checklist/AriaLiveRegion.jsx b/src/course-checklist/AriaLiveRegion.jsx index 06685be3d..7bbedceda 100644 --- a/src/course-checklist/AriaLiveRegion.jsx +++ b/src/course-checklist/AriaLiveRegion.jsx @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { injectIntl, FormattedMessage } from '@edx/frontend-platform/i18n'; +import { FormattedMessage } from '@edx/frontend-platform/i18n'; import messages from './messages'; @@ -33,4 +33,4 @@ AriaLiveRegion.propTypes = { enableQuality: PropTypes.bool.isRequired, }; -export default injectIntl(AriaLiveRegion); +export default AriaLiveRegion; diff --git a/src/course-checklist/ChecklistSection/ChecklistSection.jsx b/src/course-checklist/ChecklistSection/ChecklistSection.jsx index 3b11b6e05..0d3e6a32f 100644 --- a/src/course-checklist/ChecklistSection/ChecklistSection.jsx +++ b/src/course-checklist/ChecklistSection/ChecklistSection.jsx @@ -1,8 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { injectIntl } from '@edx/frontend-platform/i18n'; import { Container, Stack } from '@openedx/paragon'; - import { LoadingSpinner } from '../../generic/Loading'; import { getCompletionCount, useChecklistState } from './hooks'; import ChecklistItemBody from './ChecklistItemBody'; @@ -129,4 +127,4 @@ ChecklistSection.propTypes = { isLoading: PropTypes.bool.isRequired, }; -export default injectIntl(ChecklistSection); +export default ChecklistSection; diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ShowAnswerCard.jsx b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ShowAnswerCard.jsx index 77a2163c6..414233d53 100644 --- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ShowAnswerCard.jsx +++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ShowAnswerCard.jsx @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { connect } from 'react-redux'; -import { injectIntl, FormattedMessage, intlShape } from '@edx/frontend-platform/i18n'; +import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n'; import { Form, Hyperlink } from '@openedx/paragon'; import SettingsOption from '../SettingsOption'; import { ShowAnswerTypes, ShowAnswerTypesKeys } from '../../../../../../data/constants/problem'; @@ -13,13 +13,12 @@ const ShowAnswerCard = ({ showAnswer, updateSettings, defaultValue, - // inject - intl, // redux studioEndpointUrl, learningContextId, isLibrary, }) => { + const intl = useIntl(); const { handleShowAnswerChange, handleAttemptsChange, @@ -90,7 +89,6 @@ const ShowAnswerCard = ({ }; ShowAnswerCard.propTypes = { - intl: intlShape.isRequired, // eslint-disable-next-line showAnswer: PropTypes.any.isRequired, solutionExplanation: PropTypes.string, @@ -115,4 +113,4 @@ export const mapStateToProps = (state) => ({ export const mapDispatchToProps = {}; export const ShowAnswerCardInternal = ShowAnswerCard; // For testing only -export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ShowAnswerCard)); +export default connect(mapStateToProps, mapDispatchToProps)(ShowAnswerCard); diff --git a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ShowAnswerCard.test.tsx b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ShowAnswerCard.test.tsx index 5e42cd7a8..84ba1b371 100644 --- a/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ShowAnswerCard.test.tsx +++ b/src/editors/containers/ProblemEditor/components/EditProblemView/SettingsWidget/settingsComponents/ShowAnswerCard.test.tsx @@ -2,7 +2,6 @@ import React from 'react'; import { render, screen, initializeMocks, } from '@src/testUtils'; -import { formatMessage } from '@src/editors/testUtils'; import { selectors } from '../../../../../../data/redux'; import { ShowAnswerCardInternal as ShowAnswerCard, mapStateToProps, mapDispatchToProps } from './ShowAnswerCard'; import * as hooks from '../hooks'; @@ -25,15 +24,12 @@ describe('ShowAnswerCard', () => { on: 'after_attempts', afterAttempts: 5, updateSettings: jest.fn().mockName('args.updateSettings'), - intl: { formatMessage }, }; const props = { showAnswer, defaultValue: 'finished', updateSettings: jest.fn(), - // injected - intl: { formatMessage }, // redux studioEndpointUrl: 'SoMEeNDpOinT', learningContextId: 'sOMEcouRseId', diff --git a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/ImportTranscriptCard.jsx b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/ImportTranscriptCard.jsx index 21983b45f..9349a6358 100644 --- a/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/ImportTranscriptCard.jsx +++ b/src/editors/containers/VideoEditor/components/VideoSettingsModal/components/TranscriptWidget/ImportTranscriptCard.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; -import { FormattedMessage, injectIntl } from '@edx/frontend-platform/i18n'; +import { FormattedMessage } from '@edx/frontend-platform/i18n'; import { ActionRow, Button, @@ -58,4 +58,4 @@ export const mapDispatchToProps = { }; export const ImportTranscriptCardInternal = ImportTranscriptCard; // For testing only -export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(ImportTranscriptCard)); +export default connect(mapStateToProps, mapDispatchToProps)(ImportTranscriptCard); diff --git a/src/editors/example.jsx b/src/editors/example.jsx index 2e6985340..63abb78c0 100644 --- a/src/editors/example.jsx +++ b/src/editors/example.jsx @@ -15,7 +15,7 @@ import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import { Spinner } from '@openedx/paragon'; -import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; +import { useIntl } from '@edx/frontend-platform/i18n'; import EditorContainer from '../EditorContainer'; // This 'module' self-import hack enables mocking during tests. @@ -32,48 +32,51 @@ export const hooks = { }), }; -export const thumbEditor = ({ - onClose, - // redux - blockValue, - lmsEndpointUrl, - blockFailed, - blockFinished, - initializeEditor, - // inject - intl, -}) => ( - -
- {!blockFinished - ? ( -
- -
- ) - : ( -

- Your Editor Goes here. - You can get at the xblock data with the blockValue field. - here is what is in your xblock: {JSON.stringify(blockValue)} -

- )} -
- -); -thumbEditor.defaultProps = { +export const ThumbEditor = ( + { + onClose, + // redux + blockValue, + lmsEndpointUrl, + blockFailed, + blockFinished, + initializeEditor, + }, +) => { + const intl = useIntl(); + return ( + +
+ {!blockFinished + ? ( +
+ +
+ ) + : ( +

+ Your Editor Goes here. + You can get at the xblock data with the blockValue field. + here is what is in your xblock: {JSON.stringify(blockValue)} +

+ )} +
+ + ); +}; +ThumbEditor.defaultProps = { blockValue: null, lmsEndpointUrl: null, }; -thumbEditor.propTypes = { +ThumbEditor.propTypes = { onClose: PropTypes.func.isRequired, // redux blockValue: PropTypes.shape({ @@ -83,8 +86,6 @@ thumbEditor.propTypes = { blockFailed: PropTypes.bool.isRequired, blockFinished: PropTypes.bool.isRequired, initializeEditor: PropTypes.func.isRequired, - // inject - intl: intlShape.isRequired, }; export const mapStateToProps = (state) => ({ @@ -98,4 +99,4 @@ export const mapDispatchToProps = { initializeEditor: actions.app.initializeEditor, }; -export default injectIntl(connect(mapStateToProps, mapDispatchToProps)(thumbEditor)); +export default connect(mapStateToProps, mapDispatchToProps)(ThumbEditor); diff --git a/src/editors/sharedComponents/ErrorBoundary/ErrorPage.jsx b/src/editors/sharedComponents/ErrorBoundary/ErrorPage.jsx index f4c32c13d..36e7614ff 100644 --- a/src/editors/sharedComponents/ErrorBoundary/ErrorPage.jsx +++ b/src/editors/sharedComponents/ErrorBoundary/ErrorPage.jsx @@ -3,8 +3,7 @@ import PropTypes from 'prop-types'; import { Button, Container, Row, Col, } from '@openedx/paragon'; - -import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; +import { useIntl } from '@edx/frontend-platform/i18n'; import messages from './messages'; import { isLibraryV1Key } from '../../../generic/key-utils'; import { navigateTo } from '../../hooks'; @@ -20,9 +19,8 @@ const ErrorPage = ({ learningContextId, // redux unitData, - // injected - intl, }) => { + const intl = useIntl(); const outlineType = isLibraryV1Key(learningContextId) ? 'library' : 'course'; const outlineUrl = `${studioEndpointUrl}/${outlineType}/${learningContextId}`; const unitUrl = unitData?.data ? `${studioEndpointUrl}/container/${unitData?.data.ancestors[0].id}` : null; @@ -73,8 +71,6 @@ ErrorPage.propTypes = { ), }), }), - // injected - intl: intlShape.isRequired, }; ErrorPage.defaultProps = { @@ -87,4 +83,4 @@ export const mapStateToProps = (state) => ({ }); export const ErrorPageInternal = ErrorPage; // For testing only -export default injectIntl(connect(mapStateToProps)(ErrorPage)); +export default connect(mapStateToProps)(ErrorPage); diff --git a/src/editors/sharedComponents/ErrorBoundary/ErrorPage.test.tsx b/src/editors/sharedComponents/ErrorBoundary/ErrorPage.test.tsx index 6e2c635c5..1782b1dd8 100644 --- a/src/editors/sharedComponents/ErrorBoundary/ErrorPage.test.tsx +++ b/src/editors/sharedComponents/ErrorBoundary/ErrorPage.test.tsx @@ -1,6 +1,5 @@ import React from 'react'; import { render, screen, initializeMocks } from '@src/testUtils'; -import { formatMessage } from '../../testUtils'; import { ErrorPageInternal as ErrorPage } from './ErrorPage'; jest.mock('../../data/redux', () => ({ @@ -15,13 +14,11 @@ describe('Editor Page', () => { const emptyProps = { learningContextId: 'course-v1:edX+DemoX+Demo_Course', studioEndpointUrl: 'fakeurl.com', - intl: { formatMessage }, }; const passedProps = { learningContextId: 'course-v1:edX+DemoX+Demo_Course', studioEndpointUrl: 'fakeurl.com', message: 'cUStomMEssagE', - intl: { formatMessage }, }; const unitData = { data: { diff --git a/src/files-and-videos/generic/table-components/table-custom-columns/AccessColumn.jsx b/src/files-and-videos/generic/table-components/table-custom-columns/AccessColumn.jsx index 03faad33c..113b5da0e 100644 --- a/src/files-and-videos/generic/table-components/table-custom-columns/AccessColumn.jsx +++ b/src/files-and-videos/generic/table-components/table-custom-columns/AccessColumn.jsx @@ -2,14 +2,11 @@ import React from 'react'; import { PropTypes } from 'prop-types'; import { Icon, OverlayTrigger, Tooltip } from '@openedx/paragon'; import { Locked, LockOpen } from '@openedx/paragon/icons'; -import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; +import { useIntl } from '@edx/frontend-platform/i18n'; import messages from '../../messages'; -const AccessColumn = ({ - row, - // injected - intl, -}) => { +const AccessColumn = ({ row }) => { + const intl = useIntl(); const { locked } = row.original; return ( { + const intl = useIntl(); const [errorEffort, setErrorEffort] = useState(false); const handleCreditChange = (e) => { @@ -60,7 +65,6 @@ const CreditSection = ({ }; CreditSection.propTypes = { - intl: intlShape.isRequired, eligibleGrade: PropTypes.number.isRequired, setShowSavePrompt: PropTypes.func.isRequired, setGradingData: PropTypes.func.isRequired, @@ -68,4 +72,4 @@ CreditSection.propTypes = { minimumGradeCredit: PropTypes.number.isRequired, }; -export default injectIntl(CreditSection); +export default CreditSection; diff --git a/src/head/Head.jsx b/src/head/Head.jsx index f093b8751..ff560fc15 100644 --- a/src/head/Head.jsx +++ b/src/head/Head.jsx @@ -1,21 +1,20 @@ import React from 'react'; import { Helmet } from 'react-helmet'; -import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; +import { useIntl } from '@edx/frontend-platform/i18n'; import { getConfig } from '@edx/frontend-platform'; import messages from './messages'; -const Head = ({ intl }) => ( - - - {intl.formatMessage(messages['course-authoring.page.title'], { siteName: getConfig().SITE_NAME })} - - - -); - -Head.propTypes = { - intl: intlShape.isRequired, +const Head = () => { + const intl = useIntl(); + return ( + + + {intl.formatMessage(messages['course-authoring.page.title'], { siteName: getConfig().SITE_NAME })} + + + + ); }; -export default injectIntl(Head); +export default Head; diff --git a/src/pages-and-resources/discussions/app-list/FeaturesList.jsx b/src/pages-and-resources/discussions/app-list/FeaturesList.jsx index 18296d881..e28a1e3ff 100644 --- a/src/pages-and-resources/discussions/app-list/FeaturesList.jsx +++ b/src/pages-and-resources/discussions/app-list/FeaturesList.jsx @@ -1,40 +1,42 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Collapsible } from '@openedx/paragon'; -import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; +import { useIntl } from '@edx/frontend-platform/i18n'; import SupportedFeature from './SupportedFeature'; import messages from './messages'; -const FeaturesList = ({ app, intl }) => ( - event.stopPropagation()} - title={( - <> - - {intl.formatMessage(messages['supportedFeatureList-mobile-show'])} - - - {intl.formatMessage(messages['supportedFeatureList-mobile-hide'])} - - - )} - styling="basic" - > - {app.featureIds.map((id) => ( -
- -
- ))} - -); +const FeaturesList = ({ app }) => { + const intl = useIntl(); + return ( + event.stopPropagation()} + title={( + <> + + {intl.formatMessage(messages['supportedFeatureList-mobile-show'])} + + + {intl.formatMessage(messages['supportedFeatureList-mobile-hide'])} + + + )} + styling="basic" + > + {app.featureIds.map((id) => ( +
+ +
+ ))} + + ); +}; -export default injectIntl(FeaturesList); +export default FeaturesList; FeaturesList.propTypes = { app: PropTypes.shape({ id: PropTypes.string.isRequired, featureIds: PropTypes.shape([]).isRequired, }).isRequired, - intl: intlShape.isRequired, }; diff --git a/src/pages-and-resources/discussions/factories/mockApiResponses.js b/src/pages-and-resources/discussions/factories/mockApiResponses.js index 347c48305..093d74824 100644 --- a/src/pages-and-resources/discussions/factories/mockApiResponses.js +++ b/src/pages-and-resources/discussions/factories/mockApiResponses.js @@ -84,7 +84,7 @@ export const generateProvidersApiResponse = (piazzaAdminOnlyConfig = false, acti 'discussion-page', 'embedded-course-sections', 'wcag-2.1', - 'lti', + 'lti-advanced-sharing-mode', ], external_links: { learn_more: '',