Skip to content

fix: make progress graph respect course settings #1189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RafayGhafoor wants to merge 2 commits into from
Closed

fix: make progress graph respect course settings #1189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75ec5c0
fix: make progress graph respect course settings
RafayGhafoor Sep 20, 2023
212059d
Merge branch 'master' of github.com:RafayGhafoor/frontend-app-learnin…
RafayGhafoor Sep 20, 2023
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
7 changes: 7 additions & 0 deletions src/course-home/data/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,13 @@ export async function getCourseHomeCourseMetadata(courseId, rootSlug) {
return normalizeCourseHomeCourseMetadata(data, rootSlug);
}

export async function getCourseAdvancedSettings(courseId) {
let url = `${getConfig().STUDIO_BASE_URL}/api/contentstore/v0/advanced_settings/${courseId}`;
url = appendBrowserTimezoneToUrl(url);
const { data } = await getAuthenticatedHttpClient().get(url);
return data;
}

// For debugging purposes, you might like to see a fully loaded dates tab.
// Just uncomment the next few lines and the immediate 'return' in the function below
// import { Factory } from 'rosie';
Expand Down
13 changes: 13 additions & 0 deletions src/course-home/data/thunks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { camelCaseObject } from '@edx/frontend-platform';
import {
executePostFromPostEvent,
getCourseHomeCourseMetadata,
getCourseAdvancedSettings,
getDatesTabData,
getOutlineTabData,
getProgressTabData,
Expand Down Expand Up @@ -42,6 +43,18 @@ export function fetchTab(courseId, tab, getTabData, targetUserId) {
...courseHomeCourseMetadata,
},
}));

if (tab === 'progress') {
const courseAdvancedSettings = await getCourseAdvancedSettings(courseId);
dispatch(addModel({
modelType: 'courseAdvancedSettings',
model: {
id: courseId,
...courseAdvancedSettings,
},
}));
}

const tabDataResult = getTabData && await getTabData(courseId, targetUserId);
if (tabDataResult) {
dispatch(addModel({
Expand Down
5 changes: 4 additions & 1 deletion src/course-home/progress-tab/ProgressTab.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ const ProgressTab = () => {
courseId,
} = useSelector(state => state.courseHome);

const advancedSettings = useModel('courseAdvancedSettings', courseId);
const disableProgressGraph = advancedSettings.disable_progress_graph;

const {
gradesFeatureIsFullyLocked,
} = useModel('progress', courseId);
Expand All @@ -38,7 +41,7 @@ const ProgressTab = () => {
<div className="row w-100 m-0">
{/* Main body */}
<div className="col-12 col-md-8 p-0">
<CourseCompletion />
{!disableProgressGraph.value && <CourseCompletion />}
{!wideScreen && <CertificateStatus />}
<CourseGrade />
<div className={`grades my-4 p-4 rounded raised-card ${applyLockedOverlay}`} aria-hidden={gradesFeatureIsFullyLocked}>
Expand Down