kitchen-simulator 1.0.0-alin.8 → 1.0.0-clark.54

package/lib/LiteRenderer.js

@@ -36,11 +36,10 @@ var _itemLoader = require("./catalog/utils/item-loader");
 var _export2 = require("./plugins/export");
 var _immutable = require("immutable");
 var Sentry = _interopRequireWildcard(require("@sentry/react"));
-var _projectActions = require("./actions/project-actions");
 var _exporter = _interopRequireDefault(require("./catalog/utils/exporter"));
 var THREE = _interopRequireWildcard(require("three"));
 var _LiteKitchenConfigurator = _interopRequireDefault(require("./LiteKitchenConfigurator"));
-var _excluded = ["width", "height", "projectElement", "categoryData", "dataBundle", "configData", "options", "user", "auth", "featureFlags", "sentry", "analytics", "externalEvent", "onError"];
+var _excluded = ["width", "height", "projectElement", "dataBundle", "configData", "options", "user", "auth", "featureFlags", "sentry", "analytics", "externalEvent", "onError"];
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -154,7 +153,6 @@ function LiteRenderer(props) {
   var width = props.width,
     height = props.height,
     projectElement = props.projectElement,
-    categoryData = props.categoryData,
     dataBundle = props.dataBundle,
     configData = props.configData,
     options = props.options,
@@ -253,21 +251,15 @@ function LiteRenderer(props) {
       emit(lastExternalEventRef.current, last.errors);
     }
   }, [externalEvent, emit]);
-  var _ref = categoryData && categoryData.data || {},
-    catalogs = _ref.catalogs,
-    colorAlias = _ref.colorAlias,
-    subgroups = _ref.subgroups;
-  var _ref2 = dataBundle || {},
-    _ref2$data = _ref2.data,
-    data = _ref2$data === void 0 ? [] : _ref2$data,
-    _ref2$appliances = _ref2.appliances,
-    appliances = _ref2$appliances === void 0 ? [] : _ref2$appliances,
-    _ref2$furnishing = _ref2.furnishing,
-    furnishing = _ref2$furnishing === void 0 ? [] : _ref2$furnishing,
-    _ref2$lighting = _ref2.lighting,
-    lighting = _ref2$lighting === void 0 ? [] : _ref2$lighting;
-  var _projectElement = (0, _slicedToArray2["default"])(projectElement, 1),
-    project_data = _projectElement[0].project_data;
+  var _ref = dataBundle || {},
+    _ref$data = _ref.data,
+    data = _ref$data === void 0 ? [] : _ref$data,
+    _ref$appliances = _ref.appliances,
+    appliances = _ref$appliances === void 0 ? [] : _ref$appliances,
+    _ref$furnishing = _ref.furnishing,
+    furnishing = _ref$furnishing === void 0 ? [] : _ref$furnishing,
+    _ref$lighting = _ref.lighting,
+    lighting = _ref$lighting === void 0 ? [] : _ref$lighting;
   var id = configData.id,
     logoImg = configData.logoImg,
     companyUrl = configData.companyUrl;
