Switching the MFE to use the new permissions fields (#43)

- “userHasAccess” becomes “canLoadCourseware”, and is loaded from “can_load_courseware”
- “isStaff” is now loaded from “is_staff” instead of “user_has_staff_access”
This commit is contained in:
David Joy
2020-04-06 15:32:50 -04:00
committed by GitHub
parent b4fbd1cf83
commit a10e6c2826
4 changed files with 7 additions and 7 deletions

View File

@@ -15,8 +15,8 @@ function normalizeMetadata(metadata) {
start: metadata.start,
enrollmentMode: metadata.enrollment.mode,
isEnrolled: metadata.enrollment.is_active,
userHasAccess: metadata.user_has_access,
isStaff: metadata.user_has_staff_access,
canLoadCourseware: metadata.can_load_courseware,
isStaff: metadata.is_staff,
verifiedMode: camelCaseObject(metadata.verified_mode),
tabs: camelCaseObject(metadata.tabs),
showCalculator: metadata.show_calculator,

View File

@@ -68,7 +68,7 @@ export function fetchCourse(courseId) {
}
if (fetchedMetadata) {
if (courseMetadataResult.value.userHasAccess && fetchedBlocks) {
if (courseMetadataResult.value.canLoadCourseware && fetchedBlocks) {
// User has access
dispatch(fetchCourseSuccess({ courseId }));
return;

View File

@@ -10,7 +10,7 @@ export function useEnrollmentAlert(courseId) {
const isEnrolled = course && course.isEnrolled;
useEffect(() => {
if (course && course.isEnrolled !== undefined) {
if (!course.isEnrolled) {
if (!course.isEnrolled && alertId === null) {
if (course.isStaff) {
setAlertId(add({
code: 'clientStaffEnrollmentAlert',
@@ -22,7 +22,7 @@ export function useEnrollmentAlert(courseId) {
topic: 'course',
}));
}
} else if (alertId !== null) {
} else if (course.isEnrolled && alertId !== null) {
remove(alertId);
setAlertId(null);
}

View File

@@ -8,14 +8,14 @@ export function useLogistrationAlert() {
const { add, remove } = useContext(UserMessagesContext);
const [alertId, setAlertId] = useState(null);
useEffect(() => {
if (authenticatedUser === null) {
if (authenticatedUser === null && alertId === null) {
setAlertId(add({
code: 'clientLogistrationAlert',
dismissible: false,
type: 'error',
topic: 'course',
}));
} else if (alertId !== null) {
} else if (authenticatedUser !== null && alertId !== null) {
remove(alertId);
setAlertId(null);
}