kitchen-simulator 10.4.0 → 10.5.0

package/es/catalog/utils/item-loader.js

@@ -12,7 +12,7 @@ import { ARROW_COLOR, BASE_CABINET_LAYOUTPOS, OBJTYPE_GROUP, OBJTYPE_MESH, SHADE
 import { Item } from "../../models";
 import * as GeomUtils from "./geom-utils";
 import { loadGLTF } from "./load-obj";
-import { animateDoor, getSkuAliasFromCatalogElement, isEmpty, translateDrawer } from "../../utils/helper";
+import { animateDoor, getCatalogCabinetSku, isEmpty, translateDrawer } from "../../utils/helper";
 import { isWarningCabinet } from "../../shared/domain/cabinet-warning";
 import { orderCabinetAssemblyKeys } from "../cabinet/cabinet-assembly-order";
 var INITIAL_NORMAL_MAP = '';
@@ -124,7 +124,7 @@ export function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corn
   var rowCount = 0; //parseInt((element.type.length / lineCount - 0.51).toFixed(), 10);
 
   // Get SKU Alias
-  var objSKU = getSkuAliasFromCatalogElement(this, element);
+  var objSKU = getCatalogCabinetSku(element);
   if (rowCount > 0) {
     for (var _x = 0; _x < rowCount; _x++) {
       splitStr.push(objSKU.slice(lineCount * _x, lineCount * (_x + 1)));

package/es/class/item.js

@@ -567,9 +567,7 @@ var Item = /*#__PURE__*/function () {
           break;
       }
       if (onInternalEvent && duplicatedElement) {
-        var _state$get;
-        var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
-        var jsElement = updatePayloadOfInternalEvent(duplicatedElement, layer, catalog);
+        var jsElement = updatePayloadOfInternalEvent(duplicatedElement, layer);
         onInternalEvent({
           type: INTERNAL_EVENT_DRAW_ELEMENT,
           value: jsElement

package/es/class/line.js

@@ -427,7 +427,6 @@ var Line = /*#__PURE__*/function () {
   }, {
     key: "beginDrawingLine",
     value: function beginDrawingLine(state, layerID, x, y, onInternalEvent) {
-      var _state$get;
       // if end drawing by created area
       if (state.mode == MODE_IDLE) {
         return {
@@ -481,8 +480,7 @@ var Line = /*#__PURE__*/function () {
         drawingSupport: drawingSupport
       });
       var layer = state.getIn(['scene', 'layers', layerID]);
-      var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
-      var payload = updatePayloadOfInternalEvent(line, layer, catalog);
+      var payload = updatePayloadOfInternalEvent(line, layer);
       if (onInternalEvent) onInternalEvent({
         type: INTERNAL_EVENT_START_DRAW_WALL,
         value: payload

package/es/components/viewer2d/item.js

@@ -87,7 +87,7 @@ export default function Item(_ref, _ref2) {
           length: itemDistanceFromLine,
           angle: rotation,
           rotation: element[1],
-          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? cat.info.is_corner !== 1 ? -(nh + 4) : -nh : 0, ") rotate(").concat(element[1], ", 0, 0)")
+          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? (item === null || item === void 0 ? void 0 : item.is_corner) !== 1 ? -(nh + 4) : -nh : 0, ") rotate(").concat(element[1], ", 0, 0)")
         })));
       }
     });

package/es/components/viewer2d/viewer2d.js

@@ -1256,7 +1256,7 @@ export default function Viewer2D(_ref, _ref2) {
         _currentObject = state.getIn(['scene', 'layers', layerID, elementPrototype, elementID]);
       }
       if (_currentObject) {
-        var payload = updatePayloadOfInternalEvent(_currentObject, layer, catalog);
+        var payload = updatePayloadOfInternalEvent(_currentObject, layer);
 
         // send selection event befor replace event
         if (internalType === constants.INTERNAL_EVENT_REPLACE_CABINET) {

package/es/components/viewer3d/ruler-utils/layer3D.js

@@ -94,8 +94,8 @@ export default function Layer3D(_ref) {
       depth: depth,
       altitude: altitude
     };
-    val.layoutpos = cat && cat.info.layoutpos;
-    val.is_corner = cat && cat.info.is_corner;
+    val.layoutpos = item === null || item === void 0 ? void 0 : item.layoutpos;
+    val.is_corner = item.is_corner;
     val.item = item.toJS();
     var calcrect = GeometryUtils.getCalcRectFromItem3D(val);
     if (isSnapped(calcrect.rect[3], calcrect.rect[2]) || isSnapped(calcrect.rect[2], calcrect.rect[1]) || isSnapped(calcrect.rect[0], calcrect.rect[3])) {

package/es/components/viewer3d/scene-creator.js

@@ -2153,8 +2153,8 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
       height: height,
       depth: depth
     };
-    val.layoutpos = cat.info.layoutpos;
-    val.is_corner = cat.info.is_corner;
+    val.layoutpos = item === null || item === void 0 ? void 0 : item.layoutpos;
+    val.is_corner = item === null || item === void 0 ? void 0 : item.is_corner;
     val.item = item;
     var calcrect = GeometryUtils.getCalcRectFromItem3D(val);
 

package/es/components/viewer3d/viewer3d.js

@@ -544,7 +544,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
         if (item !== null) {
           var catid = item.type;
           var cat = catalog.elements[catid];
-          layoutpos = cat.info.layoutpos;
+          layoutpos = item === null || item === void 0 ? void 0 : item.layoutpos;
         }
         var oPos = new Three.Vector2(pos.clone().x, pos.clone().y);
         var sBounding = obj.children[0].userData;
@@ -564,9 +564,7 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
             return false;
           }
           var _item = layer.items.getIn([data.id]);
-          var ocatid = _item.type;
-          var ocat = catalog.elements[ocatid];
-          var olayoutpos = ocat.info.layoutpos;
+          var olayoutpos = _item.layoutpos;
           if (!(layoutpos === BASE_CABINET_LAYOUTPOS && olayoutpos === WALL_CABINET_LAYOUTPOS || layoutpos === WALL_CABINET_LAYOUTPOS && olayoutpos === BASE_CABINET_LAYOUTPOS)) {
             var tRot = _item.rotation;
             var tPos = new Three.Vector2(_item.x, _item.y);
@@ -1192,9 +1190,8 @@ var Scene3DViewer = /*#__PURE__*/function (_React$Component) {
         var curLayerId = _this2.props.state.scene.selectedLayer;
         var curLayer = _this2.props.state.scene.getIn(['layers', curLayerId]);
         if (!isEmpty(evtType) && !isEmpty(evtElement)) {
-          var _state$get, _this2$props$onIntern, _this2$props;
-          var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
-          var payload = updatePayloadOfInternalEvent(evtElement, curLayer, catalog, pointArray);
+          var _this2$props$onIntern, _this2$props;
+          var payload = updatePayloadOfInternalEvent(evtElement, curLayer, pointArray);
           (_this2$props$onIntern = (_this2$props = _this2.props).onInternalEvent) === null || _this2$props$onIntern === void 0 || _this2$props$onIntern.call(_this2$props, {
             type: evtType,
             value: payload

package/es/events/external/handleExternalEvent.js

@@ -128,6 +128,7 @@ function _handleExternalEvent() {
           handleSetFinishing(props, state, evt.payload);
           return _context.abrupt("continue", 31);
         case 30:
+          console.log('*** catalog ***', props.catalog);
           handleSyncScene(props, state, layer, layerId, getMoldingDataOfScene2, computeSkinPanels, DEFAULT_MOLDING_PIECE_LENGTH, INTERNAL_EVENT_SYNC_SCENE);
           return _context.abrupt("continue", 31);
         case 31:

package/es/events/external/handlers.syncScene.js

@@ -9,7 +9,7 @@ export function handleSyncScene(props, state, layer, layerId, getMoldingDataOfSc
 
   // get skin panel data
   var skinPanelExclusionSKUs = (_props$configData$ski = props === null || props === void 0 || (_props$configData2 = props.configData) === null || _props$configData2 === void 0 ? void 0 : _props$configData2.skinPanelExclusionSKUs) !== null && _props$configData$ski !== void 0 ? _props$configData$ski : [];
-  sceneData.layers[layerId].skinPanelData = computeSkinPanels(layer, skinPanelExclusionSKUs, props.catalog);
+  sceneData.layers[layerId].skinPanelData = computeSkinPanels(layer, skinPanelExclusionSKUs);
 
   // send scene object from 3DTool to HostApp using internalEvent
   (_props$onInternalEven = props.onInternalEvent) === null || _props$onInternalEven === void 0 || _props$onInternalEven.call(props, {

package/es/utils/geometry.js

@@ -739,7 +739,8 @@ export function getAllItemSpecified(scene, catalog, filter) {
       rotRad: item.rotation / 180 * Math.PI
     };
     var cat = item.type ? findCatalogElement(catalog, item.type) : null;
-    var info = cat === null || cat === void 0 ? void 0 : cat.info;
+    val.layoutpos = item.layoutpos;
+    val.is_corner = item.is_corner;
     var props = item.properties;
     var getSize = function getSize(key) {
       var _props$getIn, _props$getIn2, _props$getIn3;
@@ -752,15 +753,11 @@ export function getAllItemSpecified(scene, catalog, filter) {
       depth: getSize('depth')
     };
     val.item = item;
-    if (info) {
-      val.layoutpos = info.layoutpos;
-      val.is_corner = info.is_corner;
-    }
 
     // Filter check
     if (Array.isArray(filter)) {
-      if (info && !filter.includes(info.layoutpos)) return;
-    } else if ((info === null || info === void 0 ? void 0 : info.layoutpos) !== filter || isEmpty(cat) || (cat === null || cat === void 0 ? void 0 : cat.type) === 'appliance' && ['Cook Top', 'Microwave'].includes(cat === null || cat === void 0 || (_cat$obj = cat.obj) === null || _cat$obj === void 0 ? void 0 : _cat$obj.category)) {
+      if (!val.layoutpos || !filter.includes(val.layoutpos)) return;
+    } else if (val.layoutpos !== filter || isEmpty(cat) || (cat === null || cat === void 0 ? void 0 : cat.type) === 'appliance' && ['Cook Top', 'Microwave'].includes(cat === null || cat === void 0 || (_cat$obj = cat.obj) === null || _cat$obj === void 0 ? void 0 : _cat$obj.category)) {
       return;
     }
 

package/es/utils/helper.js

@@ -12,6 +12,7 @@ import { formatNumber } from "./math";
 import AWS from 'aws-sdk';
 import { GeometryUtils, MoldingUtils } from "./export";
 import { calcDistancesFromHoleToNearestOneOrWall } from "./geometry";
+import { toJSIfNeeded } from "../shared/objects/immutable";
 var s3 = new AWS.S3({
   accessKeyId: process.env.REACT_APP_AWS_ID,
   secretAccessKey: process.env.REACT_APP_AWS_SECRET
@@ -400,11 +401,11 @@ export function centering2D(state) {
   if (viewer2DActions) updateViwer2D(viewer, viewer2DActions);
   return state;
 }
-export function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
-  var pointArray = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+export function updatePayloadOfInternalEvent(currentObject, layer) {
+  var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   if (isEmpty(currentObject)) return null;
   var updatedPayload = currentObject.toJS();
-  if (isEmpty(layer) || isEmpty(catalog)) return updatedPayload;
+  if (isEmpty(layer)) return updatedPayload;
   if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'lines') {
     // caculating length of selected line//
     var v_a = layer.vertices.get(currentObject.vertices.get(0));
@@ -424,7 +425,7 @@ export function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
     if (pointArray) updatedPayload.distArray = pointArray;
 
     // update sku_number using sku_array
-    updatedPayload.sku_number = getSkuAliasFromCatalog(catalog, currentObject);
+    updatedPayload.sku_number = getCatalogCabinetSku(currentObject);
   } else if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'holes') {
     var _calcDistancesFromHol = calcDistancesFromHoleToNearestOneOrWall(currentObject, layer),
       distLeft = _calcDistancesFromHol.distLeft,
@@ -442,20 +443,9 @@ export function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
   }
   return updatedPayload;
 }
-export function getSkuAliasFromCatalog(catalog, sceneObject) {
-  var _catalog$elements;
-  var sceneObjectJS = typeof (sceneObject === null || sceneObject === void 0 ? void 0 : sceneObject.toJS) === 'function' ? sceneObject.toJS() : sceneObject;
-  var elementName = sceneObjectJS === null || sceneObjectJS === void 0 ? void 0 : sceneObjectJS.name;
-  var catalogElement = catalog === null || catalog === void 0 || (_catalog$elements = catalog.elements) === null || _catalog$elements === void 0 ? void 0 : _catalog$elements[elementName];
-  return getSkuAliasFromCatalogElement(catalogElement, sceneObjectJS);
-}
-export function getSkuAliasFromCatalogElement(catalogElement, sceneObject) {
-  var _sceneObjectJS$doorSt, _catalogElement$obj, _skuAlias$sku;
-  var sceneObjectJS = typeof (sceneObject === null || sceneObject === void 0 ? void 0 : sceneObject.toJS) === 'function' ? sceneObject.toJS() : sceneObject;
-  var doorColorId = sceneObjectJS === null || sceneObjectJS === void 0 || (_sceneObjectJS$doorSt = sceneObjectJS.doorStyle) === null || _sceneObjectJS$doorSt === void 0 ? void 0 : _sceneObjectJS$doorSt.id;
-  var skuArray = catalogElement === null || catalogElement === void 0 || (_catalogElement$obj = catalogElement.obj) === null || _catalogElement$obj === void 0 ? void 0 : _catalogElement$obj.skuArray;
-  var skuAlias = skuArray === null || skuArray === void 0 ? void 0 : skuArray.find(function (sku) {
-    return sku.door_color_id === doorColorId;
-  });
-  return (_skuAlias$sku = skuAlias === null || skuAlias === void 0 ? void 0 : skuAlias.sku) !== null && _skuAlias$sku !== void 0 ? _skuAlias$sku : sceneObjectJS === null || sceneObjectJS === void 0 ? void 0 : sceneObjectJS.sku_number;
+export function getCatalogCabinetSku(sceneObject) {
+  var _sceneObjectJS$ccdf;
+  var sceneObjectJS = toJSIfNeeded(sceneObject);
+  var ccdfSku = sceneObjectJS === null || sceneObjectJS === void 0 || (_sceneObjectJS$ccdf = sceneObjectJS.ccdf) === null || _sceneObjectJS$ccdf === void 0 ? void 0 : _sceneObjectJS$ccdf.catalog_cabinet_sku;
+  return ccdfSku;
 }

package/es/utils/skinPanelEngine.js

@@ -6,7 +6,7 @@ import { BASE_CABINET_LAYOUTPOS, WALL_CABINET_LAYOUTPOS, TALL_CABINET_LAYOUTPOS,
 import { buildRectFromLines, getAllLines, pointsDistance, relationshipOfTwoOverlappedLines, rotatePointAroundPoint } from "./geometry";
 import { MathUtils } from "./export";
 import { convert } from "./convert-units-lite";
-import { getSkuAliasFromCatalog, isEmpty } from "./helper";
+import { getCatalogCabinetSku, isEmpty } from "./helper";
 import { SKIN_SKU_BSV_24, SKIN_SKU_BSV_48, SKIN_SKU_WSV_1242, SKIN_SKU_WSV_2442, SKIN_SKU_WSV_2460, SKIN_SKU_USV245325, SKIN_HEIGHT_53_25 } from "../constants/catalog/skinPanel";
 function toCm(item, prop) {
   var unit = item.properties.get(prop).get('_unit') || 'cm';
@@ -493,16 +493,12 @@ function buildSkinPanelData(faces) {
   });
   return result;
 }
-function shouldExcludeSkinPanel(itemJS, exclusionSet, catalog) {
-  var _itemJS$doorStyle;
-  var cabinetSku = getSkuAliasFromCatalog(catalog, itemJS);
-  var doorColorSku = itemJS === null || itemJS === void 0 || (_itemJS$doorStyle = itemJS.doorStyle) === null || _itemJS$doorStyle === void 0 ? void 0 : _itemJS$doorStyle.sku;
-  if (!cabinetSku || !doorColorSku) return false;
-  return exclusionSet.has("".concat(cabinetSku, "-").concat(doorColorSku));
+function shouldExcludeSkinPanel(itemJS, exclusionSet) {
+  var catalogCabinetSku = getCatalogCabinetSku(itemJS);
+  return exclusionSet.has(catalogCabinetSku);
 }
 export function computeSkinPanels(layer) {
   var skinPanelExclusionSKUs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var catalog = arguments.length > 2 ? arguments[2] : undefined;
   var exclusionSet = new Set(skinPanelExclusionSKUs);
 
   // Get candidate skin panel items and other items
@@ -510,7 +506,7 @@ export function computeSkinPanels(layer) {
     skinPanelItems = _collectLayerItems.skinPanelItems,
     otherItems = _collectLayerItems.otherItems;
   var filteredSkinPanelItems = skinPanelItems.filter(function (item) {
-    return !shouldExcludeSkinPanel(item.toJS(), exclusionSet, catalog);
+    return !shouldExcludeSkinPanel(item.toJS(), exclusionSet);
   });
 
   // Get all skin face list of [skinPanelItems] & [otherItems]

package/lib/catalog/utils/item-loader.js

@@ -138,7 +138,7 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
   var rowCount = 0; //parseInt((element.type.length / lineCount - 0.51).toFixed(), 10);
 
   // Get SKU Alias
-  var objSKU = (0, _helper.getSkuAliasFromCatalogElement)(this, element);
+  var objSKU = (0, _helper.getCatalogCabinetSku)(element);
   if (rowCount > 0) {
     for (var _x = 0; _x < rowCount; _x++) {
       splitStr.push(objSKU.slice(lineCount * _x, lineCount * (_x + 1)));

package/lib/class/item.js

@@ -574,9 +574,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
           break;
       }
       if (onInternalEvent && duplicatedElement) {
-        var _state$get;
-        var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
-        var jsElement = (0, _helper.updatePayloadOfInternalEvent)(duplicatedElement, layer, catalog);
+        var jsElement = (0, _helper.updatePayloadOfInternalEvent)(duplicatedElement, layer);
         onInternalEvent({
           type: _constants.INTERNAL_EVENT_DRAW_ELEMENT,
           value: jsElement

package/lib/class/line.js

@@ -436,7 +436,6 @@ var Line = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "beginDrawingLine",
     value: function beginDrawingLine(state, layerID, x, y, onInternalEvent) {
-      var _state$get;
       // if end drawing by created area
       if (state.mode == _constants.MODE_IDLE) {
         return {
@@ -490,8 +489,7 @@ var Line = exports["default"] = /*#__PURE__*/function () {
         drawingSupport: drawingSupport
       });
       var layer = state.getIn(['scene', 'layers', layerID]);
-      var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
-      var payload = (0, _helper.updatePayloadOfInternalEvent)(line, layer, catalog);
+      var payload = (0, _helper.updatePayloadOfInternalEvent)(line, layer);
       if (onInternalEvent) onInternalEvent({
         type: _constants.INTERNAL_EVENT_START_DRAW_WALL,
         value: payload

package/lib/components/viewer2d/item.js

@@ -96,7 +96,7 @@ function Item(_ref, _ref2) {
           length: itemDistanceFromLine,
           angle: rotation,
           rotation: element[1],
-          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? cat.info.is_corner !== 1 ? -(nh + 4) : -nh : 0, ") rotate(").concat(element[1], ", 0, 0)")
+          transform: "translate(".concat(element[1] === 180 ? -nw : element[1] === 0 ? nw : 0, ", ").concat(element[1] === 90 ? nh : element[1] === -90 ? (item === null || item === void 0 ? void 0 : item.is_corner) !== 1 ? -(nh + 4) : -nh : 0, ") rotate(").concat(element[1], ", 0, 0)")
         })));
       }
     });

package/lib/components/viewer2d/viewer2d.js

@@ -1265,7 +1265,7 @@ function Viewer2D(_ref, _ref2) {
         _currentObject = state.getIn(['scene', 'layers', layerID, elementPrototype, elementID]);
       }
       if (_currentObject) {
-        var payload = (0, _helper.updatePayloadOfInternalEvent)(_currentObject, layer, catalog);
+        var payload = (0, _helper.updatePayloadOfInternalEvent)(_currentObject, layer);
 
         // send selection event befor replace event
         if (internalType === constants.INTERNAL_EVENT_REPLACE_CABINET) {

package/lib/components/viewer3d/ruler-utils/layer3D.js

@@ -101,8 +101,8 @@ function Layer3D(_ref) {
       depth: depth,
       altitude: altitude
     };
-    val.layoutpos = cat && cat.info.layoutpos;
-    val.is_corner = cat && cat.info.is_corner;
+    val.layoutpos = item === null || item === void 0 ? void 0 : item.layoutpos;
+    val.is_corner = item.is_corner;
     val.item = item.toJS();
     var calcrect = _export.GeometryUtils.getCalcRectFromItem3D(val);
     if (isSnapped(calcrect.rect[3], calcrect.rect[2]) || isSnapped(calcrect.rect[2], calcrect.rect[1]) || isSnapped(calcrect.rect[0], calcrect.rect[3])) {

package/lib/components/viewer3d/scene-creator.js

@@ -2187,8 +2187,8 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
       height: height,
       depth: depth
     };
-    val.layoutpos = cat.info.layoutpos;
-    val.is_corner = cat.info.is_corner;
+    val.layoutpos = item === null || item === void 0 ? void 0 : item.layoutpos;
+    val.is_corner = item === null || item === void 0 ? void 0 : item.is_corner;
     val.item = item;
     var calcrect = _export.GeometryUtils.getCalcRectFromItem3D(val);
 

package/lib/components/viewer3d/viewer3d.js

@@ -551,7 +551,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         if (item !== null) {
           var catid = item.type;
           var cat = catalog.elements[catid];
-          layoutpos = cat.info.layoutpos;
+          layoutpos = item === null || item === void 0 ? void 0 : item.layoutpos;
         }
         var oPos = new Three.Vector2(pos.clone().x, pos.clone().y);
         var sBounding = obj.children[0].userData;
@@ -571,9 +571,7 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
             return false;
           }
           var _item = layer.items.getIn([data.id]);
-          var ocatid = _item.type;
-          var ocat = catalog.elements[ocatid];
-          var olayoutpos = ocat.info.layoutpos;
+          var olayoutpos = _item.layoutpos;
           if (!(layoutpos === _constants.BASE_CABINET_LAYOUTPOS && olayoutpos === _constants.WALL_CABINET_LAYOUTPOS || layoutpos === _constants.WALL_CABINET_LAYOUTPOS && olayoutpos === _constants.BASE_CABINET_LAYOUTPOS)) {
             var tRot = _item.rotation;
             var tPos = new Three.Vector2(_item.x, _item.y);
@@ -1199,9 +1197,8 @@ var Scene3DViewer = exports["default"] = /*#__PURE__*/function (_React$Component
         var curLayerId = _this2.props.state.scene.selectedLayer;
         var curLayer = _this2.props.state.scene.getIn(['layers', curLayerId]);
         if (!(0, _helper.isEmpty)(evtType) && !(0, _helper.isEmpty)(evtElement)) {
-          var _state$get, _this2$props$onIntern, _this2$props;
-          var catalog = (_state$get = state.get('catalog')) === null || _state$get === void 0 ? void 0 : _state$get.toJS();
-          var payload = (0, _helper.updatePayloadOfInternalEvent)(evtElement, curLayer, catalog, pointArray);
+          var _this2$props$onIntern, _this2$props;
+          var payload = (0, _helper.updatePayloadOfInternalEvent)(evtElement, curLayer, pointArray);
           (_this2$props$onIntern = (_this2$props = _this2.props).onInternalEvent) === null || _this2$props$onIntern === void 0 || _this2$props$onIntern.call(_this2$props, {
             type: evtType,
             value: payload

package/lib/events/external/handleExternalEvent.js

@@ -135,6 +135,7 @@ function _handleExternalEvent() {
           (0, _handlers5.handleSetFinishing)(props, state, evt.payload);
           return _context.abrupt("continue", 31);
         case 30:
+          console.log('*** catalog ***', props.catalog);
           (0, _handlers10.handleSyncScene)(props, state, layer, layerId, _molding.getMoldingDataOfScene2, _skinPanelEngine.computeSkinPanels, _constants.DEFAULT_MOLDING_PIECE_LENGTH, _constants.INTERNAL_EVENT_SYNC_SCENE);
           return _context.abrupt("continue", 31);
         case 31:

package/lib/events/external/handlers.syncScene.js

@@ -15,7 +15,7 @@ function handleSyncScene(props, state, layer, layerId, getMoldingDataOfScene2, c
 
   // get skin panel data
   var skinPanelExclusionSKUs = (_props$configData$ski = props === null || props === void 0 || (_props$configData2 = props.configData) === null || _props$configData2 === void 0 ? void 0 : _props$configData2.skinPanelExclusionSKUs) !== null && _props$configData$ski !== void 0 ? _props$configData$ski : [];
-  sceneData.layers[layerId].skinPanelData = computeSkinPanels(layer, skinPanelExclusionSKUs, props.catalog);
+  sceneData.layers[layerId].skinPanelData = computeSkinPanels(layer, skinPanelExclusionSKUs);
 
   // send scene object from 3DTool to HostApp using internalEvent
   (_props$onInternalEven = props.onInternalEvent) === null || _props$onInternalEven === void 0 || _props$onInternalEven.call(props, {

package/lib/utils/geometry.js

@@ -843,7 +843,8 @@ function getAllItemSpecified(scene, catalog, filter) {
       rotRad: item.rotation / 180 * Math.PI
     };
     var cat = item.type ? findCatalogElement(catalog, item.type) : null;
-    var info = cat === null || cat === void 0 ? void 0 : cat.info;
+    val.layoutpos = item.layoutpos;
+    val.is_corner = item.is_corner;
     var props = item.properties;
     var getSize = function getSize(key) {
       var _props$getIn, _props$getIn2, _props$getIn3;
@@ -856,15 +857,11 @@ function getAllItemSpecified(scene, catalog, filter) {
       depth: getSize('depth')
     };
     val.item = item;
-    if (info) {
-      val.layoutpos = info.layoutpos;
-      val.is_corner = info.is_corner;
-    }
 
     // Filter check
     if (Array.isArray(filter)) {
-      if (info && !filter.includes(info.layoutpos)) return;
-    } else if ((info === null || info === void 0 ? void 0 : info.layoutpos) !== filter || (0, _helper.isEmpty)(cat) || (cat === null || cat === void 0 ? void 0 : cat.type) === 'appliance' && ['Cook Top', 'Microwave'].includes(cat === null || cat === void 0 || (_cat$obj = cat.obj) === null || _cat$obj === void 0 ? void 0 : _cat$obj.category)) {
+      if (!val.layoutpos || !filter.includes(val.layoutpos)) return;
+    } else if (val.layoutpos !== filter || (0, _helper.isEmpty)(cat) || (cat === null || cat === void 0 ? void 0 : cat.type) === 'appliance' && ['Cook Top', 'Microwave'].includes(cat === null || cat === void 0 || (_cat$obj = cat.obj) === null || _cat$obj === void 0 ? void 0 : _cat$obj.category)) {
       return;
     }
 

package/lib/utils/helper.js

@@ -11,9 +11,8 @@ exports.base64Decode = void 0;
 exports.centering2D = centering2D;
 exports.compareSVGRect = void 0;
 exports.debugUtil = debugUtil;
+exports.getCatalogCabinetSku = getCatalogCabinetSku;
 exports.getSignedUrl = exports.getPathInfo = exports.getPath = void 0;
-exports.getSkuAliasFromCatalog = getSkuAliasFromCatalog;
-exports.getSkuAliasFromCatalogElement = getSkuAliasFromCatalogElement;
 exports.handleCamRect = handleCamRect;
 exports.isCeilLimitation = isCeilLimitation;
 exports.isElevationView = isElevationView;
@@ -39,6 +38,7 @@ var _math = require("./math");
 var _awsSdk = _interopRequireDefault(require("aws-sdk"));
 var _export = require("./export");
 var _geometry = require("./geometry");
+var _immutable = require("../shared/objects/immutable");
 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" != _typeof3(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 _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); 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; }
@@ -430,11 +430,11 @@ function centering2D(state) {
   if (viewer2DActions) updateViwer2D(viewer, viewer2DActions);
   return state;
 }
-function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
-  var pointArray = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+function updatePayloadOfInternalEvent(currentObject, layer) {
+  var pointArray = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   if (isEmpty(currentObject)) return null;
   var updatedPayload = currentObject.toJS();
-  if (isEmpty(layer) || isEmpty(catalog)) return updatedPayload;
+  if (isEmpty(layer)) return updatedPayload;
   if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'lines') {
     // caculating length of selected line//
     var v_a = layer.vertices.get(currentObject.vertices.get(0));
@@ -454,7 +454,7 @@ function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
     if (pointArray) updatedPayload.distArray = pointArray;
 
     // update sku_number using sku_array
-    updatedPayload.sku_number = getSkuAliasFromCatalog(catalog, currentObject);
+    updatedPayload.sku_number = getCatalogCabinetSku(currentObject);
   } else if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'holes') {
     var _calcDistancesFromHol = (0, _geometry.calcDistancesFromHoleToNearestOneOrWall)(currentObject, layer),
       distLeft = _calcDistancesFromHol.distLeft,
@@ -472,20 +472,9 @@ function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
   }
   return updatedPayload;
 }
-function getSkuAliasFromCatalog(catalog, sceneObject) {
-  var _catalog$elements;
-  var sceneObjectJS = typeof (sceneObject === null || sceneObject === void 0 ? void 0 : sceneObject.toJS) === 'function' ? sceneObject.toJS() : sceneObject;
-  var elementName = sceneObjectJS === null || sceneObjectJS === void 0 ? void 0 : sceneObjectJS.name;
-  var catalogElement = catalog === null || catalog === void 0 || (_catalog$elements = catalog.elements) === null || _catalog$elements === void 0 ? void 0 : _catalog$elements[elementName];
-  return getSkuAliasFromCatalogElement(catalogElement, sceneObjectJS);
-}
-function getSkuAliasFromCatalogElement(catalogElement, sceneObject) {
-  var _sceneObjectJS$doorSt, _catalogElement$obj, _skuAlias$sku;
-  var sceneObjectJS = typeof (sceneObject === null || sceneObject === void 0 ? void 0 : sceneObject.toJS) === 'function' ? sceneObject.toJS() : sceneObject;
-  var doorColorId = sceneObjectJS === null || sceneObjectJS === void 0 || (_sceneObjectJS$doorSt = sceneObjectJS.doorStyle) === null || _sceneObjectJS$doorSt === void 0 ? void 0 : _sceneObjectJS$doorSt.id;
-  var skuArray = catalogElement === null || catalogElement === void 0 || (_catalogElement$obj = catalogElement.obj) === null || _catalogElement$obj === void 0 ? void 0 : _catalogElement$obj.skuArray;
-  var skuAlias = skuArray === null || skuArray === void 0 ? void 0 : skuArray.find(function (sku) {
-    return sku.door_color_id === doorColorId;
-  });
-  return (_skuAlias$sku = skuAlias === null || skuAlias === void 0 ? void 0 : skuAlias.sku) !== null && _skuAlias$sku !== void 0 ? _skuAlias$sku : sceneObjectJS === null || sceneObjectJS === void 0 ? void 0 : sceneObjectJS.sku_number;
+function getCatalogCabinetSku(sceneObject) {
+  var _sceneObjectJS$ccdf;
+  var sceneObjectJS = (0, _immutable.toJSIfNeeded)(sceneObject);
+  var ccdfSku = sceneObjectJS === null || sceneObjectJS === void 0 || (_sceneObjectJS$ccdf = sceneObjectJS.ccdf) === null || _sceneObjectJS$ccdf === void 0 ? void 0 : _sceneObjectJS$ccdf.catalog_cabinet_sku;
+  return ccdfSku;
 }

package/lib/utils/skinPanelEngine.js

@@ -501,16 +501,12 @@ function buildSkinPanelData(faces) {
   });
   return result;
 }
-function shouldExcludeSkinPanel(itemJS, exclusionSet, catalog) {
-  var _itemJS$doorStyle;
-  var cabinetSku = (0, _helper.getSkuAliasFromCatalog)(catalog, itemJS);
-  var doorColorSku = itemJS === null || itemJS === void 0 || (_itemJS$doorStyle = itemJS.doorStyle) === null || _itemJS$doorStyle === void 0 ? void 0 : _itemJS$doorStyle.sku;
-  if (!cabinetSku || !doorColorSku) return false;
-  return exclusionSet.has("".concat(cabinetSku, "-").concat(doorColorSku));
+function shouldExcludeSkinPanel(itemJS, exclusionSet) {
+  var catalogCabinetSku = (0, _helper.getCatalogCabinetSku)(itemJS);
+  return exclusionSet.has(catalogCabinetSku);
 }
 function computeSkinPanels(layer) {
   var skinPanelExclusionSKUs = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var catalog = arguments.length > 2 ? arguments[2] : undefined;
   var exclusionSet = new Set(skinPanelExclusionSKUs);
 
   // Get candidate skin panel items and other items
@@ -518,7 +514,7 @@ function computeSkinPanels(layer) {
     skinPanelItems = _collectLayerItems.skinPanelItems,
     otherItems = _collectLayerItems.otherItems;
   var filteredSkinPanelItems = skinPanelItems.filter(function (item) {
-    return !shouldExcludeSkinPanel(item.toJS(), exclusionSet, catalog);
+    return !shouldExcludeSkinPanel(item.toJS(), exclusionSet);
   });
 
   // Get all skin face list of [skinPanelItems] & [otherItems]

package/package.json

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