{
case actions.submissions.loadSubmission.toString():
return {
...state,
- selectedItem: payload.learnerId,
current: payload,
activeIndex: 0,
};
-
case actions.submissions.preloadNext.toString():
return { ...state, next: payload };
case actions.submissions.preloadPrev.toString():
diff --git a/src/data/selectors/submissions.js b/src/data/selectors/submissions.js
index 6ca2219..4a8ccab 100644
--- a/src/data/selectors/submissions.js
+++ b/src/data/selectors/submissions.js
@@ -12,19 +12,19 @@ const simpleSelectors = {
export const selectionIndex = createSelector(
[simpleSelectors.list],
- (list, { learnerId }) => list.selected.indexOf(learnerId),
+ (list, { submissionId }) => list.selected.indexOf(submissionId),
);
export const listData = createSelector(
[simpleSelectors.list],
(list) => _.sortBy(
Object.values(list),
- ['learnerId'],
+ ['submissionId'],
),
);
-export const selectionLearnerId = (state, { index }) => (
- simpleSelectors.selected(state)[index].learnerId
+export const selectionSubmissionId = (state, { index }) => (
+ simpleSelectors.selected(state)[index].submissionId
);
export const currentSelection = createSelector(
@@ -32,25 +32,25 @@ export const currentSelection = createSelector(
(list, activeIndex) => list[activeIndex],
);
-export const selectedLearnerId = createSelector(
+export const selectedSubmissionId = createSelector(
[currentSelection],
- (selection) => selection.learnerId,
+ (selection) => selection.submissionId,
);
-export const prevLearnerId = createSelector(
+export const prevSubmissionId = createSelector(
[simpleSelectors.selected, simpleSelectors.activeIndex],
(list, activeIndex) => {
if (activeIndex > 0) {
- return list[activeIndex - 1].learnerId;
+ return list[activeIndex - 1].submissionId;
}
return null;
},
);
-export const nextLearnerId = createSelector(
+export const nextSubmissionId = createSelector(
[simpleSelectors.selected, simpleSelectors.activeIndex],
(list, activeIndex) => {
if (activeIndex < list.length - 1) {
- return list[activeIndex + 1].learnerId;
+ return list[activeIndex + 1].submissionId;
}
return null;
},
@@ -61,7 +61,7 @@ export default StrictDict({
currentSelection,
selectionIndex,
listData,
- selectedLearnerId,
- nextLearnerId,
- prevLearnerId,
+ selectedSubmissionId,
+ nextSubmissionId,
+ prevSubmissionId,
});
diff --git a/src/data/services/lms/fakeData/submissionFull.js b/src/data/services/lms/fakeData/submissionFull.js
index 1189c9e..6759c56 100644
--- a/src/data/services/lms/fakeData/submissionFull.js
+++ b/src/data/services/lms/fakeData/submissionFull.js
@@ -1,9 +1,10 @@
import submissionList from './submissionList';
-const responseText = `
+const responseText = `Title
Phasellus tempor eros aliquam ipsum molestie, vitae varius lectus tempus. Morbi iaculis, libero euismod vehicula rutrum, nisi leo volutpat diam, quis commodo ex nunc ut odio. Pellentesque condimentum feugiat erat ac vulputate. Pellentesque porta rutrum sagittis. Curabitur vulputate tempus accumsan. Fusce bibendum gravida metus a scelerisque. Mauris fringilla orci non lobortis commodo. Quisque iaculis, quam a tincidunt vehicula, erat nisi accumsan quam, eu cursus ligula magna id odio. Nulla porttitor, lorem gravida vehicula tristique, sapien metus tristique ex, id tincidunt sapien justo nec sapien. Maecenas luctus, nisl vestibulum scelerisque pharetra, ligula orci vulputate turpis, in ultrices mauris dolor eu enim. Suspendisse quis nibh nec augue semper maximus. Morbi maximus eleifend magna.
-Phasellus porttitor vel magna et auctor. Nulla porttitor convallis aliquam. Donec cursus, ipsum ut egestas bibendum, purus metus dignissim est, ac condimentum leo felis eget diam. In magna mi, tincidunt id sapien id, fermentum vestibulum quam. Quisque et dui sed urna convallis rutrum pellentesque quis sapien. Cras non lectus velit. Praesent semper eros id risus mollis, quis interdum quam imperdiet. Sed nec vulputate tortor, at tristique tortor.`;
+Phasellus porttitor vel magna et auctor. Nulla porttitor convallis aliquam. Donec cursus, ipsum ut egestas bibendum, purus metus dignissim est, ac condimentum leo felis eget diam. In magna mi, tincidunt id sapien id, fermentum vestibulum quam. Quisque et dui sed urna convallis rutrum pellentesque quis sapien. Cras non lectus velit. Praesent semper eros id risus mollis, quis interdum quam imperdiet. Sed nec vulputate tortor, at tristique tortor.
+`;
const rubric = {
name: 'Rubric name',
diff --git a/src/data/services/lms/fakeData/submissionList.js b/src/data/services/lms/fakeData/submissionList.js
index bdc7bd4..7b5e304 100644
--- a/src/data/services/lms/fakeData/submissionList.js
+++ b/src/data/services/lms/fakeData/submissionList.js
@@ -24,7 +24,7 @@ const createSubmission = (grade, status) => {
const submissionId = ids.submissionId(index);
const learnerId = ids.learnerId(index);
submissions[submissionId] = {
- id: submissionId,
+ submissionId,
username: ids.username(index),
learnerId,
dateSubmitted: date0 + (day * index),
diff --git a/src/data/thunkActions/app.js b/src/data/thunkActions/app.js
index 66353ab..68cbd4c 100644
--- a/src/data/thunkActions/app.js
+++ b/src/data/thunkActions/app.js
@@ -15,13 +15,13 @@ export const initialize = () => (dispatch) => (
);
export const prefetchPrev = () => (dispatch, getState) => (
- api.fetchSubmission(selectors.submissions.prevLearnerId(getState())).then((response) => {
+ api.fetchSubmission(selectors.submissions.prevSubmissionId(getState())).then((response) => {
dispatch(actions.submissions.preloadPrev(response.submission));
})
);
export const prefetchNext = () => (dispatch, getState) => (
- api.fetchSubmission(selectors.submissions.nextLearnerId(getState())).then((response) => {
+ api.fetchSubmission(selectors.submissions.nextSubmissionId(getState())).then((response) => {
dispatch(actions.submissions.preloadNext(response.submission));
if (selectors.submissions.activeIndex(getState()) > 0) {
return dispatch(prefetchPrev());
@@ -30,22 +30,27 @@ export const prefetchNext = () => (dispatch, getState) => (
})
);
-export const fetchSubmissionFromSelection = () => (dispatch, getState) => (
- api.fetchSubmission(
- selectors.submissions.selectedLearnerId(getState()),
- ).then((response) => {
- dispatch(actions.submissions.loadSubmission(response.submission));
- const activeIndex = selectors.submissions.activeIndex(getState());
- const selected = selectors.submissions.selected(getState());
- if (activeIndex < selected.length - 1) {
- return dispatch(prefetchNext());
- }
- if (activeIndex > 0) {
- return dispatch(prefetchPrev());
- }
- return true;
- })
-);
+export const fetchSubmissionFromSelection = () => (dispatch, getState) => {
+ console.log({
+ fetchSubmission: selectors.submissions.selectedSubmissionId(getState()),
+ });
+ return (
+ api.fetchSubmission(
+ selectors.submissions.selectedSubmissionId(getState()),
+ ).then((response) => {
+ dispatch(actions.submissions.loadSubmission(response.submission));
+ const activeIndex = selectors.submissions.activeIndex(getState());
+ const selected = selectors.submissions.selected(getState());
+ if (activeIndex < selected.length - 1) {
+ return dispatch(prefetchNext());
+ }
+ if (activeIndex > 0) {
+ return dispatch(prefetchPrev());
+ }
+ return true;
+ })
+ );
+};
export const loadSelectionForReview = (selection) => (dispatch) => {
const submissions = selection.map(row => row.original);
diff --git a/src/index.jsx b/src/index.jsx
index 61fa3be..d12027e 100755
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -15,33 +15,19 @@ import { messages as footerMessages } from '@edx/frontend-component-footer';
import appMessages from './i18n';
import App from './App';
-/*
subscribe(APP_READY, () => {
- ReactDOM.render(, document.getElementById('root'));
-});
-
-initialize({
- messages: [
- appMessages,
- footerMessages,
- ],
- requireAuthenticatedUser: true,
-});
-*/
-
-// ReactDOM.render(
-//
-//
-// ,
-// document.getElementById('root'),
-// );
-
-subscribe(APP_READY, () => {
- ReactDOM.render(, document.getElementById('root'));
+ ReactDOM.render(
+
+
+ ,
+ document.getElementById('root'));
});
subscribe(APP_INIT_ERROR, (error) => {
- ReactDOM.render(, document.getElementById('root'));
+ ReactDOM.render(
+ ,
+ document.getElementById('root'),
+ );
});
initialize({
@@ -50,4 +36,4 @@ initialize({
footerMessages,
],
requireAuthenticatedUser: true,
-});
\ No newline at end of file
+});