From 16a6975af115bb8d6f8e89cdae5385c830e210cd Mon Sep 17 00:00:00 2001
From: soupette <cyril.lpz@gmail.com>
Date: Wed, 15 Jan 2020 12:35:26 +0100
Subject: [PATCH] Fix add compo to dz action

---
 .../restaurant/models/Restaurant.settings.json   |  2 --
 .../ComponentSelect/MultipleMenuList.js          |  2 +-
 .../admin/src/containers/FormModal/reducer.js    | 16 +++++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/getstarted/api/restaurant/models/Restaurant.settings.json b/examples/getstarted/api/restaurant/models/Restaurant.settings.json
index b4f027a6cf..24b99755a4 100755
--- a/examples/getstarted/api/restaurant/models/Restaurant.settings.json
+++ b/examples/getstarted/api/restaurant/models/Restaurant.settings.json
@@ -81,8 +81,6 @@
     "dz": {
       "type": "dynamiczone",
       "components": [
-        "default.closingperiod",
-        "default.dish",
         "default.openingtimes",
         "default.restaurantservice"
       ]
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MultipleMenuList.js b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MultipleMenuList.js
index 08852222fb..9dfbf68891 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MultipleMenuList.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/components/ComponentSelect/MultipleMenuList.js
@@ -138,7 +138,7 @@ const MultipleMenuList = ({
   const handleChange = ({ target }) => {
     const dataTarget = {
       name,
-      components: target.name,
+      components: [target.name],
       shouldAddComponents: target.value,
     };
 
diff --git a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/reducer.js b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/reducer.js
index 9106b14eab..e4ba874edc 100644
--- a/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/reducer.js
+++ b/packages/strapi-plugin-content-type-builder/admin/src/containers/FormModal/reducer.js
@@ -1,4 +1,4 @@
-import { fromJS } from 'immutable';
+import { fromJS, List } from 'immutable';
 import pluralize from 'pluralize';
 import { snakeCase } from 'lodash';
 import makeUnique from '../../utils/makeUnique';
@@ -22,15 +22,17 @@ const reducer = (state, action) => {
       const { name, components, shouldAddComponents } = action;
 
       return state.updateIn(['modifiedData', name], list => {
+        let updatedList = list;
+
         if (shouldAddComponents) {
-          return makeUnique(list.concat(components));
+          updatedList = list.concat(components);
         } else {
-          return makeUnique(
-            list.filter(comp => {
-              return components.indexOf(comp) === -1;
-            })
-          );
+          updatedList = list.filter(comp => {
+            return components.indexOf(comp) === -1;
+          });
         }
+
+        return List(makeUnique(updatedList.toJS()));
       });
     }
     case 'ON_CHANGE':