fix: address PR comments

This commit is contained in:
Ben Warzeski
2022-08-10 10:40:42 -04:00
parent 1cfcf9c164
commit 6512f451e6
6 changed files with 18 additions and 16 deletions

View File

@@ -12,6 +12,7 @@ $input-focus-box-shadow: $input-box-shadow; // hack to get upgrade to paragon 4.
@import "~@edx/frontend-component-footer/dist/_footer";
#root {
// Removing a odd 1.5 scaling on checkboxes.:
input[type=checkbox] {
transform: none;
}

View File

@@ -23,6 +23,7 @@ export const Dashboard = () => {
const hasCourses = appHooks.useHasCourses();
const hasAvailableDashboards = appHooks.useHasAvailableDashboards();
const showSelectSessionModal = appHooks.useShowSelectSessionModal();
return (
<div className="d-flex flex-column p-2" id="course-dashboard">
{hasAvailableDashboards && <EnterpriseDashboardModal />}
@@ -30,7 +31,7 @@ export const Dashboard = () => {
<>
<div className="d-flex" style={{ margin: 'auto' }}>
<div className="w-100 mw-md mr-4">
<SelectSessionModal />
{showSelectSessionModal && (<SelectSessionModal />)}
<CourseList />
</div>
<div id="dashboard-sidebar-container mw-xs">

View File

@@ -40,7 +40,7 @@ export const SelectSessionModal = () => {
<Form.Label>{hint}</Form.Label>
<Form.RadioSet name="sessions" className="pt-3 pb-4">
{entitlementSessions?.map((session) => (
<Form.Radio key={session.startDate} value={session.startDate}>
<Form.Radio key={session.courseId} value={session.startDate}>
{dateFormatter(formatDate, session.startDate)} - {dateFormatter(formatDate, session.endDate)}
</Form.Radio>
))}

View File

@@ -28,6 +28,10 @@ export const hasAvailableDashboards = createSelector(
[module.simpleSelectors.enterpriseDashboards],
(data) => !!data.availableDashboards,
);
export const showSelectSessionModal = createSelector(
[module.simpleSelectors.selectSessionModal],
(data) => data.cardId != null,
);
export const courseCardData = (state, cardId) => (
module.simpleSelectors.courseData(state)[cardId]
@@ -130,29 +134,30 @@ export const currentList = (state, {
pageSize,
}) => {
let list = Object.values(module.simpleSelectors.courseData(state));
const hasFilter = filters.reduce((obj, filter) => ({ ...obj, [filter]: true }), {});
if (filters.length) {
list = list.filter(course => {
if (filters.includes(FilterKeys.notEnrolled)) {
if (hasFilter[FilterKeys.notEnrolled]) {
if (course.enrollment.isEnrolled) {
return false;
}
}
if (filters.includes(FilterKeys.done)) {
if (hasFilter[FilterKeys.done]) {
if (!course.enrollment.hasFinished) {
return false;
}
}
if (filters.includes(FilterKeys.upgraded)) {
if (hasFilter[FilterKeys.upgraded]) {
if (!course.enrollment.isVerified) {
return false;
}
}
if (filters.includes(FilterKeys.inProgress)) {
if (hasFilter[FilterKeys.inProgress]) {
if (!course.enrollment.hasStarted) {
return false;
}
}
if (filters.includes(FilterKeys.notStarted)) {
if (hasFilter[FilterKeys.notStarted]) {
if (course.enrollment.hasStarted) {
return false;
}
@@ -189,4 +194,5 @@ export default StrictDict({
currentList,
hasCourses,
hasAvailableDashboards,
showSelectSessionModal,
});

View File

@@ -17,6 +17,7 @@ export const useHasAvailableDashboards = () => useSelector(appSelectors.hasAvail
export const useCurrentCourseList = (opts) => useSelector(
state => appSelectors.currentList(state, opts),
);
export const useShowSelectSessionModal = () => useSelector(appSelectors.showSelectSessionModal);
// eslint-disable-next-line
export const useCourseCardData = (selector) => (cardId) => useSelector(

View File

@@ -141,15 +141,8 @@ export const availableSessions = [
{ startDate: '1/2/2000', endDate: '1/2/2020', courseId: genCourseId(1000) },
{ startDate: '2/3/2000', endDate: '2/3/2020', courseId: genCourseId(1001) },
{ startDate: '3/4/2000', endDate: '3/4/2020', courseId: genCourseId(1002) },
{ startDate: '1/2/2000', endDate: '1/2/2020', courseId: genCourseId(1000) },
{ startDate: '2/3/2000', endDate: '2/3/2020', courseId: genCourseId(1001) },
{ startDate: '3/4/2000', endDate: '3/4/2020', courseId: genCourseId(1002) },
{ startDate: '1/2/2000', endDate: '1/2/2020', courseId: genCourseId(1000) },
{ startDate: '2/3/2000', endDate: '2/3/2020', courseId: genCourseId(1001) },
{ startDate: '3/4/2000', endDate: '3/4/2020', courseId: genCourseId(1002) },
{ startDate: '1/2/2000', endDate: '1/2/2020', courseId: genCourseId(1000) },
{ startDate: '2/3/2000', endDate: '2/3/2020', courseId: genCourseId(1001) },
{ startDate: '3/4/2000', endDate: '3/4/2020', courseId: genCourseId(1002) },
{ startDate: '4/5/2000', endDate: '4/6/2020', courseId: genCourseId(1003) },
{ startDate: '5/6/2000', endDate: '5/7/2020', courseId: genCourseId(1004) },
];
export const courseRuns = [