kitchen-simulator 2.0.16 → 2.0.20

package/lib/utils/isolate-event-handler.js

@@ -140,10 +140,11 @@ function _parseTempPlaceholdersFromCabinetPayload() {
                 tempPlaceholders.map(function (element) {
                   var sink_match = element.name.match(/\d_(sink_[^LR12]*)(_[LR12])?$/);
                   if (sink_match && sink_match.length >= 2) {
+                    var _cabinetPayload$struc2;
                     tempData['sink'] = tempData['sink'] || [];
                     tempData['sink'].push(element.name);
-                    var sink_url = process.env.DEV_HTTP + process.env.DEV_PORT + "/uploads/assets/default/".concat(sink_match[1], ".gltf");
-                    json_data.sink = sink_url;
+                    var sink_url = process.env.API_URL + "/uploads/assets/default/".concat(sink_match[1], ".gltf");
+                    if (cabinetPayload !== null && cabinetPayload !== void 0 && (_cabinetPayload$struc2 = cabinetPayload.structure_json) !== null && _cabinetPayload$struc2 !== void 0 && (_cabinetPayload$struc2 = _cabinetPayload$struc2.tempPlaceholders[0]) !== null && _cabinetPayload$struc2 !== void 0 && _cabinetPayload$struc2.structure) cabinetPayload.structure_json.tempPlaceholders[0].structure.sink = sink_url;
                   } else if (temp.some(function (felement) {
                     return felement.name.includes('base_drawer');
                   }) && element.name.includes('interior_drawer')) {
@@ -506,19 +507,26 @@ function addItemToCatalog(_x5, _x6, _x7, _x8) {
 } // Get attributs of current selected element
 function _addItemToCatalog() {
   _addItemToCatalog = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(element, state, catalogInstance, projectActions) {
+    var _element, _element2;
     var elementJs, catalog, outlineSVGData, updatedStructureJson;
     return _regenerator["default"].wrap(function (_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
+          if (!(0, _helper.isEmpty)((_element = element) === null || _element === void 0 ? void 0 : _element.name)) {
+            _context5.next = 1;
+            break;
+          }
+          return _context5.abrupt("return");
+        case 1:
           elementJs = element;
           catalog = state.getIn(['catalog']).toJS(); // add item to catalog of state
           // if (isEmpty(catalog?.elements[element.name])) {
-          _context5.next = 1;
+          _context5.next = 2;
           return loadSVGsByItem(element);
-        case 1:
+        case 2:
           outlineSVGData = _context5.sent;
-          if (!(element.type === 'cabinet')) {
-            _context5.next = 3;
+          if (!(((_element2 = element) === null || _element2 === void 0 ? void 0 : _element2.type) === 'cabinet')) {
+            _context5.next = 4;
             break;
           }
           // make placeholders of element and tempPlaceholder
@@ -530,11 +538,11 @@ function _addItemToCatalog() {
               itemID: element.itemID
             }
           });
-          _context5.next = 2;
+          _context5.next = 3;
           return updateCabinetPayload(element);
-        case 2:
-          elementJs = _context5.sent;
         case 3:
+          elementJs = _context5.sent;
+        case 4:
           elementJs = _objectSpread(_objectSpread({}, elementJs), {}, {
             outlineSVGData: outlineSVGData,
             type: element.type,
@@ -547,7 +555,7 @@ function _addItemToCatalog() {
             projectActions.addElementToCatalog(elementJs);
           }
           // }
-        case 4:
+        case 5:
         case "end":
           return _context5.stop();
       }
@@ -991,7 +999,7 @@ function handleExternalEvent(_x10) {
 function _handleExternalEvent() {
   _handleExternalEvent = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee8(props) {
     var _evt$payload3, _evt$payload4;
-    var evt, state, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, _evt$payload5, moveType, moveValue, value, defaulTitle, _evt$payload6, doorStyle, itemCDS, isAll, _doorStyle, _value, _value2, layer, bb, w, h, viewer, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value3, layerId, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i2, _i3, _i4, _props$onInternalEven2, _t5, _t6;
+    var evt, state, _evt$payload, cdsItems, itemKeys, _loop3, i, _props$onInternalEven, sLineCnt, element, _state$viewer2D, _evt$payload$initialP, mouseX, mouseY, v2d, vPosX, vPosY, layerID, _evt$payload5, moveType, moveValue, value, defaulTitle, _evt$payload6, doorStyle, itemCDS, isAll, _doorStyle, _value, _value2, layer, bb, w, h, viewer, _evt$payload7, moldingInfo, isGlobal, distElement, _distElement, _evt$payload8, option, _value3, layerId, _layer, _layer$getIn, selectedLines, selectedHoles, selectedItems, _i2, _i3, _i4, _evt$payload9, _evt$payload0, _evt$payload1, _evt$payload10, _layerID, _layer2, orginalItemInfo, originalItem, originalItemPos, replaceItem, _props$onInternalEven2, _t5, _t6;
     return _regenerator["default"].wrap(function (_context9) {
       while (1) switch (_context9.prev = _context9.next) {
         case 0:
@@ -999,7 +1007,7 @@ function _handleExternalEvent() {
           evt = props.externalEvent;
           state = props.state.get('KitchenConfigurator');
           _t5 = evt === null || evt === void 0 ? void 0 : evt.type;
-          _context9.next = _t5 === _constants.EXTERNAL_EVENT_LOAD_PROJECT ? 1 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 5 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 6 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 7 : _t5 === _constants.EXTERNAL_EVENT_ADD_WALL ? 8 : _t5 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 9 : _t5 === _constants.EXTERNAL_EVENT_ADD_HOLE ? 12 : _t5 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 13 : _t5 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 19 : _t5 === _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 20 : _t5 === _constants.EXTERNAL_EVENT_SET_INITIAL_DATA ? 21 : _t5 === _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 22 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_IN ? 23 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_OUT ? 24 : _t5 === _constants.EXTERNAL_EVENT_CENTERING_2D ? 25 : _t5 === _constants.EXTERNAL_EVENT_UNDO ? 26 : _t5 === _constants.EXTERNAL_EVENT_REDO ? 27 : _t5 === _constants.EXTERNAL_EVENT_SET_MOLDING ? 28 : _t5 === _constants.EXTERNAL_EVENT_DUPLICATE_ELEMENT ? 30 : _t5 === _constants.EXTERNAL_EVENT_DELETE_ELEMENT ? 31 : _t5 === _constants.EXTERNAL_EVENT_PROJECT_SETTING ? 32 : _t5 === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? 33 : _t5 === _constants.EXTERNAL_EVENT_UPDATE_PROPERTY ? 33 : _t5 === _constants.EXTERNAL_EVENT_SYNC_SCENE ? 34 : 35;
+          _context9.next = _t5 === _constants.EXTERNAL_EVENT_LOAD_PROJECT ? 1 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_3D ? 5 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_2D ? 6 : _t5 === _constants.EXTERNAL_EVENT_TOGGLE_TO_ELEVATION ? 7 : _t5 === _constants.EXTERNAL_EVENT_ADD_WALL ? 8 : _t5 === _constants.EXTERNAL_EVENT_ADD_ITEM ? 9 : _t5 === _constants.EXTERNAL_EVENT_ADD_HOLE ? 12 : _t5 === _constants.EXTERNAL_EVENT_MOVE_PAN ? 13 : _t5 === _constants.EXTERNAL_EVENT_NEW_PROJECT ? 19 : _t5 === _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE ? 20 : _t5 === _constants.EXTERNAL_EVENT_SET_INITIAL_DATA ? 21 : _t5 === _constants.EXTERNAL_EVENT_ADD_ROOM_SHAPE ? 22 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_IN ? 23 : _t5 === _constants.EXTERNAL_EVENT_ZOOM_OUT ? 24 : _t5 === _constants.EXTERNAL_EVENT_CENTERING_2D ? 25 : _t5 === _constants.EXTERNAL_EVENT_UNDO ? 26 : _t5 === _constants.EXTERNAL_EVENT_REDO ? 27 : _t5 === _constants.EXTERNAL_EVENT_SET_MOLDING ? 28 : _t5 === _constants.EXTERNAL_EVENT_DUPLICATE_ELEMENT ? 30 : _t5 === _constants.EXTERNAL_EVENT_DELETE_ELEMENT ? 31 : _t5 === _constants.EXTERNAL_EVENT_PROJECT_SETTING ? 32 : _t5 === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? 33 : _t5 === _constants.EXTERNAL_EVENT_UPDATE_PROPERTY ? 33 : _t5 === _constants.EXTERNAL_EVENT_REPLACE_CABINET ? 34 : _t5 === _constants.EXTERNAL_EVENT_SYNC_SCENE ? 36 : 37;
           break;
         case 1:
           // prepare item data request
@@ -1014,9 +1022,13 @@ function _handleExternalEvent() {
                   it = evt === null || evt === void 0 || (_evt$payload2 = evt.payload) === null || _evt$payload2 === void 0 || (_evt$payload2 = _evt$payload2.layers['layer-1']) === null || _evt$payload2 === void 0 ? void 0 : _evt$payload2.items[itemKeys[i]];
                   if (!cdsItems.some(function (v) {
                     var _it$doorStyle;
-                    return it.type === v.type && ((_it$doorStyle = it.doorStyle) === null || _it$doorStyle === void 0 || (_it$doorStyle = _it$doorStyle.doorStyles) === null || _it$doorStyle === void 0 ? void 0 : _it$doorStyle.cabinet_door_style_id) === v.cdsId;
+                    return it.itemId === v.itemId && it.name === v.name && ((_it$doorStyle = it.doorStyle) === null || _it$doorStyle === void 0 || (_it$doorStyle = _it$doorStyle.doorStyles) === null || _it$doorStyle === void 0 ? void 0 : _it$doorStyle.cabinet_door_style_id) === v.cdsId;
                   })) cdsItems.push({
-                    type: it.type,
+                    itemId: it.itemId,
+                    name: it.name,
+                    sku_number: it.sku_number,
+                    category: it.category,
+                    prototype: it.prototype,
                     cdsId: (_it$doorStyle2 = it.doorStyle) === null || _it$doorStyle2 === void 0 || (_it$doorStyle2 = _it$doorStyle2.doorStyles) === null || _it$doorStyle2 === void 0 ? void 0 : _it$doorStyle2.cabinet_door_style_id
                   });
                 case 1:
@@ -1075,23 +1087,23 @@ function _handleExternalEvent() {
               };
             }());
           }
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 5:
           props.projectActions.setMode(_constants.MODE_IDLE_3D);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 6:
           props.projectActions.setMode(_constants.MODE_IDLE);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 7:
           sLineCnt = state.getIn(['scene', 'layers', 'layer-1', 'selected', 'lines']).size;
           if (sLineCnt > 0) props.projectActions.setMode(_constants.MODE_ELEVATION_VIEW);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 8:
           if (state.mode === _constants.MODE_IDLE || state.mode === _constants.MODE_2D_PAN) props.linesActions.selectToolDrawingLine('wall');else {
             props.projectActions.setMode(_constants.MODE_IDLE);
             props.linesActions.selectToolDrawingLine('wall');
           }
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 9:
           if ((0, _helper.isEmpty)(evt === null || evt === void 0 ? void 0 : evt.payload)) {
             _context9.next = 11;
@@ -1122,10 +1134,10 @@ function _handleExternalEvent() {
           props.projectActions.pushLastSelectedCatalogElementToHistory(element);
           props.projectActions.setIsCabinetDrawing(true);
         case 11:
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 12:
           _constants.ARRAY_3D_MODES.includes(state.mode) ? props.holesActions.selectToolDrawingHole3D(evt === null || evt === void 0 || (_evt$payload3 = evt.payload) === null || _evt$payload3 === void 0 ? void 0 : _evt$payload3.holeName) : props.holesActions.selectToolDrawingHole(evt === null || evt === void 0 || (_evt$payload4 = evt.payload) === null || _evt$payload4 === void 0 ? void 0 : _evt$payload4.holeName);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 13:
           _evt$payload5 = evt.payload, moveType = _evt$payload5.moveType, moveValue = _evt$payload5.moveValue;
           value = state.getIn(['viewer2D']).toJS();
@@ -1146,23 +1158,23 @@ function _handleExternalEvent() {
           return _context9.abrupt("continue", 18);
         case 18:
           updateViwer2D(value, props.viewer2DActions);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 19:
           defaulTitle = 'Untitle';
           props.projectActions.newProject();
           props.projectActions.rename(defaulTitle);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 20:
           _evt$payload6 = evt.payload, doorStyle = _evt$payload6.doorStyle, itemCDS = _evt$payload6.itemCDS, isAll = _evt$payload6.isAll;
           props.itemsActions.setDoorStyle(doorStyle, itemCDS, isAll);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 21:
           _doorStyle = evt.payload.doorStyle;
           props.itemsActions.setInitialDoorStyle(_doorStyle.doorStyle);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 22:
           props.projectActions.loadProject(evt.payload);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 23:
           _value = state.getIn(['viewer2D']).toJS();
           _value.a += 0.1;
@@ -1170,7 +1182,7 @@ function _handleExternalEvent() {
           _value.e -= _value.SVGWidth * 0.1 / 2;
           _value.f -= _value.SVGHeight * 0.1 / 2;
           updateViwer2D(_value, props.viewer2DActions);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 24:
           _value2 = state.getIn(['viewer2D']).toJS();
           _value2.a -= 0.1;
@@ -1178,7 +1190,7 @@ function _handleExternalEvent() {
           _value2.e += _value2.SVGWidth * 0.1 / 2;
           _value2.f += _value2.SVGHeight * 0.1 / 2;
           updateViwer2D(_value2, props.viewer2DActions);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 25:
           // calculate the bounding box of all elements in plan
           layer = state.scene.getIn(['layers', state.scene.selectedLayer]);
@@ -1212,28 +1224,28 @@ function _handleExternalEvent() {
             viewer.d = 0.99;
           }
           updateViwer2D(viewer, props.viewer2DActions);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 26:
           props.projectActions.undo();
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 27:
           props.projectActions.redo();
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 28:
           _evt$payload7 = evt.payload, moldingInfo = _evt$payload7.moldingInfo, isGlobal = _evt$payload7.isGlobal;
           _context9.next = 29;
           return loadMoldingSvg(moldingInfo);
         case 29:
           props.itemsActions.setMolding(moldingInfo, isGlobal);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 30:
           distElement = getElement(evt.payload, state);
           if (distElement) props.itemsActions.duplicateSelected(distElement);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 31:
           _distElement = getElement(evt.payload, state);
           if (_distElement) props.projectActions.remove(_distElement);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 32:
           _evt$payload8 = evt.payload, option = _evt$payload8.option, _value3 = _evt$payload8.value;
           if (option === _constants.PROJECT_SETTING_OPTION.UPDATE_CEIL_HEIGHT) {
@@ -1248,7 +1260,7 @@ function _handleExternalEvent() {
           } else if (option === _constants.PROJECT_SETTING_OPTION.CHANGE_WINDOW_DOOR_MEASURE) {
             props.viewer2DActions.changeWindowDoorMeasure(_value3);
           }
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 33:
           layerId = state.getIn(['scene', 'selectedLayer']);
           _layer = state.getIn(['scene', 'layers', layerId]);
@@ -1256,8 +1268,31 @@ function _handleExternalEvent() {
           for (_i2 = 0; _i2 < selectedLines.size; _i2++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['lines', selectedLines.get(_i2)]), evt.payload, props.catalog, props.projectActions, evt.callback);
           for (_i3 = 0; _i3 < selectedHoles.size; _i3++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['holes', selectedHoles.get(_i3)]), evt.payload, props.catalog, props.projectActions, evt.callback);
           for (_i4 = 0; _i4 < selectedItems.size; _i4++) (evt === null || evt === void 0 ? void 0 : evt.type) === _constants.EXTERNAL_EVENT_UPDATE_ATTRIBUTE ? updateAttributeOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, state, _layer, props.projectActions, evt.callback) : updatePropertyOfSelectedElement(_layer.getIn(['items', selectedItems.get(_i4)]), evt.payload, props.catalog, props.projectActions, evt.callback);
-          return _context9.abrupt("continue", 35);
+          return _context9.abrupt("continue", 37);
         case 34:
+          _layerID = state.scene.selectedLayer;
+          _layer2 = state.scene.getIn(['layers', _layerID]).toJS();
+          orginalItemInfo = evt === null || evt === void 0 || (_evt$payload9 = evt.payload) === null || _evt$payload9 === void 0 ? void 0 : _evt$payload9.orginalItemInfo;
+          originalItem = _layer2 === null || _layer2 === void 0 ? void 0 : _layer2.items[orginalItemInfo.id];
+          _context9.next = 35;
+          return addItemToCatalog(evt.payload.replaceItemInfo, state, props.catalog, props.projectActions);
+        case 35:
+          originalItemPos = {
+            rotation: originalItem.rotation,
+            selectedItemId: originalItem.id,
+            x: originalItem.x,
+            y: originalItem.y
+          };
+          replaceItem = {
+            name: evt === null || evt === void 0 || (_evt$payload0 = evt.payload) === null || _evt$payload0 === void 0 || (_evt$payload0 = _evt$payload0.replaceItemInfo) === null || _evt$payload0 === void 0 ? void 0 : _evt$payload0.name,
+            info: {
+              width: evt === null || evt === void 0 || (_evt$payload1 = evt.payload) === null || _evt$payload1 === void 0 || (_evt$payload1 = _evt$payload1.replaceItemInfo) === null || _evt$payload1 === void 0 || (_evt$payload1 = _evt$payload1.sizeinfo) === null || _evt$payload1 === void 0 ? void 0 : _evt$payload1.width,
+              height: evt === null || evt === void 0 || (_evt$payload10 = evt.payload) === null || _evt$payload10 === void 0 || (_evt$payload10 = _evt$payload10.replaceItemInfo) === null || _evt$payload10 === void 0 || (_evt$payload10 = _evt$payload10.sizeinfo) === null || _evt$payload10 === void 0 ? void 0 : _evt$payload10.height
+            }
+          };
+          props.itemsActions.replaceItem(originalItemPos, originalItem, replaceItem);
+          return _context9.abrupt("continue", 37);
+        case 36:
           // send scene object from 3DTool to HostApp using internalEvent
           (_props$onInternalEven2 = props.onInternalEvent) === null || _props$onInternalEven2 === void 0 || _props$onInternalEven2.call(props, {
             type: _constants.INTERNAL_EVENT_SYNC_SCENE,
@@ -1265,8 +1300,8 @@ function _handleExternalEvent() {
               scene: state.scene.toJS()
             }
           });
-          return _context9.abrupt("continue", 35);
-        case 35:
+          return _context9.abrupt("continue", 37);
+        case 37:
         case "end":
           return _context9.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "2.0.16",
+  "version": "2.0.20",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",