fix(reducer): clean up reducer, changes for feed validation issues

Author: landonreed

lib/manager/reducers/projects.js

@@ -1,7 +1,6 @@
 import update from 'react-addons-update'
 import { getConfigProperty } from '../../common/util/config'
 import { defaultSorter } from '../../common/util/util'
-
 const projects = (state = {
   isFetching: false,
   all: null,
@@ -132,14 +131,12 @@ const projects = (state = {
           }
         })
       } else if (feeds.length) { // if projectId does not match active project
-        return update(state,
-          {
-            isFetching: {$set: false},
-            all: {
-              [projectIndex]: {$merge: {feedSources: feeds}}
-            }
+        return update(state, {
+          isFetching: {$set: false},
+          all: {
+            [projectIndex]: {$merge: {feedSources: feeds}}
           }
-        )
+        })
       } else {
         return update(state,
           {
@@ -154,26 +151,14 @@ const projects = (state = {
       }
       projectIndex = state.all.findIndex(p => p.id === action.feedSource.projectId)
       const existingSources = state.all[projectIndex].feedSources || []
-      let updatedSources
       sourceIndex = existingSources.findIndex(s => s.id === action.feedSource.id)
-      if (sourceIndex === -1) { // source does not currently; add it
-        updatedSources = [
-          ...existingSources,
-          action.feedSource
-        ]
-      } else { // existing feedsource array includes this one, replace it
-        updatedSources = [
-          ...existingSources.slice(0, sourceIndex),
-          action.feedSource,
-          ...existingSources.slice(sourceIndex + 1)
-        ]
-      }
+      const updatedSources = sourceIndex !== -1
+        ? {[sourceIndex]: {$set: action.feedSource}}
+        : {$set: [action.feedSource]}
       return update(state, {
         all: {
           [projectIndex]: {
-            $merge: {
-              feedSources: updatedSources
-            }
+            feedSources: updatedSources
           }
         },
         isFetching: { $set: false }
@@ -208,28 +193,15 @@ const projects = (state = {
       versionIndex = state.all[projectIndex].feedSources[sourceIndex].feedVersions
         ? state.all[projectIndex].feedSources[sourceIndex].feedVersions.findIndex(v => v.id === action.feedVersion.id)
         : -1
-      const existingVersions = state.all[projectIndex].feedSources[sourceIndex].feedVersions || []
-      let updatedVersions
-      if (versionIndex === -1) { // version does not currently; add it
-        updatedVersions = [
-          ...existingVersions,
-          action.feedVersion
-        ]
-      } else { // existing feedversion array includes this one, replace it
-        updatedVersions = [
-          ...existingVersions.slice(0, versionIndex),
-          action.feedVersion,
-          ...existingVersions.slice(versionIndex + 1)
-        ]
-      }
+      const updatedVersions = versionIndex !== -1
+        ? {[versionIndex]: {$set: action.feedVersion}}
+        : {$set: [action.feedVersion]}
       return update(state, {
         all: {
           [projectIndex]: {
             feedSources: {
               [sourceIndex]: {
-                $merge: {
-                  feedVersions: updatedVersions
-                }
+                feedVersions: updatedVersions
               }
             }
           }
@@ -280,6 +252,33 @@ const projects = (state = {
           }
         }
       })
+    case 'RECEIVE_VALIDATION_ERRORS':
+      projectIndex = state.all.findIndex(p => p.id === action.payload.feedVersion.feedSource.projectId)
+      sourceIndex = state.all[projectIndex].feedSources.findIndex(s => s.id === action.payload.feedVersion.feedSource.id)
+      versionIndex = state.all[projectIndex].feedSources[sourceIndex].feedVersions.findIndex(v => v.id === action.payload.feedVersion.id)
+      const errorIndex = state.all[projectIndex].feedSources[sourceIndex].feedVersions[versionIndex].validationResult.error_counts.findIndex(e => e.type === action.payload.errorType)
+      const newErrors = state.all[projectIndex].feedSources[sourceIndex].feedVersions[versionIndex].validationResult.error_counts[errorIndex].errors
+        ? {$push: action.payload.errors}
+        : {$set: action.payload.errors}
+      return update(state, {
+        all: {
+          [projectIndex]: {
+            feedSources: {
+              [sourceIndex]: {
+                feedVersions: {
+                  [versionIndex]: {
+                    validationResult: {
+                      error_counts: {
+                        [errorIndex]: {errors: newErrors}
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      })
     case 'RECEIVE_FEEDVERSION_ISOCHRONES':
       projectIndex = state.all.findIndex(p => p.id === action.feedSource.projectId)
       sourceIndex = state.all[projectIndex].feedSources.findIndex(s => s.id === action.feedSource.id)
@@ -366,14 +365,13 @@ const projects = (state = {
     case 'RECEIVE_NOTES_FOR_FEEDSOURCE':
       projectIndex = state.all.findIndex(p => p.id === action.feedSource.projectId)
       sourceIndex = state.all[projectIndex].feedSources.findIndex(s => s.id === action.feedSource.id)
+      const {notes} = action
       return update(state, {
         all: {
           [projectIndex]: {
             feedSources: {
               [sourceIndex]: {
-                $merge: {
-                  notes: action.notes
-                }
+                $merge: {notes}
               }
             }
           }
@@ -424,4 +422,21 @@ const projects = (state = {
   }
 }
 
+// TODO: Use this function to get indexes (perhaps set to idx variable?)
+// function getIndexesFromFeed ({state, feedVersion, feedSource, projectId}) {
+//   if (!feedSource && feedVersion) ({feedSource} = feedVersion)
+//   if (!projectId) ({projectId} = feedSource)
+//   const projectIndex = state.all.findIndex(p => p.id === projectId)
+//   const sources = state.all[projectIndex].feedSources || []
+//   const sourceIndex = feedSource && sources.findIndex(s => s.id === feedSource.id)
+//   const versionIndex = feedVersion && sources[sourceIndex].feedVersions
+//     ? sources[sourceIndex].feedVersions.findIndex(v => v.id === feedVersion.id)
+//     : -1
+//   return {
+//     projectIndex,
+//     sourceIndex,
+//     versionIndex
+//   }
+// }
+
 export default projects