kitchen-simulator 4.4.2 → 4.4.3

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, isEmpty, translateDrawer } from "../../utils/helper";
+import { animateDoor, getSkuAliasFromCatalogElement, isEmpty, translateDrawer } from "../../utils/helper";
 import { isWarningItem } from "../../components/viewer2d/utils";
 var INITIAL_NORMAL_MAP = '';
 
@@ -122,23 +122,8 @@ export function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corn
   var lineCount = 0; //parseInt(((newWidth) / 8 - 0.51).toFixed(), 10) - 1;
   var rowCount = 0; //parseInt((element.type.length / lineCount - 0.51).toFixed(), 10);
 
-  // Get type
-  var objSKU = this.obj.sku_number;
-  if (objSKU.length !== 0) {
-    var dcId,
-      doorStyle = element.doorStyle;
-    if (doorStyle instanceof Map) {
-      dcId = doorStyle.get('id');
-    } else {
-      dcId = doorStyle.id;
-    }
-    var skuItem = this.obj.skuArray.find(function (el) {
-      return el.door_color_id === dcId;
-    });
-    if (skuItem !== undefined) {
-      objSKU = skuItem.sku;
-    }
-  }
+  // Get SKU Alias
+  var objSKU = getSkuAliasFromCatalogElement(this, element);
   if (rowCount > 0) {
     for (var _x = 0; _x < rowCount; _x++) {
       splitStr.push(objSKU.slice(lineCount * _x, lineCount * (_x + 1)));

package/es/constants.js

@@ -773,7 +773,7 @@ export var DOORSTYLE_SCOPE_SINGLE = 'single';
 export var DOORSTYLE_SCOPE_MULTIPLE = 'multiple';
 
 // skin panel SKU
-export var SKIN_SKU_BSV_24 = 'BSV24'; // 23.25" x 34.5" : For base cabinets
+export var SKIN_SKU_BSV_24 = 'BSV'; // 23.25" x 34.5" : For base cabinets
 export var SKIN_SKU_BSV_48 = 'BSV48'; // 48" x 34.5" : For base cabinets back-to-back or island backs
 export var SKIN_SKU_WSV_1242 = 'WSV1242'; // 11.25" x 42" : For 12" deep wall cabinets
 export var SKIN_SKU_WSV_2442 = 'WSV2442'; // 23.25" x 42" : For 24" deep wall cabinets

package/es/utils/helper.js

@@ -413,7 +413,6 @@ export function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
     updatedPayload.length = _length;
     //////////////////////////////////////
   } else if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'items') {
-    var _catalog$elements$cur;
     // check this cabinet has warning box
     updatedPayload.isWarning = isWarningItem(currentObject);
     // check this item is available molding
@@ -424,14 +423,7 @@ export function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
     if (pointArray) updatedPayload.distArray = pointArray;
 
     // update sku_number using sku_array
-    var currentDoorColorId = currentObject.getIn(['doorStyle', 'id']);
-    var skuArray = catalog === null || catalog === void 0 || (_catalog$elements$cur = catalog.elements[currentObject.get('name')]) === null || _catalog$elements$cur === void 0 || (_catalog$elements$cur = _catalog$elements$cur.obj) === null || _catalog$elements$cur === void 0 ? void 0 : _catalog$elements$cur.skuArray;
-    var correctSKU = skuArray === null || skuArray === void 0 ? void 0 : skuArray.find(function (sku) {
-      return sku.door_color_id === currentDoorColorId;
-    });
-    if (correctSKU) {
-      updatedPayload.sku_number = correctSKU.sku;
-    }
+    updatedPayload.sku_number = getSkuAliasFromCatalog(catalog, currentObject);
   } else if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'holes') {
     var _calcDistancesFromHol = calcDistancesFromHoleToNearestOneOrWall(currentObject, layer),
       distLeft = _calcDistancesFromHol.distLeft,
@@ -448,4 +440,21 @@ 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;
 }

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

@@ -1612,7 +1612,7 @@ function _handleExternalEvent() {
 
           // get skin panel data
           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);