@@ -275,13 +267,9 @@ function LiteRenderer(props) {
     _React$useState2 = (0, _slicedToArray2["default"])(_React$useState, 2),
     outlineSVGData = _React$useState2[0],
     setOutlineSVGData = _React$useState2[1];
-  var _React$useState3 = _react["default"].useState(false),
-    _React$useState4 = (0, _slicedToArray2["default"])(_React$useState3, 2),
-    catalogInitiated = _React$useState4[0],
-    setCatalogInitiated = _React$useState4[1];
   (0, _react.useEffect)(function () {
     var initMyCatalog = /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
         var x, _x, _x2;
         return _regenerator["default"].wrap(function (_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -298,75 +286,19 @@ function LiteRenderer(props) {
         }, _callee);
       }));
       return function initMyCatalog() {
-        return _ref3.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }();
     var loadMoldings = /*#__PURE__*/function () {
-      var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var door_color_alias, subgroup_ids, door_color_alias_ids, doorStyleData, molding, toeMoldingData, cabinets, promises;
+      var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+        var molding, toeMoldingData, moldingData, promises;
         return _regenerator["default"].wrap(function (_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              door_color_alias = [];
-              subgroup_ids = catalogs.filter(function (item) {
-                return item.id == id;
-              })[0].manufacturer_subgroup_ids.split(',');
-              door_color_alias_ids = [];
-              subgroups.forEach(function (subgroup) {
-                if (subgroup_ids.some(function (id) {
-                  return id == subgroup.id.toString();
-                })) {
-                  subgroup.door_color_alias_ids.split(',').forEach(function (item) {
-                    item != '' && door_color_alias_ids.push(item);
-                  });
-                }
-              });
-              colorAlias.forEach(function (color) {
-                return door_color_alias_ids.some(function (id) {
-                  return id == color.id.toString();
-                }) && door_color_alias.push(color);
-              });
-              doorStyleData = categoryData.data.doorStyles.items;
-              categoryData.data.doorStyles.items = doorStyleData.treeStruct;
-              door_color_alias.forEach(function (dca) {
-                doorStyleData.doorColorData.forEach(function (dc) {
-                  dc.door_style_id = parseInt(dc.door_style_id);
-                  if (dc.id !== dca.door_color_id) return;
-                  dc.name = dca.alias_name;
-                  dc.color_sku_alias = dca.sku_alias_name;
-                  doorStyleData.treeStruct.forEach(function (el) {
-                    el.items.forEach(function (elem) {
-                      return dc.door_style_id === elem.id && (dc.door_style_name = elem.name);
-                    });
-                  });
-                  dca.alias_installation_type = (0, _helper.isEmpty)(dca.alias_installation_type) ? [] : dca.alias_installation_type.split(',').map(function (n) {
-                    return parseInt(n);
-                  });
-                  categoryData.data.doorStyles.items.forEach(function (item) {
-                    if (dca.alias_installation_type.some(function (ait) {
-                      return ait === item.id;
-                    })) item.items.forEach(function (ds) {
-                      if (ds.name === dc.door_style_name) ds.items.push(dc);
-                    });
-                  });
-                });
-              });
               molding = [];
-              toeMoldingData = [];
-              cabinets = categoryData.data.cabinets;
-              cabinets[cabinets.length - 1].items.forEach(function (index) {
-                if (index.name.toLowerCase().includes('molding')) {
-                  index.items.forEach(function (item) {
-                    return molding.push(item);
-                  });
-                }
-                if (index.name.includes(_constants.TOE_KICK_MOLDING)) {
-                  index.items.forEach(function (item) {
-                    return toeMoldingData.push(item);
-                  });
-                }
-              });
-              categoryData.data.toeMoldingData = toeMoldingData;
+              toeMoldingData = {};
+              moldingData = {};
+              if (moldingData.name = _constants.TOE_KICK_MOLDING) toeMoldingData = moldingData;
               promises = molding.map(function (child) {
                 return new Promise(function (resolve, reject) {
                   var url = child === null || child === void 0 ? void 0 : child.shape_svg;
@@ -394,17 +326,17 @@ function LiteRenderer(props) {
         }, _callee2);
       }));
       return function loadMoldings() {
-        return _ref4.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }();
     var loadSVGs = /*#__PURE__*/function () {
-      var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+      var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4() {
         var svgLoadPromises, outlineData;
         return _regenerator["default"].wrap(function (_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               svgLoadPromises = data.map(/*#__PURE__*/function () {
-                var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(item) {
+                var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(item) {
                   var _parsed$xml$viewBox, _parsed$xml$viewBox2, response, svgText, loader, parsed, _t;
                   return _regenerator["default"].wrap(function (_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
@@ -452,7 +384,7 @@ function LiteRenderer(props) {
                   }, _callee3, null, [[1, 5]]);
                 }));
                 return function (_x3) {
-                  return _ref6.apply(this, arguments);
+                  return _ref5.apply(this, arguments);
                 };
               }());
               _context4.next = 1;
@@ -467,15 +399,14 @@ function LiteRenderer(props) {
         }, _callee4);
       }));
       return function loadSVGs() {
-        return _ref5.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }();
     var initCatalog = /*#__PURE__*/function () {
-      var _ref7 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+      var _ref6 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5() {
         return _regenerator["default"].wrap(function (_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              setCatalogInitiated(false);
               _context5.next = 1;
               return initMyCatalog();
             case 1:
@@ -485,20 +416,18 @@ function LiteRenderer(props) {
               _context5.next = 3;
               return loadSVGs();
             case 3:
-              setCatalogInitiated(true);
-            case 4:
             case "end":
               return _context5.stop();
           }
         }, _callee5);
       }));
       return function initCatalog() {
-        return _ref7.apply(this, arguments);
+        return _ref6.apply(this, arguments);
       };
     }();
     initCatalog();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [categoryData, data, id, catalogs, colorAlias, subgroups]);
+  }, [data, id]);
 
   // Register items once SVGs are loaded
   (0, _react.useEffect)(function () {
@@ -535,21 +464,6 @@ function LiteRenderer(props) {
     });
     for (var x in Item) MyCatalog.registerElement(Item[x]);
   }, [outlineSVGData, data, appliances, furnishing, lighting]);
