From af2b4dd3cbcda08bd774740e51a46e212c585ab7 Mon Sep 17 00:00:00 2001 From: Braden MacDonald Date: Tue, 27 Aug 2024 14:27:46 -0700 Subject: [PATCH] fix: remove another accidental import of test code from the build --- .../TitleHeader/EditConfirmationButtons.jsx | 49 +++++++++---------- .../EditConfirmationButtons.test.jsx | 2 +- .../components/TitleHeader/EditableHeader.jsx | 2 +- .../TitleHeader/EditableHeader.test.jsx | 2 +- src/editors/setupEditorTest.js | 1 + 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/editors/containers/EditorContainer/components/TitleHeader/EditConfirmationButtons.jsx b/src/editors/containers/EditorContainer/components/TitleHeader/EditConfirmationButtons.jsx index 32d64e52c..6b53531cf 100644 --- a/src/editors/containers/EditorContainer/components/TitleHeader/EditConfirmationButtons.jsx +++ b/src/editors/containers/EditorContainer/components/TitleHeader/EditConfirmationButtons.jsx @@ -3,39 +3,38 @@ import PropTypes from 'prop-types'; import { IconButtonWithTooltip, ButtonGroup, Icon } from '@openedx/paragon'; import { Check, Close } from '@openedx/paragon/icons'; -import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; +import { useIntl } from '@edx/frontend-platform/i18n'; import messages from './messages'; const EditConfirmationButtons = ({ updateTitle, cancelEdit, - // injected - intl, -}) => ( - - - - -); +}) => { + const intl = useIntl(); + return ( + + + + + ); +}; EditConfirmationButtons.propTypes = { updateTitle: PropTypes.func.isRequired, cancelEdit: PropTypes.func.isRequired, - // injected - intl: intlShape.isRequired, }; -export const EditConfirmationButtonsInternal = EditConfirmationButtons; // For testing only -export default injectIntl(EditConfirmationButtons); + +export default EditConfirmationButtons; diff --git a/src/editors/containers/EditorContainer/components/TitleHeader/EditConfirmationButtons.test.jsx b/src/editors/containers/EditorContainer/components/TitleHeader/EditConfirmationButtons.test.jsx index 99361275a..e69ff16b5 100644 --- a/src/editors/containers/EditorContainer/components/TitleHeader/EditConfirmationButtons.test.jsx +++ b/src/editors/containers/EditorContainer/components/TitleHeader/EditConfirmationButtons.test.jsx @@ -3,7 +3,7 @@ import React from 'react'; import { shallow } from '@edx/react-unit-test-utils'; import { formatMessage } from '../../../../testUtils'; -import { EditConfirmationButtonsInternal as EditConfirmationButtons } from './EditConfirmationButtons'; +import EditConfirmationButtons from './EditConfirmationButtons'; describe('EditConfirmationButtons', () => { const props = { diff --git a/src/editors/containers/EditorContainer/components/TitleHeader/EditableHeader.jsx b/src/editors/containers/EditorContainer/components/TitleHeader/EditableHeader.jsx index fe51bcd33..ba212f162 100644 --- a/src/editors/containers/EditorContainer/components/TitleHeader/EditableHeader.jsx +++ b/src/editors/containers/EditorContainer/components/TitleHeader/EditableHeader.jsx @@ -2,7 +2,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Form } from '@openedx/paragon'; -import { EditConfirmationButtonsInternal as EditConfirmationButtons } from './EditConfirmationButtons'; +import EditConfirmationButtons from './EditConfirmationButtons'; const EditableHeader = ({ handleChange, diff --git a/src/editors/containers/EditorContainer/components/TitleHeader/EditableHeader.test.jsx b/src/editors/containers/EditorContainer/components/TitleHeader/EditableHeader.test.jsx index 66c170585..349b89b5a 100644 --- a/src/editors/containers/EditorContainer/components/TitleHeader/EditableHeader.test.jsx +++ b/src/editors/containers/EditorContainer/components/TitleHeader/EditableHeader.test.jsx @@ -3,7 +3,7 @@ import React from 'react'; import { shallow } from '@edx/react-unit-test-utils'; import { Form } from '@openedx/paragon'; import { EditableHeaderInternal as EditableHeader } from './EditableHeader'; -import { EditConfirmationButtonsInternal as EditConfirmationButtons } from './EditConfirmationButtons'; +import EditConfirmationButtons from './EditConfirmationButtons'; describe('EditableHeader', () => { const props = { diff --git a/src/editors/setupEditorTest.js b/src/editors/setupEditorTest.js index 54b23ca0a..47df9429a 100644 --- a/src/editors/setupEditorTest.js +++ b/src/editors/setupEditorTest.js @@ -8,6 +8,7 @@ jest.mock('@edx/frontend-platform/i18n', () => { const PropTypes = jest.requireActual('prop-types'); return { ...i18n, + useIntl: () => ({ formatMessage: (m) => m.defaultMessage }), intlShape: PropTypes.shape({ formatMessage: PropTypes.func, }),