This reverts commit 55b3396acd.
This commit is contained in:
committed by
GitHub
parent
55b3396acd
commit
20390d1e33
@@ -1,4 +1,4 @@
|
||||
import React, { useEffect } from 'react';
|
||||
import React from 'react';
|
||||
|
||||
import { getConfig } from '@edx/frontend-platform';
|
||||
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
|
||||
@@ -11,7 +11,6 @@ import CourseInProgress from './CourseInProgress';
|
||||
import CourseNonPassing from './CourseNonPassing';
|
||||
import { COURSE_EXIT_MODES, getCourseExitMode } from './utils';
|
||||
import messages from './messages';
|
||||
import { unsubscribeFromGoalReminders } from './data/thunks';
|
||||
|
||||
import { useModel } from '../../../generic/model-store';
|
||||
|
||||
@@ -19,7 +18,6 @@ function CourseExit({ intl }) {
|
||||
const { courseId } = useSelector(state => state.courseware);
|
||||
const {
|
||||
certificateData,
|
||||
enrollmentMode,
|
||||
hasScheduledContent,
|
||||
isEnrolled,
|
||||
userHasPassingGrade,
|
||||
@@ -34,15 +32,6 @@ function CourseExit({ intl }) {
|
||||
courseExitPageIsActive,
|
||||
);
|
||||
|
||||
// Audit users cannot fully complete a course, so we will
|
||||
// unsubscribe them from goal reminders once they reach the course exit page
|
||||
// to avoid spamming them with goal reminder emails
|
||||
if (enrollmentMode === 'audit') {
|
||||
useEffect(() => {
|
||||
unsubscribeFromGoalReminders(courseId);
|
||||
}, []);
|
||||
}
|
||||
|
||||
let body = null;
|
||||
if (mode === COURSE_EXIT_MODES.nonPassing) {
|
||||
body = (<CourseNonPassing />);
|
||||
|
||||
@@ -3,7 +3,6 @@ import MockAdapter from 'axios-mock-adapter';
|
||||
import { Factory } from 'rosie';
|
||||
import { getConfig } from '@edx/frontend-platform';
|
||||
import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
|
||||
import { waitFor } from '@testing-library/react';
|
||||
|
||||
import { fetchCourse } from '../../data';
|
||||
import { buildSimpleCourseBlocks } from '../../../shared/data/__factories__/courseBlocks.factory';
|
||||
@@ -378,18 +377,4 @@ describe('Course Exit Pages', () => {
|
||||
expect(screen.getByRole('link', { name: 'View course schedule' })).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
it('unsubscribes the user when loading the course exit page', async () => {
|
||||
setMetadata({
|
||||
enrollment: {
|
||||
mode: 'audit',
|
||||
},
|
||||
});
|
||||
await fetchAndRender(<CourseExit />);
|
||||
const url = `${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`;
|
||||
await waitFor(() => {
|
||||
expect(axiosMock.history.post[0].url).toMatch(url);
|
||||
expect(axiosMock.history.post[0].data).toMatch(`{"course_id":"${defaultMetadata.id}","subscribed_to_reminders":false}`);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -23,7 +23,7 @@ function filterRecommendationsList(
|
||||
));
|
||||
}
|
||||
|
||||
export async function getCourseRecommendations(courseKey) {
|
||||
export default async function getCourseRecommendations(courseKey) {
|
||||
const discoveryApiUrl = getConfig().DISCOVERY_API_BASE_URL;
|
||||
if (!discoveryApiUrl) {
|
||||
return [];
|
||||
@@ -36,11 +36,3 @@ export async function getCourseRecommendations(courseKey) {
|
||||
]);
|
||||
return filterRecommendationsList(camelCaseObject(recommendationsResponse), camelCaseObject(enrollmentsResponse));
|
||||
}
|
||||
|
||||
export async function postUnsubscribeFromGoalReminders(courseId) {
|
||||
const url = new URL(`${getConfig().LMS_BASE_URL}/api/course_home/save_course_goal`);
|
||||
return getAuthenticatedHttpClient().post(url.href, {
|
||||
course_id: courseId,
|
||||
subscribed_to_reminders: false,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -5,10 +5,7 @@ import {
|
||||
fetchCourseRecommendationsRequest,
|
||||
fetchCourseRecommendationsSuccess,
|
||||
} from './slice';
|
||||
import {
|
||||
getCourseRecommendations,
|
||||
postUnsubscribeFromGoalReminders,
|
||||
} from './api';
|
||||
import getCourseRecommendations from './api';
|
||||
import { updateModel } from '../../../../generic/model-store';
|
||||
|
||||
export default function fetchCourseRecommendations(courseKey, courseId) {
|
||||
@@ -30,7 +27,3 @@ export default function fetchCourseRecommendations(courseKey, courseId) {
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
export async function unsubscribeFromGoalReminders(courseId, daysPerWeek, subscribedToReminders) {
|
||||
return postUnsubscribeFromGoalReminders(courseId, daysPerWeek, subscribedToReminders);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user