-  (0, _react.useEffect)(function () {
-    if (projectElement.length === 0) return;
-    if (!catalogInitiated) return;
-    sessionStorage.setItem('projectTitle', projectElement[0].title);
-    store.dispatch((0, _projectActions.rename)(projectElement[0].title));
-    sessionStorage.setItem('projectId', projectElement[0].id);
-    sessionStorage.setItem('email', projectElement[0].email);
-    sessionStorage.setItem('firstName', projectElement[0].firstName);
-    sessionStorage.setItem('lastName', projectElement[0].lastName);
-    sessionStorage.setItem('phone', projectElement[0].phone);
-    var jsonData;
-    jsonData = JSON.parse(projectElement[0].project_data);
-    jsonData.isLoadingCabinet = false;
-    store.dispatch((0, _projectActions.loadProject)(jsonData, categoryData));
-  }, [project_data, catalogInitiated]);
   return /*#__PURE__*/_react["default"].createElement(_AppContext["default"].Provider, null, /*#__PURE__*/_react["default"].createElement(_reactRedux.Provider, {
     store: store
   }, /*#__PURE__*/_react["default"].createElement(ToolErrorBoundary, {
@@ -564,7 +478,6 @@ function LiteRenderer(props) {
     stateExtractor: function stateExtractor(state) {
       return state.get('KitchenConfigurator');
     },
-    categoryData: categoryData,
     data: data,
     configData: configData,
     externalEvent: externalEvent
@@ -577,7 +490,6 @@ LiteRenderer.propTypes = {
   width: _propTypes["default"].oneOfType([_propTypes["default"].number, _propTypes["default"].string]),
   height: _propTypes["default"].oneOfType([_propTypes["default"].number, _propTypes["default"].string]),
   projectElement: _propTypes["default"].arrayOf(_propTypes["default"].object),
-  categoryData: _propTypes["default"].any,
   dataBundle: _propTypes["default"].any,
   configData: _propTypes["default"].any,
   catalog: _propTypes["default"].oneOfType([_propTypes["default"].object, _propTypes["default"].instanceOf(Models.Catalog)]),

package/lib/actions/items-actions.js

@@ -274,11 +274,11 @@ function updateItemsAltitude(layerID, itemID, value) {
     value: value
   };
 }
-function setDoorStyle(doorStyle, pathes, isAll) {
+function setDoorStyle(doorStyle, itemCDS, isAll) {
   return {
     type: _constants.SET_DOOR_STYLE,
     doorStyle: doorStyle,
-    pathes: pathes,
+    itemCDS: itemCDS,
     isAll: isAll
   };
 }
@@ -343,11 +343,10 @@ function setModelling(model) {
     model: model
   };
 }
-function setInitialDoorStyle(doorStyle, oStyle) {
+function setInitialDoorStyle(doorStyle) {
   return {
     type: _constants.SET_INITIAL_DOOR_STYLE,
-    doorStyle: doorStyle,
-    oStyle: oStyle
+    doorStyle: doorStyle
   };
 }
 function setMoveStatus(status) {

package/lib/actions/project-actions.js

@@ -69,11 +69,10 @@ function setStateProperties(properties) {
     properties: properties
   };
 }
-function loadProject(sceneJSON, categoryData) {
+function loadProject(sceneJSON) {
   return {
     type: _constants.LOAD_PROJECT,
-    sceneJSON: sceneJSON,
-    categoryData: categoryData
+    sceneJSON: sceneJSON
   };
 }
 function newProject() {

package/lib/catalog/catalog.js

@@ -254,10 +254,7 @@ var Catalog = exports["default"] = /*#__PURE__*/function () {
       if (name === '') {
         throw new Error('Category has empty name');
       }
-      if (this.hasCategory(name)) {
-        throw new Error('Category has already been registered');
-      }
-      return true;
+      return !this.hasCategory(name);
     }
 
     /**

package/lib/catalog/utils/exporter.js

@@ -26,7 +26,8 @@ function _default(_ref) {
     is_corner = _ref.is_corner,
     alti = _ref.alti,
     obj_property = _ref.obj_property,
-    outlineSVGData = _ref.outlineSVGData;
+    outlineSVGData = _ref.outlineSVGData,
+    cds = _ref.cds;
   var _length = alti || 0;
   // const length = convert(_length).from("in").to("cm");
   var length = _length;
@@ -141,6 +142,7 @@ function _default(_ref) {
     }),
     img: base,
     obj: obj_property,
+    cds: cds,
     render2D: function render2D(element, layer, scene) {
       return render2DItem.call(this, element, layer, scene, sizeinfo, layoutpos, is_corner, shape_svg);
     },

package/lib/class/item.js

@@ -55,65 +55,19 @@ var Item = exports["default"] = /*#__PURE__*/function () {
         isDuplication: isDuplication
       }, null, state);
       if (item.category === 'cabinet') {
+        var _state$doorStyle;
         var layer = state.getIn(['scene', 'layers', layerID]);
-        if (state.doorStyle !== null && state.doorStyle !== undefined) {
-          var _state$doorStyle, _temp$doorStyles;
-          var temp = layer.doorStyle || ((_state$doorStyle = state.doorStyle) === null || _state$doorStyle === void 0 ? void 0 : _state$doorStyle.toJS());
-          var cds = temp === null || temp === void 0 || (_temp$doorStyles = temp.doorStyles) === null || _temp$doorStyles === void 0 || (_temp$doorStyles = _temp$doorStyles.cds) === null || _temp$doorStyles === void 0 ? void 0 : _temp$doorStyles.find(function (elem) {
-            return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
+        var temp = layer.doorStyle || ((_state$doorStyle = state.doorStyle) === null || _state$doorStyle === void 0 ? void 0 : _state$doorStyle.toJS());
+        var cds = state.catalog.getIn(['elements', type, 'cds']);
+        if (cds) {
+          var updatedDoorStyles = _objectSpread(_objectSpread({}, temp.doorStyles), {}, {
+            cds: [cds]
+          });
+          item = item.merge({
+            doorStyle: (0, _immutable.fromJS)(_objectSpread(_objectSpread({}, temp), {}, {
+              doorStyles: updatedDoorStyles
+            }))
           });
-          if (cds) {
-            var updatedDoorStyles = _objectSpread(_objectSpread(_objectSpread({}, temp.doorStyles), cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
-              cabinet_door_style_id: cds.cabinet_door_style_id
-            });
-            item = item.merge({
-              doorStyle: (0, _immutable.fromJS)(_objectSpread(_objectSpread({}, temp), {}, {
-                doorStyles: updatedDoorStyles
-              }))
-            });
-          } else {
-            var _state$oStyle;
-            var styleObj = (_state$oStyle = state.oStyle) === null || _state$oStyle === void 0 || (_state$oStyle = _state$oStyle.toJS()) === null || _state$oStyle === void 0 ? void 0 : _state$oStyle.oStyle;
-            if (styleObj) {
-              for (var _x in styleObj) {
-                cds = styleObj[_x].data.doorStyles.cds.find(function (elem) {
-                  return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
-                });
-                if (cds) {
-                  var tmpDS = styleObj[_x].data;
-                  tmpDS.doorStyles = _objectSpread(_objectSpread(_objectSpread({}, tmpDS.doorStyles), cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
-                    cabinet_door_style_id: cds.cabinet_door_style_id
-                  });
-                  item = item.merge({
-                    doorStyle: (0, _immutable.fromJS)(tmpDS)
-                  });
-                  break;
-                }
-              }
-            }
-          }
-        } else {
-          var _state$oStyle2;
-          var _styleObj = (_state$oStyle2 = state.oStyle) === null || _state$oStyle2 === void 0 || (_state$oStyle2 = _state$oStyle2.toJS()) === null || _state$oStyle2 === void 0 ? void 0 : _state$oStyle2.oStyle;
-          if (_styleObj) {
-            for (var _x2 in _styleObj) {
-              var _styleObj$_x;
-              var _cds = (_styleObj$_x = _styleObj[_x2]) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.data) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.doorStyles) === null || _styleObj$_x === void 0 || (_styleObj$_x = _styleObj$_x.cds) === null || _styleObj$_x === void 0 ? void 0 : _styleObj$_x.find(function (elem) {
-                return elem.itemID === state.catalog.getIn(['elements', type, 'itemID']);
-              });
-              if (_cds) {
-                var _styleObj$_x2;
-                var _tmpDS = (_styleObj$_x2 = _styleObj[_x2]) === null || _styleObj$_x2 === void 0 ? void 0 : _styleObj$_x2.data;
-                _tmpDS.doorStyles = _objectSpread(_objectSpread(_objectSpread({}, _tmpDS.doorStyles), _cds.data && _cds.data[0] ? _cds.data[0] : {}), {}, {
-                  cabinet_door_style_id: _cds.cabinet_door_style_id
-                });
-                item = item.merge({
-                  doorStyle: (0, _immutable.fromJS)(_tmpDS)
-                });
-                break;
-              }
-            }
-          }
         }
       }
       if (item.get('type') === 'cabinet' && item.get('doorStyle').size === 0) {
@@ -123,15 +77,11 @@ var Item = exports["default"] = /*#__PURE__*/function () {
         };
       }
       var setSizeOfItemByDoorStyle = function setSizeOfItemByDoorStyle() {
-        var _doorStyle$doorStyles, _cds$data;
         var doorStyle = item.get('doorStyle').toJS();
-        var cds = doorStyle === null || doorStyle === void 0 || (_doorStyle$doorStyles = doorStyle.doorStyles) === null || _doorStyle$doorStyles === void 0 || (_doorStyle$doorStyles = _doorStyle$doorStyles.cds) === null || _doorStyle$doorStyles === void 0 ? void 0 : _doorStyle$doorStyles.find(function (elem) {
-          return elem.itemID === item.itemID;
-        });
-        var euro_cds = (cds === null || cds === void 0 || (_cds$data = cds.data) === null || _cds$data === void 0 ? void 0 : _cds$data.filter(function (element) {
+        var euroCDS = state.catalog.getIn(['elements', type, 'cds']).data.filter(function (element) {
           return element && element.is_euro_cds;
-        })) || [];
-        if (doorStyle.door_style_name === 'Euro & Frameless' && euro_cds.length > 0) {
+        });
+        if (doorStyle.door_style_name === 'Euro & Frameless' && euroCDS.length > 0) {
           var newProperties = item.get('properties').toJS();
           if (newProperties.hasOwnProperty('depth')) {
             if (!newProperties.hasOwnProperty('oldDepth')) {
@@ -142,8 +92,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
               });
             }
             newProperties['depth'] = new _immutable.Map({
-              length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_length).from('in').to('cm'),
-              _length: euro_cds[0].euro_length,
+              length: (0, _convertUnitsLite.convert)(euroCDS[0].euro_length).from('in').to('cm'),
+              _length: euroCDS[0].euro_length,
               _unit: 'in'
             });
           }
@@ -156,8 +106,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
               });
             }
             newProperties['height'] = new _immutable.Map({
-              length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_height).from('in').to('cm'),
-              _length: euro_cds[0].euro_height,
+              length: (0, _convertUnitsLite.convert)(euroCDS[0].euro_height).from('in').to('cm'),
+              _length: euroCDS[0].euro_height,
               _unit: 'in'
             });
           }
@@ -170,8 +120,8 @@ var Item = exports["default"] = /*#__PURE__*/function () {
               });
             }
             newProperties['width'] = new _immutable.Map({
-              length: (0, _convertUnitsLite.convert)(euro_cds[0].euro_width).from('in').to('cm') - 10,
-              _length: euro_cds[0].euro_width,
+              length: (0, _convertUnitsLite.convert)(euroCDS[0].euro_width).from('in').to('cm') - 10,
+              _length: euroCDS[0].euro_width,
               _unit: 'in'
             });
           }
