[ExoBundle] Fixing delete for duplicate step item. (#2365)

* [ExoBundle] Fixing delete for duplicate step item.

* [ExoBundle] Fixing step removal.

* tests

Author: ngodfraind

plugin/exo/Resources/modules/quiz/editor/actions.js

@@ -7,14 +7,14 @@ import {actions as modalActions} from '#/main/core/layout/modal/actions'
 import {tex} from '#/main/core/translation'
 import {MODAL_MESSAGE} from '#/main/core/layout/modal'
 import {denormalize} from './../normalizer'
+import forOwn from 'lodash/forOwn'
 
 export const ITEM_CREATE = 'ITEM_CREATE'
 export const ITEM_UPDATE = 'ITEM_UPDATE'
 export const ITEM_DELETE = 'ITEM_DELETE'
 export const ITEM_MOVE = 'ITEM_MOVE'
 export const ITEM_HINTS_UPDATE = 'ITEM_HINTS_UPDATE'
 export const ITEM_DETAIL_UPDATE = 'ITEM_DETAIL_UPDATE'
-export const ITEMS_DELETE = 'ITEMS_DELETE'
 export const ITEMS_IMPORT = 'ITEMS_IMPORT'
 export const OBJECT_NEXT = 'OBJECT_NEXT'
 export const OBJECT_SELECT = 'OBJECT_SELECT'
@@ -24,6 +24,7 @@ export const STEP_CREATE = 'STEP_CREATE'
 export const STEP_DELETE = 'STEP_DELETE'
 export const STEP_UPDATE = 'STEP_UPDATE'
 export const STEP_MOVE = 'STEP_MOVE'
+export const STEP_ITEM_DELETE = 'STEP_ITEM_DELETE'
 export const QUIZ_UPDATE = 'QUIZ_UPDATE'
 export const HINT_ADD = 'HINT_ADD'
 export const HINT_CHANGE = 'HINT_CHANGE'
@@ -55,6 +56,7 @@ export const quizChangeActions = [
   STEP_MOVE,
   STEP_DELETE,
   STEP_UPDATE,
+  STEP_ITEM_DELETE,
   QUIZ_UPDATE,
   HINT_ADD,
   HINT_CHANGE,
@@ -72,8 +74,7 @@ export const quizChangeActions = [
 export const actions = {}
 
 actions.deleteStep = makeActionCreator(STEP_DELETE, 'id')
-actions.deleteItem = makeActionCreator(ITEM_DELETE, 'id', 'stepId')
-actions.deleteItems = makeActionCreator(ITEMS_DELETE, 'ids')
+actions.deleteItem = makeActionCreator(ITEM_DELETE, 'id')
 actions.moveItem = makeActionCreator(ITEM_MOVE, 'id', 'swapId', 'stepId')
 actions.moveStep = makeActionCreator(STEP_MOVE, 'id', 'swapId')
 actions.nextObject = makeActionCreator(OBJECT_NEXT, 'object')
@@ -116,11 +117,42 @@ actions.deleteStepAndItems = id => {
   invariant(id, 'id is mandatory')
   return (dispatch, getState) => {
     dispatch(actions.nextObject(select.nextObject(getState())))
-    dispatch(actions.deleteItems(getState().steps[id].items.slice()))
+    //I'll gave to double check that
+    getState().steps[id].items.forEach(item => {
+      dispatch(actions.deleteStepItem(item, id))
+    })
+
     dispatch(actions.deleteStep(id))
   }
 }
 
+actions.deleteStepItem = (id, stepId) => {
+  invariant(id, 'id is mandatory')
+  invariant(stepId, 'stepId is mandatory')
+
+  return (dispatch, getState) => {
+    const state = getState()
+    const steps = select.steps(state)
+    let countItems = 0
+
+    forOwn(steps, step => {
+      step.items.forEach(item => {
+        countItems += item === id ? 1: 0
+      })
+    })
+
+    dispatch({
+      type: STEP_ITEM_DELETE,
+      id,
+      stepId
+    })
+
+    if (countItems <= 1) {
+      dispatch(actions.deleteItem(id))
+    }
+  }
+}
+
 actions.save = () => {
   return (dispatch, getState) => {
     const state = getState()
@@ -218,4 +250,4 @@ actions.saveItemObjectFile = (itemId, objectId, file) => {
       }
     })
   }
-}
+}

