chore(chunk): show overal status (#518)

uc-cdis · Apr 26, 2019 · c7949ea · c7949ea
1 parent f01ad70
commit c7949ea
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/Submission/SubmissionResult.jsx b/src/Submission/SubmissionResult.jsx
@@ -66,7 +66,7 @@ class SubmissionResult extends React.Component {
         </ul>
       </div>);
     } else if (status >= 400 && status < 500) {
-      const errorList = (data.entities || []).filter(ent => !!ent.errors);
+      const errorList = (data || []).filter(ent => ent.errors && ent.errors.length);
       if (errorList.length > 0) {
         summary = (<div id='cd-summary__result_400'><p>
             Errors:
@@ -106,7 +106,7 @@ class SubmissionResult extends React.Component {
 
 SubmissionResult.propTypes = {
   status: PropTypes.number.isRequired,
-  data: PropTypes.object.isRequired,
+  data: PropTypes.array.isRequired,
   dataString: PropTypes.string.isRequired,
   entityCounts: PropTypes.object.isRequired,
   counter: PropTypes.number.isRequired,

diff --git a/src/Submission/SubmissionResult.test.jsx b/src/Submission/SubmissionResult.test.jsx
@@ -5,8 +5,7 @@ import AceEditor from 'react-ace';
 import SubmissionResult from './SubmissionResult';
 
 describe('the submission result component', () => {
-  const testData = {
-    entities: [
+  const testData = [
       {
         type: 'type1',
       },
@@ -21,8 +20,7 @@ describe('the submission result component', () => {
         type: 'type2',
         errors: ['bla bla bla'],
       },
-    ],
-  };
+  ];
 
   it('presents a summary of a successful submission', () => {
     const $dom = shallow(

diff --git a/src/Submission/reducers.js b/src/Submission/reducers.js
@@ -40,11 +40,17 @@ const submission = (state = {}, action) => {
         const res = db; res[type] = (res[type] || 0) + 1;
         return res;
       }, prevCounts);
+    const data = state.submit_result ?
+      state.submit_result.concat(action.data.entities || [])
+      : action.data.entities;
+    const status = state.submit_status ?
+      Math.max(state.submit_status, action.submit_status)
+      : action.submit_status;
     return { ...state,
       submit_entity_counts: newCounts,
-      submit_result: action.data,
+      submit_result: data,
       submit_result_string: state.submit_result_string.concat(JSON.stringify(action.data, null, '    ')).concat('\n\n'),
-      submit_status: action.submit_status,
+      submit_status: status,
       submit_counter: state.submit_counter + 1,
       submit_total: action.total };
   }