@@ -1130,48 +1080,37 @@ var Item = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "setInitialDoorStyle",
-    value: function setInitialDoorStyle(state, doorStyle, oStyle) {
-      if (doorStyle === undefined) {
-        state = state.merge({
-          oStyle: new _immutable.Map({
-            oStyle: oStyle
-          })
-        });
-      } else {
-        state = state.merge({
-          doorStyle: doorStyle,
-          oStyle: new _immutable.Map({
-            oStyle: oStyle
-          })
-        });
-        var _state8 = state,
-          scene = _state8.scene;
-        var layerID = scene.get('selectedLayer');
-        var layers = scene.layers.get(layerID);
-        var items = layers.items;
-        items.forEach(function (data) {
-          {
-            var itemID = data.id;
-            var tmpDS = _objectSpread(_objectSpread({}, data.doorStyle), {}, {
-              doorStyles: _objectSpread(_objectSpread({}, data.doorStyle.doorStyles), {}, {
-                counttop: doorStyle.doorStyles.counttop
-              })
-            });
-            data = data.mergeIn(['doorStyle'], (0, _immutable.fromJS)(tmpDS));
-            layers = layers.mergeIn(['items', itemID], data);
-            state = state.merge({
-              scene: scene.mergeIn(['layers', layerID], layers)
-            });
-          }
-        });
-      }
+    value: function setInitialDoorStyle(state, doorStyle) {
+      state = state.merge({
+        doorStyle: doorStyle
+      });
+      var _state8 = state,
+        scene = _state8.scene;
+      var layerID = scene.get('selectedLayer');
+      var layers = scene.layers.get(layerID);
+      var items = layers.items;
+      items.forEach(function (data) {
+        {
+          var itemID = data.id;
+          var tmpDS = _objectSpread(_objectSpread({}, data.doorStyle), {}, {
+            doorStyles: _objectSpread(_objectSpread({}, data.doorStyle.doorStyles), {}, {
+              counttop: doorStyle.doorStyles.counttop
+            })
+          });
+          data = data.mergeIn(['doorStyle'], (0, _immutable.fromJS)(tmpDS));
+          layers = layers.mergeIn(['items', itemID], data);
+          state = state.merge({
+            scene: scene.mergeIn(['layers', layerID], layers)
+          });
+        }
+      });
       return {
         updatedState: state
       };
     }
   }, {
     key: "setDoorStyle",
-    value: function setDoorStyle(state, doorStyle, pathes, isAll) {
+    value: function setDoorStyle(state, doorStyle, itemCDS, isAll) {
       var _this2 = this;
       var keys = Object.keys(doorStyle.doorStyles);
       keys = keys.filter(function (elem) {
@@ -1188,14 +1127,14 @@ var Item = exports["default"] = /*#__PURE__*/function () {
       var layerID = state.scene.get('selectedLayer');
       var temp_layer_molding = state.scene.getIn(['layers', layerID, 'molding']);
       temp_layer_molding = temp_layer_molding.filter(function (md) {
-        return doorStyle.doorStyles.cds.some(function (ds) {
+        return itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.some(function (ds) {
           return md.itemID === ds.itemID;
         });
       });
       state = state.setIn(['scene', 'layers', layerID, 'molding'], temp_layer_molding);
       var itemIDs = state.scene.layers.getIn([layerID, 'selected', 'items']).toJS();
       var setDoorStyleOfItem = function setDoorStyleOfItem(data) {
-        var _cds$data2;
+        var _cds$data;
         if (data.category !== 'cabinet') return; //CDS should effect to cabinets
         var itemID = data.id;
         var curItem = state.getIn(['scene', 'layers', layerID, 'items', itemID]);
@@ -1203,7 +1142,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
         var tmpMolding = (0, _toConsumableArray2["default"])(curItem.molding);
         var temp_item_molding = (0, _toConsumableArray2["default"])(curItem.molding);
         temp_item_molding = temp_item_molding.filter(function (md) {
-          return doorStyle.doorStyles.cds.some(function (ds) {
+          return itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.some(function (ds) {
             return ds.itemID === md.itemID;
           });
         });
@@ -1213,17 +1152,16 @@ var Item = exports["default"] = /*#__PURE__*/function () {
             state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'molding'], temp_item_molding);
           });
         });
-        var cds = doorStyle.doorStyles.cds.find(function (elem) {
+        var cds = itemCDS === null || itemCDS === void 0 ? void 0 : itemCDS.find(function (elem) {
           return elem.itemID === data.itemID;
         });
-        var euro_cds = (cds === null || cds === void 0 || (_cds$data2 = cds.data) === null || _cds$data2 === void 0 ? void 0 : _cds$data2.filter(function (element) {
+        var euro_cds = (cds === null || cds === void 0 || (_cds$data = cds.data) === null || _cds$data === void 0 ? void 0 : _cds$data.filter(function (element) {
           return element && element.is_euro_cds;
         })) || [];
-        var cds_data;
-        if (doorStyle.door_style_name === 'Euro & Frameless' && euro_cds.length > 0) {
-          cds_data = cds ? _objectSpread(_objectSpread({}, euro_cds[0]), {}, {
-            cabinet_door_style_id: cds.cabinet_door_style_id
-          }) : {};
+        var cds_data = cds ? [cds] : [];
+        if (
+        // doorStyle.door_style_name === 'Euro & Frameless' &&
+        euro_cds.length > 0) {
           var newProperties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
           if (newProperties.hasOwnProperty('depth')) {
             if (!newProperties.hasOwnProperty('oldDepth')) {
@@ -1269,9 +1207,6 @@ var Item = exports["default"] = /*#__PURE__*/function () {
           }
           state = _this2.setJsProperties(state, layerID, itemID, newProperties).updatedState;
         } else {
-          cds_data = cds ? _objectSpread(_objectSpread({}, cds.data && cds.data[0] ? cds.data[0] : {}), {}, {
-            cabinet_door_style_id: cds.cabinet_door_style_id
-          }) : {};
           var properties = state.scene.getIn(['layers', layerID, 'items', itemID, 'properties']).toJS();
           if (properties.hasOwnProperty('oldDepth')) {
             properties['depth'] = new _immutable.Map({
@@ -1310,7 +1245,9 @@ var Item = exports["default"] = /*#__PURE__*/function () {
           color_sku_alias: doorStyle.color_sku_alias,
           // alias name of color_sku for the current dealer
           install: (0, _utils.getInstallationSuffix)(_constants.INSTALLATION_SUFFIX_TYPE.NAME, doorStyle),
-          doorStyles: _objectSpread(_objectSpread({}, tmp), cds_data)
+          doorStyles: _objectSpread(_objectSpread({}, tmp), {}, {
+            cds: cds_data
+          })
         };
         state = state.mergeIn(['scene', 'layers', layerID, 'items', itemID, 'doorStyle'], (0, _immutable.fromJS)(tmpDS));
       };