- {courseIDs.map((id) => (
-
);
+
CourseList.propTypes = {
- courseIDs: PropTypes.arrayOf(PropTypes.string).isRequired,
+ courseListData: PropTypes.arrayOf(shapes.courseRunCardData).isRequired,
};
export default CourseList;
diff --git a/src/containers/Dashboard/index.jsx b/src/containers/Dashboard/index.jsx
index 743d735..b484c20 100644
--- a/src/containers/Dashboard/index.jsx
+++ b/src/containers/Dashboard/index.jsx
@@ -1,29 +1,51 @@
import React from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+
+import { FormattedMessage } from '@edx/frontend-platform/i18n';
+
+import { selectors, thunkActions } from 'data/redux';
import CourseList from 'containers/CourseList';
import WidgetSidebar from 'containers/WidgetSidebar';
-import { courseIDs } from 'data/services/lms/fakeData/courses';
-import { FormattedMessage } from '@edx/frontend-platform/i18n';
-import EmptyCourse from '../EmptyCourse';
+import EmptyCourse from 'containers/EmptyCourse';
import messages from './messages';
+import * as module from '.';
-export const Dashboard = () => (
-
- {courseIDs.length ? (
- <>
-
-
-
-);
+export const hooks = ({ dispatch }) => ({
+ initialize: () => React.useEffect(
+ () => { dispatch(thunkActions.app.initialize()); },
+ [],
+ ),
+ enrollments: useSelector(selectors.app.enrollments),
+ entitlements: useSelector(selectors.app.entitlements),
+});
+
+export const Dashboard = () => {
+ const dispatch = useDispatch();
+ const {
+ initialize,
+ enrollments,
+ // entitlements,
+ } = module.hooks({ dispatch });
+ initialize();
+ return (
+
-
-
-
-
- ) : (
-
+ {enrollments.length ? (
+ <>
+
+
+
+ );
+};
export default Dashboard;
diff --git a/src/containers/WidgetSidebar/index.jsx b/src/containers/WidgetSidebar/index.jsx
index 6330e62..adaebfa 100644
--- a/src/containers/WidgetSidebar/index.jsx
+++ b/src/containers/WidgetSidebar/index.jsx
@@ -8,6 +8,7 @@ import './index.scss';
export const WidgetSidebar = () => (
+
+
+
+
+ ) : (
+
+
{/* 
@@ -17,6 +18,7 @@ export const WidgetSidebar = () => (
*/}
+
({ ...state, courseMetadata: payload }),
+ loadEnrollments: (state, { payload }) => ({ ...state, enrollments: payload }),
+ loadEntitlements: (state, { payload }) => ({ ...state, entitlements: payload }),
},
});
diff --git a/src/data/redux/app/selectors.js b/src/data/redux/app/selectors.js
index 9ceeabd..2c57c8f 100644
--- a/src/data/redux/app/selectors.js
+++ b/src/data/redux/app/selectors.js
@@ -10,7 +10,8 @@ const mkSimpleSelector = (cb) => createSelector([module.appSelector], cb);
// top-level app data selectors
export const simpleSelectors = {
- courseMetadata: mkSimpleSelector(app => app.courseMetadata),
+ enrollments: mkSimpleSelector(app => app.enrollments),
+ entitlements: mkSimpleSelector(app => app.entitlements),
};
export default StrictDict({
diff --git a/src/data/redux/thunkActions/app.js b/src/data/redux/thunkActions/app.js
index 537d424..a55ff1b 100644
--- a/src/data/redux/thunkActions/app.js
+++ b/src/data/redux/thunkActions/app.js
@@ -1,6 +1,8 @@
import { StrictDict } from 'utils';
+import { actions } from 'data/redux';
+
+import requests from './requests';
-// import { selectors, actions } from 'data/redux';
// import { locationId } from 'data/constants/app';
// import { } from './requests';
@@ -10,8 +12,14 @@ import { StrictDict } from 'utils';
* initialize the app, loading ora and course metadata from the api, and loading the initial
* submission list data.
*/
-export const initialize = () => () => {
-};
+export const initialize = () => (dispatch) => (
+ requests.initialize().then(
+ ({ enrollments, entitlements }) => {
+ dispatch(actions.app.loadEnrollments(enrollments));
+ dispatch(actions.app.loadEntitlements(entitlements));
+ },
+ )
+);
export default StrictDict({
initialize,
diff --git a/src/data/redux/thunkActions/requests.js b/src/data/redux/thunkActions/requests.js
index c923726..d3a9391 100644
--- a/src/data/redux/thunkActions/requests.js
+++ b/src/data/redux/thunkActions/requests.js
@@ -2,6 +2,7 @@ import { StrictDict } from 'utils';
// import { RequestKeys } from 'data/constants/requests';
import { actions } from 'data/redux';
+import fakeData from 'data/services/lms/fakeData/courses';
// import api from 'data/services/lms/api';
// import * as module from './requests';
@@ -33,5 +34,13 @@ export const networkRequest = ({
});
};
+export const initialize = () => (
+ Promise.resolve({
+ enrollments: fakeData.courseRunData,
+ entitlements: fakeData.entitlementCourses,
+ })
+);
+
export default StrictDict({
+ initialize,
});
diff --git a/src/data/services/lms/fakeData/courses.js b/src/data/services/lms/fakeData/courses.js
index 4cb269e..e399aac 100644
--- a/src/data/services/lms/fakeData/courses.js
+++ b/src/data/services/lms/fakeData/courses.js
@@ -6,7 +6,7 @@ export const providers = StrictDict({
website: 'www.edx.com',
email: 'support@edx.com',
},
- MIT: {
+ mit: {
name: 'MIT',
website: 'www.mit.edu',
email: 'support@mit.edu',
@@ -38,7 +38,7 @@ export const genCourseRunData = (data = {}) => ({
export const genEnrollmentData = (data = {}) => ({
isAudit: true,
isVerified: false,
- canUpgrade: data.verified ? null : false,
+ canUpgrade: data.verified ? null : true,
isAuditAccessExpired: data.verified ? null : false,
...data,
});
@@ -48,10 +48,8 @@ export const genCertificateData = (data = {}) => ({
isRestricted: false,
isAvailable: false,
isEarned: false,
- isRequesting: false,
- isGenerating: false,
isDownloadable: false,
- downloadUrls: null, // { preview, download, honorCertDownload }
+ downloadUrls: null, // { preview, download }
...data,
});
@@ -68,15 +66,15 @@ export const courseRuns = [
grades: { isPassing: true },
courseRun: { isPending: true },
certificates: genCertificateData(),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// audit, started, cannot upgrade, restricted
{
- enrollment: genEnrollmentData({ isAudit: true }),
+ enrollment: genEnrollmentData({ isAudit: true, canUpgrade: false }),
grades: { isPassing: true },
courseRun: { isStarted: true },
certificates: genCertificateData({ isRestricted: true }),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// audit, started, can upgrade
{
@@ -84,23 +82,35 @@ export const courseRuns = [
grades: { isPassing: true },
courseRun: { isStarted: true },
certificates: genCertificateData(),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// audit, started, not passing
{
enrollment: genEnrollmentData({ isAudit: true, canUpgrade: true }),
grades: { isPassing: false },
- courseRun: { isStarted: true, accessExpirationDate: pastDate },
+ courseRun: { isStarted: true },
certificates: genCertificateData(),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
- // audit, started, audit access expired
+ // audit, started, audit access expired, can upgrade
{
enrollment: genEnrollmentData({ isAudit: true, isAuditAccessExpired: true }),
grades: { isPassing: true },
courseRun: { isStarted: true, accessExpirationDate: pastDate },
certificates: genCertificateData(),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
+ },
+ // audit, started, audit access expired, cannot upgrade
+ {
+ enrollment: genEnrollmentData({
+ isAudit: true,
+ isAuditAccessExpired: true,
+ canUpgrade: false,
+ }),
+ grades: { isPassing: true },
+ courseRun: { isStarted: true, accessExpirationDate: pastDate },
+ certificates: genCertificateData(),
+ entitlements: { isEntitlement: false },
},
// verified, pending, restricted
{
@@ -108,7 +118,7 @@ export const courseRuns = [
grades: { isPassing: true },
courseRun: { isPending: true },
certificates: genCertificateData({ isRestricted: true }),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// verified, started
{
@@ -116,7 +126,7 @@ export const courseRuns = [
grades: { isPassing: true },
courseRun: { isStarted: true },
certificates: genCertificateData(),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// verified, not passing
{
@@ -124,7 +134,7 @@ export const courseRuns = [
grades: { isPassing: false },
courseRun: { isStarted: true },
certificates: genCertificateData(),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// verified, finished, not passing
{
@@ -132,7 +142,7 @@ export const courseRuns = [
grades: { isPassing: false },
courseRun: { isFinished: true },
certificates: genCertificateData(),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// verified, restricted
{
@@ -140,7 +150,7 @@ export const courseRuns = [
grades: { isPassing: true },
courseRun: { isStarted: true },
certificates: genCertificateData({ isRestricted: true }),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// verified, earned but not available
{
@@ -151,33 +161,7 @@ export const courseRuns = [
isEarned: true,
availableDate: futureDate,
}),
- entitlement: { isEntitlement: false },
- },
- // verified, earned, requesting
- {
- enrollment: genEnrollmentData({ isVerified: true }),
- grades: { isPassing: true },
- courseRun: { isStarted: true },
- certificates: genCertificateData({
- isEarned: true,
- isAvailable: true,
- isRequesting: true,
- availableDate: pastDate,
- }),
- entitlement: { isEntitlement: false },
- },
- // verified, earned, generating
- {
- enrollment: genEnrollmentData({ isVerified: true }),
- grades: { isPassing: true },
- courseRun: { isStarted: true },
- certificates: genCertificateData({
- isEarned: true,
- isAvailable: true,
- isGenerating: true,
- availableDate: pastDate,
- }),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// verified, earned, downloadable (web + link)
{
@@ -194,7 +178,7 @@ export const courseRuns = [
download: logos.social,
},
}),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// verified, earned, downloadable (link)
{
@@ -210,23 +194,7 @@ export const courseRuns = [
download: logos.social,
},
}),
- entitlement: { isEntitlement: false },
- },
- // verified, earned, downloadable (honor cert)
- {
- enrollment: genEnrollmentData({ isVerified: true }),
- grades: { isPassing: true },
- courseRun: { isStarted: true },
- certificates: genCertificateData({
- isEarned: true,
- isAvailable: true,
- isDownloadable: true,
- availableDate: pastDate,
- downloadUrls: {
- honorCertDownload: logos.bio,
- },
- }),
- entitlement: { isEntitlement: false },
+ entitlements: { isEntitlement: false },
},
// Entitlement Course Run - Cannot view yet
{
@@ -234,11 +202,12 @@ export const courseRuns = [
grades: { isPassing: true },
courseRun: { isPending: true },
certificates: genCertificateData(),
- entitlement: {
+ entitlements: {
isEntitlement: true,
isFulfilled: true,
isRefundable: true,
canViewCourse: false,
+ canChange: true,
changeDeadline: futureDate,
isExpired: false,
},
@@ -249,11 +218,12 @@ export const courseRuns = [
grades: { isPassing: true },
courseRun: { isStarted: true },
certificates: genCertificateData(),
- entitlement: {
+ entitlements: {
isEntitlement: true,
isFulfilled: true,
isRefundable: true,
canViewCourse: true,
+ canChange: true,
changeDeadline: futureDate,
isExpired: false,
},
@@ -264,11 +234,12 @@ export const courseRuns = [
grades: { isPassing: true },
courseRun: { isStarted: true },
certificates: genCertificateData(),
- entitlement: {
+ entitlements: {
isEntitlement: true,
isFulfilled: true,
isRefundable: true,
canViewCourse: true,
+ canChange: false,
changeDeadline: pastDate,
isExpired: false,
},
@@ -277,13 +248,14 @@ export const courseRuns = [
{
enrollment: genEnrollmentData({ isVerified: true }),
grades: { isPassing: true },
- courseRun: { isStarted: true },
+ courseRun: { isStarted: true, isFinished: true, isArchived: true },
certificates: genCertificateData(),
- entitlement: {
+ entitlements: {
isEntitlement: true,
isFulfilled: true,
- isRefundable: true,
+ isRefundable: false,
canViewCourse: true,
+ canChange: false,
changeDeadline: pastDate,
isExpired: true,
},
@@ -294,31 +266,37 @@ export const entitlementCourses = [
{
course: { title: genCourseTitle(100) },
entitlements: {
+ isEntitlement: true,
availableSessions,
isRefundable: true,
isFulfilled: false,
canViewCourse: false,
changeDeadline: futureDate,
+ canChange: true,
isExpired: false,
},
}, {
course: { title: genCourseTitle(101) },
entitlements: {
+ isEntitlement: true,
availableSessions,
isRefundable: true,
isFulfilled: false,
canViewCourse: false,
changeDeadline: pastDate,
+ canChange: false,
isExpired: false,
},
}, {
course: { title: genCourseTitle(102) },
entitlements: {
+ isEntitlement: true,
availableSessions,
isRefundable: true,
isFulfilled: false,
canViewCourse: false,
changeDeadline: pastDate,
+ canChange: false,
isExpired: true,
},
},
@@ -328,30 +306,26 @@ export const entitlementCourses = [
// Entitlement Course - cannot view yet
// Entitlement Course - can view and change
// Entitlement Course - expired
-export const courseRunData = courseRuns.reduce(
- (obj, curr, index) => {
- const out = { ...curr };
+export const courseRunData = courseRuns.map(
+ (data, index) => {
+ const title = genCourseTitle(index);
+ const courseNumber = genCourseID(index);
const providerIndex = index % 3;
const iteratedData = [
- {
- provider: providers.edx,
- course: { title: genCourseTitle(index), bannerUrl: logos.edx },
- },
- {
- provider: providers.mit,
- course: { title: genCourseTitle(index), bannerUrl: logos.bio },
- },
- {
- provider: null,
- course: { title: genCourseTitle(index), bannerUrl: logos.social },
- },
+ { provider: providers.edx, course: { title, bannerUrl: logos.edx } },
+ { provider: providers.mit, course: { title, bannerUrl: logos.science } },
+ { provider: null, course: { title, bannerUrl: logos.social } },
];
- out.courseRun.courseNumber = genCourseID(index);
return {
- ...out,
+ ...data,
+ courseRun: genCourseRunData({ ...data.courseRun, courseNumber }),
...iteratedData[providerIndex],
credit: { isPurchased: false, requestStatus: null },
};
},
- {},
);
+
+export default {
+ courseRunData,
+ entitlementCourses,
+};
diff --git a/src/data/services/lms/shapes.js b/src/data/services/lms/shapes.js
new file mode 100644
index 0000000..b148a01
--- /dev/null
+++ b/src/data/services/lms/shapes.js
@@ -0,0 +1,70 @@
+import PropTypes from 'prop-types';
+import { StrictDict } from 'utils';
+
+export const shapes = StrictDict({
+ course: PropTypes.shape({
+ bannerUrl: PropTypes.string,
+ title: PropTypes.string,
+ website: PropTypes.string,
+ }),
+ provider: PropTypes.shape({
+ email: PropTypes.string,
+ name: PropTypes.string,
+ website: PropTypes.string,
+ }),
+ courseRun: PropTypes.shape({
+ accessExpirationDate: PropTypes.string,
+ courseNumber: PropTypes.string,
+ isArchived: PropTypes.bool,
+ isFinished: PropTypes.bool,
+ isPending: PropTypes.bool,
+ isStarted: PropTypes.bool,
+ minPassingGrade: PropTypes.number,
+ }),
+ credit: PropTypes.shape({
+ isPurchased: PropTypes.bool,
+ requestStatus: PropTypes.string,
+ }),
+ certificates: PropTypes.shape({
+ availableDate: PropTypes.string,
+ downloadUrls: PropTypes.shape({
+ preview: PropTypes.string,
+ download: PropTypes.string,
+ }),
+ isAvailable: PropTypes.bool,
+ isDownloadable: PropTypes.bool,
+ isEarned: PropTypes.bool,
+ isRestricted: PropTypes.bool,
+ }),
+ enrollment: PropTypes.shape({
+ canUpgrade: PropTypes.bool,
+ isAudit: PropTypes.bool,
+ isAuditAccessExpired: PropTypes.bol,
+ isVerified: PropTypes.bool,
+ }),
+ entitlement: PropTypes.shape({
+ isEntitlement: PropTypes.bool,
+ canChange: PropTypes.bool,
+ isFulfilled: PropTypes.bool,
+ isRefundable: PropTypes.bool,
+ changeDeadline: PropTypes.string,
+ isExpired: PropTypes.bool,
+ canViewCourse: PropTypes.bool,
+ }),
+ grades: PropTypes.shape({
+ isPassing: PropTypes.bool,
+ }),
+});
+
+shapes.courseRunCardData = PropTypes.shape({
+ course: shapes.course,
+ provider: shapes.provider,
+ courseRun: shapes.courseRun,
+ credit: shapes.credit,
+ certificates: shapes.certificates,
+ enrollment: shapes.enrollment,
+ entitlement: shapes.entitlement,
+ grades: shapes.grades,
+});
+
+export default shapes;