Rename courseUsageKey to courseId

This commit is contained in:
David Joy
2020-03-23 17:26:33 -04:00
parent c8be4c401f
commit 8f4ff79351
15 changed files with 80 additions and 80 deletions

View File

@@ -22,13 +22,13 @@ function normalizeMetadata(metadata) {
};
}
export async function getCourseMetadata(courseUsageKey) {
const url = `${getConfig().LMS_BASE_URL}/api/courseware/course/${courseUsageKey}`;
export async function getCourseMetadata(courseId) {
const url = `${getConfig().LMS_BASE_URL}/api/courseware/course/${courseId}`;
const { data } = await getAuthenticatedHttpClient().get(url);
return normalizeMetadata(data);
}
function normalizeBlocks(courseUsageKey, blocks) {
function normalizeBlocks(courseId, blocks) {
const models = {
courses: {},
sections: {},
@@ -39,7 +39,7 @@ function normalizeBlocks(courseUsageKey, blocks) {
switch (block.type) {
case 'course':
models.courses[block.id] = {
id: courseUsageKey,
id: courseId,
title: block.display_name,
sectionIds: block.children || [],
};
@@ -101,16 +101,16 @@ function normalizeBlocks(courseUsageKey, blocks) {
return models;
}
export async function getCourseBlocks(courseUsageKey) {
export async function getCourseBlocks(courseId) {
const { username } = getAuthenticatedUser();
const url = new URL(`${getConfig().LMS_BASE_URL}/api/courses/v2/blocks/`);
url.searchParams.append('course_id', courseUsageKey);
url.searchParams.append('course_id', courseId);
url.searchParams.append('username', username);
url.searchParams.append('depth', 3);
url.searchParams.append('requested_fields', 'children,show_gated_sections');
const { data } = await getAuthenticatedHttpClient().get(url.href, {});
return normalizeBlocks(courseUsageKey, data.blocks);
return normalizeBlocks(courseId, data.blocks);
}
function normalizeSequenceMetadata(sequence) {

View File

@@ -9,21 +9,21 @@ const slice = createSlice({
name: 'courseware',
initialState: {
courseStatus: 'loading',
courseUsageKey: null,
courseId: null,
sequenceStatus: 'loading',
sequenceId: null,
},
reducers: {
fetchCourseRequest: (state, { payload }) => {
state.courseUsageKey = payload.courseUsageKey;
state.courseId = payload.courseId;
state.courseStatus = LOADING;
},
fetchCourseSuccess: (state, { payload }) => {
state.courseUsageKey = payload.courseUsageKey;
state.courseId = payload.courseId;
state.courseStatus = LOADED;
},
fetchCourseFailure: (state, { payload }) => {
state.courseUsageKey = payload.courseUsageKey;
state.courseId = payload.courseId;
state.courseStatus = FAILED;
},
fetchSequenceRequest: (state, { payload }) => {

View File

@@ -16,12 +16,12 @@ import {
fetchSequenceFailure,
} from './slice';
export function fetchCourse(courseUsageKey) {
export function fetchCourse(courseId) {
return async (dispatch) => {
dispatch(fetchCourseRequest({ courseUsageKey }));
dispatch(fetchCourseRequest({ courseId }));
Promise.all([
getCourseBlocks(courseUsageKey),
getCourseMetadata(courseUsageKey),
getCourseBlocks(courseId),
getCourseMetadata(courseId),
]).then(([
{
courses, sections, sequences, units,
@@ -49,10 +49,10 @@ export function fetchCourse(courseUsageKey) {
modelType: 'units',
modelsMap: units,
}));
dispatch(fetchCourseSuccess({ courseUsageKey }));
dispatch(fetchCourseSuccess({ courseId }));
}).catch((error) => {
logError(error);
dispatch(fetchCourseFailure({ courseUsageKey }));
dispatch(fetchCourseFailure({ courseId }));
});
};
}