Unlink slots when deleting primitive if it has pipes

Author: pel-daniel

src/actions/workspaceActions.js

@@ -2,6 +2,7 @@ import { bothSlotsSelected } from '../utils'
 
 import {
   BRICK,
+  PRIMITIVE,
   SELECTABLE_PIPE
 } from '../utils/componentNames'
 
@@ -218,6 +219,26 @@ export const removeElement = (elementId) => {
       dispatch(_unlinkSlots(element))
     }
 
+    if(element.componentName == PRIMITIVE) {
+      const slotId = Object.keys(element.outputSlots)[0]
+      const slot = element.outputSlots[slotId]
+
+      slot.outputElementIds.forEach((outputElementId) => {
+        dispatch(
+          _unlinkSlots({
+            input: {
+              elementId: element.id,
+              slotId
+            },
+            output: {
+              elementId: outputElementId,
+              sourceElementId: element.id
+            }
+          })
+        )
+      })
+    }
+
     if(element.componentName == BRICK) {
       Object.keys(element.inputSlots).forEach((slotId) => {
         const slot = element.inputSlots[slotId]

src/reducers/workspace/updateElementReducer.js

@@ -181,7 +181,7 @@ export const unlinkSlots = (workspace, payload) => {
   const index = outputSlot.outputElementIds.indexOf(output.elementId)
 
   const outputElement = workspace.entities[output.elementId]
-  const newOutputElement = _removeSlotValue(outputElement, output.slotId)
+  const newOutputElement = _removeSlotValue(outputElement, output)
 
   return Object.assign({}, workspace, {
     entities: {
@@ -204,19 +204,41 @@ export const unlinkSlots = (workspace, payload) => {
   })
 }
 
-const _removeSlotValue = (element, slotId) => {
+const _removeSlotValue = (element, output) => {
   var slots = {}
 
-  if(element.componentName == MAIN_BRICK) {
-    Object.assign(slots, {
-      outputSlots: element.outputSlots
-    })
-    delete slots.outputSlots[slotId]['value']
-  } else {
-    Object.assign(slots, {
-      inputSlots: element.inputSlots
-    })
-    delete slots.inputSlots[slotId]['value']
+  if(output.slotId) {
+    if(element.componentName == MAIN_BRICK) {
+      Object.assign(slots, { outputSlots: element.outputSlots })
+
+      delete slots.outputSlots[output.slotId]['value']
+    } else {
+      Object.assign(slots, { inputSlots: element.inputSlots })
+
+      delete slots.inputSlots[output.slotId]['value']
+    }
+  } else if(output.sourceElementId) {
+    if(element.componentName == MAIN_BRICK) {
+      Object.assign(slots, { outputSlots: element.outputSlots })
+
+      Object.keys(element.outputSlots).forEach((slotId) => {
+        const slot = element.outputSlots[slotId]
+
+        if(slot.value && slot.value.elementId == output.sourceElementId) {
+          delete slots.outputSlots[slotId]['value']
+        }
+      })
+    } else {
+      Object.assign(slots, { inputSlots: element.inputSlots })
+
+      Object.keys(element.inputSlots).forEach((slotId) => {
+        const slot = element.inputSlots[slotId]
+
+        if(slot.value && slot.value.elementId == output.sourceElementId) {
+          delete slots.inputSlots[slotId]['value']
+        }
+      })
+    }
   }
 
   return Object.assign(element, { ...slots })