+          sceneData.layers[layerId].skinPanelData = computeSkinPanels(layer, skinPanelExclusionSKUs, props.catalog);
 
           // send scene object from 3DTool to HostApp using internalEvent
           (_props$onInternalEven3 = props.onInternalEvent) === null || _props$onInternalEven3 === void 0 || _props$onInternalEven3.call(props, {

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 { isEmpty } from "./helper";
+import { getSkuAliasFromCatalog, isEmpty } from "./helper";
 function toCm(item, prop) {
   var unit = item.properties.get(prop).get('_unit') || 'cm';
   var value = item.properties.get(prop).get('_length');
@@ -245,7 +245,7 @@ function resolveTallCabinetBundle(face) {
   }
 
   // fallback
-  return [SKIN_SKU_USV245325];
+  return [SKIN_SKU_USV245325, SKIN_SKU_WSV_2442];
 }
 
 /**
@@ -303,15 +303,16 @@ function buildSkinPanelData(faces) {
   }
   return result;
 }
-function shouldExcludeSkinPanel(itemJS, exclusionSet) {
+function shouldExcludeSkinPanel(itemJS, exclusionSet, catalog) {
   var _itemJS$doorStyle;
-  var cabinetSku = itemJS === null || itemJS === void 0 ? void 0 : itemJS.sku_number;
+  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));
 }
 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
@@ -319,7 +320,7 @@ export function computeSkinPanels(layer) {
     skinPanelItems = _collectLayerItems.skinPanelItems,
     otherItems = _collectLayerItems.otherItems;
   var filteredSkinPanelItems = skinPanelItems.filter(function (item) {
-    return !shouldExcludeSkinPanel(item.toJS(), exclusionSet);
+    return !shouldExcludeSkinPanel(item.toJS(), exclusionSet, catalog);
   });
 
   // Get all skin face list of [skinPanelItems] & [otherItems]

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

@@ -136,23 +136,8 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
   var lineCount = 0; //parseInt(((newWidth) / 8 - 0.51).toFixed(), 10) - 1;
   var rowCount = 0; //parseInt((element.type.length / lineCount - 0.51).toFixed(), 10);
 
-  // Get type
-  var objSKU = this.obj.sku_number;
-  if (objSKU.length !== 0) {
-    var dcId,
-      doorStyle = element.doorStyle;
-    if (doorStyle instanceof _immutable.Map) {
-      dcId = doorStyle.get('id');
-    } else {
-      dcId = doorStyle.id;
-    }
-    var skuItem = this.obj.skuArray.find(function (el) {
-      return el.door_color_id === dcId;
-    });
-    if (skuItem !== undefined) {
-      objSKU = skuItem.sku;
-    }
-  }
+  // Get SKU Alias
+  var objSKU = (0, _helper.getSkuAliasFromCatalogElement)(this, element);
   if (rowCount > 0) {
     for (var _x = 0; _x < rowCount; _x++) {
       splitStr.push(objSKU.slice(lineCount * _x, lineCount * (_x + 1)));

package/lib/constants.js

@@ -783,7 +783,7 @@ var DOORSTYLE_SCOPE_SINGLE = exports.DOORSTYLE_SCOPE_SINGLE = 'single';
 var DOORSTYLE_SCOPE_MULTIPLE = exports.DOORSTYLE_SCOPE_MULTIPLE = 'multiple';
 
 // skin panel SKU
-var SKIN_SKU_BSV_24 = exports.SKIN_SKU_BSV_24 = 'BSV24'; // 23.25" x 34.5" : For base cabinets
+var SKIN_SKU_BSV_24 = exports.SKIN_SKU_BSV_24 = 'BSV'; // 23.25" x 34.5" : For base cabinets
 var SKIN_SKU_BSV_48 = exports.SKIN_SKU_BSV_48 = 'BSV48'; // 48" x 34.5" : For base cabinets back-to-back or island backs
 var SKIN_SKU_WSV_1242 = exports.SKIN_SKU_WSV_1242 = 'WSV1242'; // 11.25" x 42" : For 12" deep wall cabinets
 var SKIN_SKU_WSV_2442 = exports.SKIN_SKU_WSV_2442 = 'WSV2442'; // 23.25" x 42" : For 24" deep wall cabinets

package/lib/utils/helper.js

@@ -12,6 +12,8 @@ exports.centering2D = centering2D;
 exports.compareSVGRect = void 0;
 exports.debugUtil = debugUtil;
 exports.getSignedUrl = exports.getPathInfo = exports.getPath = void 0;
+exports.getSkuAliasFromCatalog = getSkuAliasFromCatalog;
+exports.getSkuAliasFromCatalogElement = getSkuAliasFromCatalogElement;
 exports.handleCamRect = handleCamRect;
 exports.isCeilLimitation = isCeilLimitation;
 exports.isElevationView = isElevationView;
@@ -441,7 +443,6 @@ function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
     updatedPayload.length = _length;
     //////////////////////////////////////
   } else if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'items') {
-    var _catalog$elements$cur;
     // check this cabinet has warning box
     updatedPayload.isWarning = (0, _utils.isWarningItem)(currentObject);
     // check this item is available molding
@@ -452,14 +453,7 @@ function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
     if (pointArray) updatedPayload.distArray = pointArray;
 
     // update sku_number using sku_array
-    var currentDoorColorId = currentObject.getIn(['doorStyle', 'id']);
-    var skuArray = catalog === null || catalog === void 0 || (_catalog$elements$cur = catalog.elements[currentObject.get('name')]) === null || _catalog$elements$cur === void 0 || (_catalog$elements$cur = _catalog$elements$cur.obj) === null || _catalog$elements$cur === void 0 ? void 0 : _catalog$elements$cur.skuArray;
-    var correctSKU = skuArray === null || skuArray === void 0 ? void 0 : skuArray.find(function (sku) {
-      return sku.door_color_id === currentDoorColorId;
-    });
-    if (correctSKU) {
-      updatedPayload.sku_number = correctSKU.sku;
-    }
+    updatedPayload.sku_number = getSkuAliasFromCatalog(catalog, currentObject);
   } else if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'holes') {
     var _calcDistancesFromHol = (0, _geometry.calcDistancesFromHoleToNearestOneOrWall)(currentObject, layer),
       distLeft = _calcDistancesFromHol.distLeft,
@@ -476,4 +470,21 @@ 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;
 }

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

@@ -1620,7 +1620,7 @@ function _handleExternalEvent() {
 
           // get skin panel data
           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 = (0, _skinPanelEngine.computeSkinPanels)(layer, skinPanelExclusionSKUs);
+          sceneData.layers[layerId].skinPanelData = (0, _skinPanelEngine.computeSkinPanels)(layer, skinPanelExclusionSKUs, props.catalog);
 
           // send scene object from 3DTool to HostApp using internalEvent
           (_props$onInternalEven3 = props.onInternalEvent) === null || _props$onInternalEven3 === void 0 || _props$onInternalEven3.call(props, {

package/lib/utils/skinPanelEngine.js

@@ -253,7 +253,7 @@ function resolveTallCabinetBundle(face) {
   }
 
   // fallback
-  return [_constants.SKIN_SKU_USV245325];
+  return [_constants.SKIN_SKU_USV245325, _constants.SKIN_SKU_WSV_2442];
 }
 
 /**
@@ -311,15 +311,16 @@ function buildSkinPanelData(faces) {
   }
   return result;
 }
-function shouldExcludeSkinPanel(itemJS, exclusionSet) {
+function shouldExcludeSkinPanel(itemJS, exclusionSet, catalog) {
   var _itemJS$doorStyle;
-  var cabinetSku = itemJS === null || itemJS === void 0 ? void 0 : itemJS.sku_number;
+  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 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
@@ -327,7 +328,7 @@ function computeSkinPanels(layer) {
     skinPanelItems = _collectLayerItems.skinPanelItems,
     otherItems = _collectLayerItems.otherItems;
   var filteredSkinPanelItems = skinPanelItems.filter(function (item) {
-    return !shouldExcludeSkinPanel(item.toJS(), exclusionSet);
+    return !shouldExcludeSkinPanel(item.toJS(), exclusionSet, catalog);
   });
 
   // Get all skin face list of [skinPanelItems] & [otherItems]

package/package.json

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