Merge pull request #743 from VirtualFlyBrain/feature/737

Fixes out of bounds array bug in redux store's add_instance method
VirtualFlyBrain · Nov 5, 2020 · f533850 · f533850
2 parents 047f1be + 9b470a7
commit f533850
Showing 1 changed file with 18 additions and 16 deletions.
diff --git a/reducers/generals.js b/reducers/generals.js
@@ -257,22 +257,24 @@ function generalReducer (state, action) {
   case INSTANCE_ADDED:
     var newMap = { ...state.idsMap };
     var newInstance = action.data.split(".");
-    var component = returnComponent(newInstance[1]);
-    if (newMap[newInstance[0]] !== undefined
-              && component !== null
-              && newMap[newInstance[0]].components[component] === undefined
-              && Instances[newInstance[0]][newInstance[1]] !== undefined) {
-      var newComponents = { ...newMap[newInstance[0]].components };
-      newMap[newInstance[0]].components = newComponents;
-      if (state.ui.layout[component]) {
-        newMap[newInstance[0]].components[component] = {
-          loaded: false,
-          loadable: true
-        }
-      } else {
-        newMap[newInstance[0]].components[component] = {
-          loaded: true,
-          loadable: false
+    if ( newInstance[1] !== undefined ){
+      var component = returnComponent(newInstance[1]);
+      if (newMap[newInstance[0]] !== undefined
+                && component !== null
+                && newMap[newInstance[0]].components[component] === undefined
+                && Instances[newInstance[0]][newInstance[1]] !== undefined) {
+        var newComponents = { ...newMap[newInstance[0]].components };
+        newMap[newInstance[0]].components = newComponents;
+        if (state.ui.layout[component]) {
+          newMap[newInstance[0]].components[component] = {
+            loaded: false,
+            loadable: true
+          }
+        } else {
+          newMap[newInstance[0]].components[component] = {
+            loaded: true,
+            loadable: false
+          }
         }
       }
     }