diff --git a/src/components/bulk-email-tool/BulkEmailTool.jsx b/src/components/bulk-email-tool/BulkEmailTool.jsx index cf6eda3..ba49550 100644 --- a/src/components/bulk-email-tool/BulkEmailTool.jsx +++ b/src/components/bulk-email-tool/BulkEmailTool.jsx @@ -19,7 +19,7 @@ export default function BulkEmailTool() { return ( - {(courseMetadata) => (courseMetadata.isStaff ? ( + {(courseMetadata) => (courseMetadata.originalUserIsStaff ? (
diff --git a/src/components/bulk-email-tool/test/BulkEmailTool.test.jsx b/src/components/bulk-email-tool/test/BulkEmailTool.test.jsx index aaa6f40..9ea6c9b 100644 --- a/src/components/bulk-email-tool/test/BulkEmailTool.test.jsx +++ b/src/components/bulk-email-tool/test/BulkEmailTool.test.jsx @@ -3,6 +3,7 @@ */ import React from 'react'; import { Factory } from 'rosie'; +import { camelCaseObject } from '@edx/frontend-platform'; import { render, screen, cleanup, initializeMockApp, } from '../../../setupTest'; @@ -36,15 +37,15 @@ describe('BulkEmailTool', () => { */ function buildCourseMetadata(cohortData, courseData) { const { - org, number, title, tabs, is_staff: isStaff, - } = courseData; + org, number, title, tabs, originalUserIsStaff, + } = camelCaseObject(courseData); const { cohorts } = cohortData; return { org, number, title, - isStaff, + originalUserIsStaff, tabs: [...tabs], cohorts: cohorts.map(({ name }) => name), }; @@ -78,7 +79,7 @@ describe('BulkEmailTool', () => { test('BulkEmailTool renders error page on no staff user', async () => { const cohorts = { cohorts: [] }; - const courseInfo = Factory.build('courseMetadata', { is_staff: false }); + const courseInfo = Factory.build('courseMetadata', { original_user_is_staff: false }); const courseMetadata = buildCourseMetadata(cohorts, courseInfo); renderBulkEmailTool(courseMetadata); // verify error page is displayed for user without staff permissions diff --git a/src/components/page-container/PageContainer.jsx b/src/components/page-container/PageContainer.jsx index 220bccc..bb44656 100644 --- a/src/components/page-container/PageContainer.jsx +++ b/src/components/page-container/PageContainer.jsx @@ -31,7 +31,7 @@ export default function PageContainer(props) { org: '', number: '', title: '', - isStaff: false, + originalUserIsStaff: false, tabs: [], cohorts: [], }); @@ -39,7 +39,7 @@ export default function PageContainer(props) { } const { - org, number, title, tabs, is_staff: isStaff, + org, number, title, tabs, originalUserIsStaff, } = metadataResponse; const { cohorts } = cohortsResponse; @@ -47,7 +47,7 @@ export default function PageContainer(props) { org, number, title, - isStaff, + originalUserIsStaff, tabs: [...tabs], cohorts: cohorts.map(({ name }) => name), }); diff --git a/src/components/page-container/data/__factories__/courseMetadata.factory.js b/src/components/page-container/data/__factories__/courseMetadata.factory.js index f09aafb..1b1fc1c 100644 --- a/src/components/page-container/data/__factories__/courseMetadata.factory.js +++ b/src/components/page-container/data/__factories__/courseMetadata.factory.js @@ -6,7 +6,7 @@ export default Factory.define('courseMetadata') .option('host', 'http://localhost:18000') .attrs({ is_staff: true, - original_user_is_staff: false, + original_user_is_staff: true, number: 'DemoX', org: 'edX', title: 'Demonstration Course', diff --git a/src/components/page-container/data/api.js b/src/components/page-container/data/api.js index d767e3f..de70663 100644 --- a/src/components/page-container/data/api.js +++ b/src/components/page-container/data/api.js @@ -1,4 +1,4 @@ -import { getConfig } from '@edx/frontend-platform'; +import { camelCaseObject, getConfig } from '@edx/frontend-platform'; import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth'; const courseHomeBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course_metadata`; @@ -6,7 +6,7 @@ const courseHomeBaseUrl = `${getConfig().LMS_BASE_URL}/api/course_home/v1/course export async function getCourseHomeCourseMetadata(courseId) { const courseHomeMetadataUrl = `${courseHomeBaseUrl}/${courseId}`; const { data } = await getAuthenticatedHttpClient().get(courseHomeMetadataUrl); - return data; + return camelCaseObject(data); } export async function getCohorts(courseId) {