Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import {
SpinnerSimple, Cancel, Send, Event, Check,
} from '@openedx/paragon/icons';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { useIntl } from '@edx/frontend-platform/i18n';
import classNames from 'classnames';
import { getConfig } from '@edx/frontend-platform';
import TextEditor from '../text-editor/TextEditor';
Expand Down Expand Up @@ -51,8 +51,8 @@ function BulkEmailForm(props) {
courseId,
cohorts,
courseModes,
intl,
} = props;
const intl = useIntl();
const [{ editor }, dispatch] = useContext(BulkEmailContext);
const [emailFormStatus, setEmailFormStatus] = useState(FORM_SUBMIT_STATES.DEFAULT);
const [emailFormValidation, setEmailFormValidation] = useState({
Expand Down Expand Up @@ -392,7 +392,7 @@ BulkEmailForm.defaultProps = {
BulkEmailForm.propTypes = {
courseId: PropTypes.string.isRequired,
cohorts: PropTypes.arrayOf(PropTypes.string),
intl: intlShape.isRequired,

courseModes: PropTypes.arrayOf(
PropTypes.shape({
slug: PropTypes.string.isRequired,
Expand All @@ -401,4 +401,4 @@ BulkEmailForm.propTypes = {
).isRequired,
};

export default injectIntl(BulkEmailForm);
export default BulkEmailForm;
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import React, { useMemo, useState } from 'react';
import PropTypes from 'prop-types';
import { useParams } from 'react-router-dom';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { useIntl } from '@edx/frontend-platform/i18n';

import {
Button, Collapsible, Icon,
Expand All @@ -14,7 +14,8 @@ import { getSentEmailHistory } from './data/api';
import BulkEmailTaskManagerTable from './BulkEmailHistoryTable';
import ViewEmailModal from './ViewEmailModal';

function BulkEmailContentHistory({ intl }) {
function BulkEmailContentHistory() {
const intl = useIntl();
const { courseId } = useParams();
const [emailHistoryData, setEmailHistoryData] = useState();
const [errorRetrievingData, setErrorRetrievingData] = useState(false);
Expand Down Expand Up @@ -154,7 +155,6 @@ function BulkEmailContentHistory({ intl }) {
}

BulkEmailContentHistory.propTypes = {
intl: intlShape.isRequired,
row: PropTypes.shape({
index: PropTypes.number,
}),
Expand All @@ -164,4 +164,4 @@ BulkEmailContentHistory.defaultProps = {
row: {},
};

export default injectIntl(BulkEmailContentHistory);
export default BulkEmailContentHistory;
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import React, { useState } from 'react';
import { useParams } from 'react-router-dom';

import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { useIntl } from '@edx/frontend-platform/i18n';
import { getInstructorTasks } from './data/api';
import messages from './messages';
import useInterval from '../../../utils/useInterval';
import BulkEmailTaskManagerTable from './BulkEmailHistoryTable';

function BulkEmailPendingTasks({ intl }) {
function BulkEmailPendingTasks() {
const intl = useIntl();
const { courseId } = useParams();

const [instructorTaskData, setInstructorTaskData] = useState();
Expand Down Expand Up @@ -89,8 +90,4 @@ function BulkEmailPendingTasks({ intl }) {
);
}

BulkEmailPendingTasks.propTypes = {
intl: intlShape.isRequired,
};

export default injectIntl(BulkEmailPendingTasks);
export default BulkEmailPendingTasks;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useMemo, useState } from 'react';
import { useParams } from 'react-router-dom';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { useIntl } from '@edx/frontend-platform/i18n';

import { Icon, Collapsible } from '@openedx/paragon';
import { SpinnerSimple } from '@openedx/paragon/icons';
Expand All @@ -11,7 +11,8 @@ import BulkEmailTaskManagerTable from './BulkEmailHistoryTable';

import './bulkEmailTaskHistory.scss';

function BulkEmailTaskHistory({ intl }) {
function BulkEmailTaskHistory() {
const intl = useIntl();
const { courseId } = useParams();

const [emailTaskHistoryData, setEmailTaskHistoryData] = useState([]);
Expand Down Expand Up @@ -117,8 +118,4 @@ function BulkEmailTaskHistory({ intl }) {
);
}

BulkEmailTaskHistory.propTypes = {
intl: intlShape.isRequired,
};

export default injectIntl(BulkEmailTaskHistory);
export default BulkEmailTaskHistory;