Merge pull request #21049 from code-dot-org/student-ordering

Manage students table: Show rows in reverse added order
code-dot-org · Mar 7, 2018 · 3565523 · 3565523
2 parents 1ee0527 + 9f1cd34
commit 3565523
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/apps/src/templates/manageStudents/manageStudentsRedux.js b/apps/src/templates/manageStudents/manageStudentsRedux.js
@@ -113,7 +113,7 @@ export const saveAllStudents = () => {
     const state = getState().manageStudents;
 
     // Currently, every update is an individual call to the server.
-    const currentlyEditedData = convertStudentDataToArray(state.editingData);
+    const currentlyEditedData = Object.values(state.editingData);
     let studentsToSave = currentlyEditedData.filter(student => student.rowType === RowType.STUDENT);
     studentsToSave.forEach((student) => {
       if (student.name !== '') {
@@ -122,7 +122,7 @@ export const saveAllStudents = () => {
     });
 
     // Adding students can be saved together.
-    const arrayOfEditedData = convertStudentDataToArray(state.editingData);
+    const arrayOfEditedData = Object.values(state.editingData);
     const newStudentsToAdd = arrayOfEditedData
       .filter(student => student.rowType === RowType.NEW_STUDENT)
       .map(student => student.id);
@@ -144,7 +144,7 @@ export const addStudents = (studentIds) => {
       dispatch(startSavingStudent(studentIds[i]));
     }
 
-    const arrayOfEditedData = convertStudentDataToArray(state.editingData);
+    const arrayOfEditedData = Object.values(state.editingData);
     const filteredData = arrayOfEditedData.filter(student => studentIds.includes(student.id));
     addStudentOnServer(filteredData,
       state.sectionId, (error, data) => {
@@ -415,7 +415,7 @@ export const convertStudentServerData = (studentData, loginType, sectionId) => {
 // component to display
 // TODO(caleybrock): memoize this - sections could be a few thousand students
 export const convertStudentDataToArray = (studentData) => {
-  return Object.values(studentData);
+  return Object.values(studentData).reverse();
 };
 
 // Make a post request to edit a student.

diff --git a/apps/test/unit/templates/manageStudents/manageStudentsReduxTest.js b/apps/test/unit/templates/manageStudents/manageStudentsReduxTest.js
@@ -186,12 +186,12 @@ describe('manageStudentsRedux', () => {
   });
 
   describe('convertStudentDataToArray', () => {
-    it('converts studentData to an array of student objects', () => {
+    it('converts studentData to an array of student objects in reverse order', () => {
       const studentDataArray = convertStudentDataToArray(studentEmailData);
       assert.equal(studentDataArray.length, 3);
-      assert.equal(studentDataArray[0], studentEmailData[1]);
+      assert.equal(studentDataArray[0], studentEmailData[3]);
       assert.equal(studentDataArray[1], studentEmailData[2]);
-      assert.equal(studentDataArray[2], studentEmailData[3]);
+      assert.equal(studentDataArray[2], studentEmailData[1]);
     });
   });