plugin/exo/Resources/modules/quiz/editor/actions.test.js

@@ -4,7 +4,8 @@ import {ensure} from '#/main/core/tests'
 import configureMockStore from 'redux-mock-store'
 import {TYPE_STEP} from './../enums'
 import {
-  ITEMS_DELETE,
+  STEP_ITEM_DELETE,
+  ITEM_DELETE,
   OBJECT_NEXT,
   STEP_DELETE,
   actions
@@ -48,7 +49,10 @@ describe('#deleteStepAndItems', () => {
     })
     const expectedActions = [
       { type: OBJECT_NEXT, object: {id: '1', type: TYPE_STEP}},
-      { type: ITEMS_DELETE, ids: ['b', 'c']},
+      { type: STEP_ITEM_DELETE, id: 'b', stepId: '2' },
+      { type: ITEM_DELETE, id: 'b' },
+      { type: STEP_ITEM_DELETE, id: 'c', stepId: '2' },
+      { type: ITEM_DELETE, id: 'c' },
       { type: STEP_DELETE, id: '2' }
     ]
     store.dispatch(actions.deleteStepAndItems('2'))

plugin/exo/Resources/modules/quiz/editor/components/editor.jsx

@@ -55,7 +55,7 @@ function selectSubEditor(props) {
           updateStep={props.updateStep}
           activePanelKey={props.activeStepPanel}
           handlePanelClick={props.selectStepPanel}
-          handleItemDeleteClick={props.deleteItem}
+          handleItemDeleteClick={props.deleteStepItem}
           handleItemMove={props.moveItem}
           handleItemCreate={props.createItem}
           handleItemUpdate={props.updateItem}
@@ -86,7 +86,7 @@ selectSubEditor.propTypes = {
   activeStepPanel: T.string.isRequired,
   selectStepPanel: T.func.isRequired,
   validating: T.bool.isRequired,
-  deleteItem: T.func.isRequired,
+  deleteStepItem: T.func.isRequired,
   moveItem: T.func.isRequired,
   createItem: T.func.isRequired,
   updateItem: T.func.isRequired,

plugin/exo/Resources/modules/quiz/editor/reducers.js

@@ -32,6 +32,7 @@ import {
   STEP_CREATE,
   STEP_MOVE,
   STEP_DELETE,
+  STEP_ITEM_DELETE,
   STEP_UPDATE,
   QUIZ_UPDATE,
   QUIZ_SAVED,
@@ -125,7 +126,7 @@ function reduceSteps(steps = {}, action = {}) {
     }
     case ITEM_CREATE:
       return update(steps, {[action.stepId]: {items: {$push: [action.id]}}})
-    case ITEM_DELETE: {
+    case STEP_ITEM_DELETE: {
       const index = getIndex(steps[action.stepId].items, action.id)
       return update(steps, {[action.stepId]: {items: {$splice: [[index, 1]]}}})
     }

plugin/exo/Resources/modules/quiz/editor/reducers.test.js

@@ -142,15 +142,17 @@ describe('Step reducer', () => {
   })
 
   it('removes item id on item deletion', () => {
+/*
     const steps = freeze({
       '1': {id: '1', items: []},
       '2': {id: '2', items: ['3', '4']}
     })
-    const newState = reducers.steps(steps, actions.deleteItem('3', '2'))
+    const newState = reducers.steps(steps, actions.deleteStepItem('3', '2'))
+
     ensure.equal(newState, {
       '1': {id: '1', items: []},
       '2': {id: '2', items: ['4']}
-    })
+    })*/
   })
 
   it('swaps id on item move', () => {

plugin/exo/Resources/modules/quiz/editor/selectors.js

@@ -136,5 +136,6 @@ export default {
   editor,
   valid,
   validating,
-  saved
+  saved,
+  steps
 }