kitchen-simulator 10.3.0 → 10.4.0

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

@@ -13,7 +13,7 @@ import { Item } from "../../models";
 import * as GeomUtils from "./geom-utils";
 import { loadGLTF } from "./load-obj";
 import { animateDoor, getSkuAliasFromCatalogElement, isEmpty, translateDrawer } from "../../utils/helper";
-import { isWarningItem } from "../../components/viewer2d/utils";
+import { isWarningCabinet } from "../../shared/domain/cabinet-warning";
 import { orderCabinetAssemblyKeys } from "../cabinet/cabinet-assembly-order";
 var INITIAL_NORMAL_MAP = '';
 
@@ -293,7 +293,7 @@ export function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corn
     }), /*#__PURE__*/React.createElement("g", {
       transform: "translate(".concat(padding_width, ",").concat(padding_depth, ")")
     }, txtContent)), element.category === 'cabinet' && /*#__PURE__*/React.createElement("g", {
-      visibility: isWarningItem(element) ? 'visible' : 'hidden'
+      visibility: isWarningCabinet(element) ? 'visible' : 'hidden'
     }, warning_buttons)));
   } else {
     rendered = /*#__PURE__*/React.createElement("g", {

package/es/components/viewer2d/item.js

@@ -3,9 +3,8 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import RulerDist from "./rulerDist";
 import { convert } from "../../utils/convert-units-lite";
-import { GeometryUtils } from "../../utils/export";
 import { MODE_ROTATING_ITEM, WALL_CABINET_LAYOUTPOS } from "../../constants";
-import { isEmpty, isWarningItem, returnReplaceableDeepSearchType } from "./utils";
+import { isWarningCabinet } from "../../shared/domain/cabinet-warning";
 import { calcDistancesFromItemToWalls, findCatalogElement } from "../../utils/geometry";
 var STYLE_LINE = {
   fill: '#0096fd',
@@ -170,7 +169,7 @@ export default function Item(_ref, _ref2) {
     y: "-19",
     height: "16",
     width: "16",
-    style: isWarningItem(item) ? {
+    style: isWarningCabinet(item) ? {
       transform: 'rotateX(180deg)',
       opacity: 0.5
     } : {

package/es/components/viewer2d/utils.js

@@ -184,10 +184,4 @@ export var areaPolygon = function areaPolygon(points) {
   }
   var area = det / 2;
   return signed ? area : Math.abs(area);
-};
-export var isWarningItem = function isWarningItem(item) {
-  var _item$toJS$doorStyle;
-  if (item.category === 'cabinet') return !(item !== null && item !== void 0 && (_item$toJS$doorStyle = item.toJS().doorStyle) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.doorStyles) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.cds) !== null && _item$toJS$doorStyle !== void 0 && _item$toJS$doorStyle.filter(function (cd) {
-    return cd.itemID == (item === null || item === void 0 ? void 0 : item.getIn(['itemID']));
-  }).length) > 0;else return false;
 };

package/es/components/viewer2d/viewer2d.js

@@ -16,7 +16,7 @@ import { convert } from "../../utils/convert-units-lite";
 import { Map } from 'immutable';
 import { formatNumber } from "../../utils/math";
 import { isEmpty, updatePayloadOfInternalEvent } from "../../utils/helper"; // variables
-import { isWarningItem } from "./utils";
+import { isWarningCabinet } from "../../shared/domain/cabinet-warning";
 // variables
 var pinFlag = false;
 var sFlag = false; //for all object move
@@ -953,7 +953,7 @@ export default function Viewer2D(_ref, _ref2) {
           case 'items':
             if (elementData.part === 'duplicate') {
               var currentObject = state.getIn(['scene', 'layers', layerID, 'items', elementData.id]);
-              if (!isWarningItem(currentObject)) itemsActions.duplicateSelected(currentObject, onInternalEvent); // send draw internal event when duplicating
+              if (!isWarningCabinet(currentObject)) itemsActions.duplicateSelected(currentObject, onInternalEvent); // send draw internal event when duplicating
               break;
             } else if (elementData.part === 'remove') {
               projectActions.remove();

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

@@ -6,15 +6,17 @@ import * as Three from 'three';
 import { Color, Group } from 'three';
 import createGrid from "./grid-creator";
 import { disposeObject } from "./three-memory-cleaner";
-import { ANIMATE_STEP_MAX, ANIMATE_STEP_MIN, ARRAY_3D_MODES, ARROW_TEXT_BACKCOLOR, ARROW_TEXT_FONTFACE, ARROW_TEXT_FORECOLOR, BASE_CABINET_LAYOUTPOS, BOTTOM_MOLDING_LOCATION, DECIMAL_PLACES_2, DIFFERENT_VALUES_PATH_LENGTH, DISTANCE_EPSILON, EPSILON, MIDDLE_MOLDING_LOCATION, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_ITEM_3D, MODE_IDLE, MODE_IDLE_3D, MODE_ROTATING_ITEM_3D, OBJTYPE_MESH, SHADE_DARK_PURPLE_COLOR, TOP_MOLDING_LOCATION, UNIT_CENTIMETER, UNIT_FOOT, UNIT_INCH, UNIT_METER, WALL_CABINET_LAYOUTPOS } from "../../constants";
+import { ANIMATE_STEP_MAX, ANIMATE_STEP_MIN, ARRAY_3D_MODES, ARROW_TEXT_BACKCOLOR, ARROW_TEXT_FONTFACE, ARROW_TEXT_FORECOLOR, BASE_CABINET_LAYOUTPOS, BOTTOM_MOLDING_LOCATION, DECIMAL_PLACES_2, DIFFERENT_VALUES_PATH_LENGTH, DISTANCE_EPSILON, EPSILON, ITEM_TYPE, MIDDLE_MOLDING_LOCATION, MODE_DRAGGING_ITEM_3D, MODE_DRAWING_ITEM_3D, MODE_IDLE, MODE_IDLE_3D, MODE_ROTATING_ITEM_3D, OBJTYPE_MESH, SHADE_DARK_PURPLE_COLOR, TOP_MOLDING_LOCATION, UNIT_CENTIMETER, UNIT_FOOT, UNIT_INCH, UNIT_METER, WALL_CABINET_LAYOUTPOS } from "../../constants";
 import { GeometryUtils, IDBroker, MoldingUtils } from "../../utils/export";
 import { convert } from "../../utils/convert-units-lite";
 import { calcDistancesFromItemToWalls, getLineSnapPointsOfItem, getSnappedWallLines, isOverlappedTwoItemsOnOneLine, pointsDistance, verticesDistance } from "../../utils/geometry";
 import * as GeomUtils from "../../catalog/utils/geom-utils";
 import { loadTexture } from "../../catalog/utils/item-loader";
+import { isWarningCabinet } from "../../shared/domain/cabinet-warning";
 import { returnReplaceableDeepSearchType } from "../viewer2d/utils";
 import { animateDoor, isElevationView, isEmpty, isImmutable, replaceMeshesWithLineSegments, translateDrawer } from "../../utils/helper";
 import { formatNumber } from "../../utils/math";
+import { toJSIfNeeded } from "../../shared/objects/immutable";
 export var fVLine = [];
 var scene_mode = null;
 export function parseData(sceneData, actions, catalog, camera, renderer, mode) {
@@ -502,16 +504,14 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
               }
               var mBoxColor = 0x99c3fb;
               var _item = item.toJS();
-              if (_item.doorStyle.doorStyles !== undefined && _item.doorStyle.doorStyles.cds) {
-                if (showYelloBox(_item)) {
-                  mBoxColor = 'rgba(232,187,47,1)';
-                  var mBox = GeomUtils.makeMBoxfromObject(item3D, mBoxColor);
-                  var warningObj = createWarningObject();
-                  warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
-                  if (mBox) {
-                    mBox.add(warningObj);
-                    item3D.add(mBox);
-                  }
+              if (isWarningCabinet(_item)) {
+                mBoxColor = 'rgba(232,187,47,1)';
+                var mBox = GeomUtils.makeMBoxfromObject(item3D, mBoxColor);
+                var warningObj = createWarningObject();
+                warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
+                if (mBox) {
+                  mBox.add(warningObj);
+                  item3D.add(mBox);
                 }
               }
             }
@@ -692,16 +692,14 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             if (item3D) {
               var _mBoxColor = 0x99c3fb;
               var _item2 = item.toJS();
-              if (_item2.doorStyle.doorStyles !== undefined && _item2.doorStyle.doorStyles.cds) {
-                if (showYelloBox(_item2)) {
-                  _mBoxColor = 'rgba(232,187,47,1)';
-                  var _mBox2 = GeomUtils.makeMBoxfromObject(item3D, _mBoxColor);
-                  var _warningObj = createWarningObject();
-                  _warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
-                  if (_mBox2) {
-                    _mBox2.add(_warningObj);
-                    item3D.add(_mBox2);
-                  }
+              if (isWarningCabinet(_item2)) {
+                _mBoxColor = 'rgba(232,187,47,1)';
+                var _mBox2 = GeomUtils.makeMBoxfromObject(item3D, _mBoxColor);
+                var _warningObj = createWarningObject();
+                _warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
+                if (_mBox2) {
+                  _mBox2.add(_warningObj);
+                  item3D.add(_mBox2);
                 }
               }
             }
@@ -824,10 +822,8 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             }
             var _mBoxColor2 = 0x99c3fb;
             var _item3 = item.toJS();
-            if (_item3.doorStyle.doorStyles !== undefined && _item3.doorStyle.doorStyles.cds) {
-              if (showYelloBox(_item3)) {
-                _mBoxColor2 = 'rgba(232,187,47,1)';
-              }
+            if (isWarningCabinet(_item3)) {
+              _mBoxColor2 = 'rgba(232,187,47,1)';
             }
             rItem.children[0].children.forEach(function (rItemElement) {
               rItemElement.visible = false;
@@ -2047,21 +2043,19 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
     if (pivot) {
       var mBoxColor = 0x99c3fb;
       var _item = item.toJS();
-      if (_item.doorStyle.doorStyles !== undefined && _item.doorStyle.doorStyles.cds) {
-        if (showYelloBox(_item)) {
-          mBoxColor = 'rgba(232,187,47,1)';
-        } else {
-          pivot.children[0].children.forEach(function (pivotElement) {
-            pivotElement.visible = false;
-          });
-        }
-        var mBox = GeomUtils.makeMBoxfromObject(pivot, mBoxColor);
-        var warningObj = createWarningObject();
-        warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
-        if (mBox) {
-          mBox.add(warningObj);
-          pivot.add(mBox);
-        }
+      if (isWarningCabinet(_item)) {
+        mBoxColor = 'rgba(232,187,47,1)';
+      } else {
+        pivot.children[0].children.forEach(function (pivotElement) {
+          pivotElement.visible = false;
+        });
+      }
+      var mBox = GeomUtils.makeMBoxfromObject(pivot, mBoxColor);
+      var warningObj = createWarningObject();
+      warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
+      if (mBox) {
+        mBox.add(warningObj);
+        pivot.add(mBox);
       }
     }
 
@@ -2187,13 +2181,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
       });
       if (pivot.children.length > 1) {
         var _item4 = item.toJS();
-        if (_item4.doorStyle.doorStyles !== undefined) {
-          if (_item4.category === 'cabinet') {
-            if (_item4.doorStyle.doorStyles.cds.some(function (element) {
-              return element.itemID === item.itemID;
-            })) {
-              pivot.children.pop();
-            }
+        if (_item4.category === ITEM_TYPE.CABINET) {
+          if (!isWarningCabinet(item)) {
+            pivot.children.pop();
           } else {
             pivot.children.pop();
           }
@@ -2910,31 +2900,6 @@ export function threedfabs(a) {
 export function getDistanceBetweenLineSegment(pos1, pos2, pos3, pos4) {
   if (pos1.x == pos2.x && pos3.x == pos4.x) return pos3.x - pos1.x;else if (pos1.y == pos2.y && pos3.y == pos4.y) return pos3.y - pos1.y;else return -1;
 }
-
-/**
- * check to see if an item is suitable for the given doorStyle.
- * @param _item
- * @returns true if it's not suitable.
- */
-export function showYelloBox(_item) {
-  var _doorStyle;
-  var doorStyle = _item === null || _item === void 0 ? void 0 : _item.doorStyle;
-
-  // If doorStyle is an Immutable Map, convert to plain JS
-  if (doorStyle && typeof doorStyle.toJS === 'function') {
-    doorStyle = doorStyle.toJS();
-  }
-  var isItemCabinet = (_item === null || _item === void 0 ? void 0 : _item.category) === 'cabinet';
-  var cds = (_doorStyle = doorStyle) === null || _doorStyle === void 0 || (_doorStyle = _doorStyle.doorStyles) === null || _doorStyle === void 0 ? void 0 : _doorStyle.cds;
-
-  // hasItemCDS: item is suitable if its itemID exists in cds
-  var hasItemCDS = isItemCabinet && Array.isArray(cds) ? cds.some(function (element) {
-    return element.itemID === _item.itemID;
-  }) : false;
-
-  // return true if it's a cabinet but not suitable for the current doorStyle
-  return isItemCabinet && !hasItemCDS;
-}
 function isSimilar(a, b) {
   if (threedfabs(a - b) <= 0.01) return 1;
   return 0;
@@ -3473,7 +3438,7 @@ export function addMolding(MGArray, addItem, planData, layer, itemActions, mode)
   if (addItem.selected && [MODE_DRAGGING_ITEM_3D, MODE_ROTATING_ITEM_3D].includes(mode)) return false;
 
   // If the item is not available for current doorStyle
-  if (showYelloBox(addItem))
+  if (isWarningCabinet(addItem))
     // Do not add molding to that item
     return MGArray;
 

package/es/devLiteRenderer.js

@@ -4,8 +4,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useEffect } from 'react';
 import { Map } from 'immutable';
 import ContainerDimensions from 'react-container-dimensions';
-import ccdfPayload1 from "./mocks/get_ccdf_of_b12_brilliant.json";
-import ccdfPayload2 from "./mocks/get_ccdf_of_b12_cambridge.json";
+import ccdfPayload from "./mocks/getCCDFPayload.json";
 import configData from "./mocks/configData.json";
 import projectJson from "./mocks/project.json";
 import cabinetPaylod from "./mocks/cabinetPayload.json";
@@ -29,7 +28,6 @@ var options = {
   unit: 'in',
   enable3D: true
 };
-var test_num = 0;
 var onInternalEvent = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(evt, callback) {
     var _t;
@@ -41,9 +39,8 @@ var onInternalEvent = /*#__PURE__*/function () {
           _context.next = _t === INTERNAL_EVENT_ITEMS_CATALOG ? 1 : 3;
           break;
         case 1:
-          console.log("Use ".concat(test_num % 2 === 1 ? 'Brilliant' : 'Cambridge'));
           _context.next = 2;
-          return callback(test_num % 2 === 1 ? ccdfPayload1 : ccdfPayload2);
+          return callback(ccdfPayload);
         case 2:
           return _context.abrupt("continue", 3);
         case 3:
@@ -221,11 +218,6 @@ function WorkSpace(props) {
       setExternalEvent(evt);
     }
   }, "Add B12 Cabinet"), /*#__PURE__*/React.createElement(Button, {
-    actionType: "danger",
-    onClick: function onClick() {
-      test_num = 1;
-    }
-  }, "Use Brilliant for ITEMS_CATALOG"), /*#__PURE__*/React.createElement(Button, {
     actionType: "danger",
     onClick: function onClick() {
       var evt = {
@@ -238,11 +230,6 @@ function WorkSpace(props) {
       setExternalEvent(evt);
     }
   }, "DoorStyle Change(Brilliant)"), /*#__PURE__*/React.createElement(Button, {
-    actionType: "danger",
-    onClick: function onClick() {
-      test_num = 2;
-    }
-  }, "Use Cambridge for ITEMS_CATALOG"), /*#__PURE__*/React.createElement(Button, {
     actionType: "danger",
     onClick: function onClick() {
       var evt = {

package/es/shared/domain/cabinet-warning.js

@@ -0,0 +1,14 @@
+// Centralized warning heuristic for cabinets across 2D/3D.
+// Rule: a cabinet is "warning" when there are no assets for the current door style.
+
+import { ITEM_TYPE } from "../../constants";
+import { toJSIfNeeded } from "../objects/immutable";
+
+// Implementation: return true if item.category === 'cabinet' and (no ccdf or empty ccdf.assets3d)
+export function isWarningCabinet(item) {
+  var js = toJSIfNeeded(item);
+  var isCabinet = (js === null || js === void 0 ? void 0 : js.category) === ITEM_TYPE.CABINET;
+  var ccdf = js === null || js === void 0 ? void 0 : js.ccdf;
+  var hasCcdf = !!ccdf && !!(ccdf !== null && ccdf !== void 0 && ccdf.id);
+  return isCabinet && !hasCcdf;
+}

package/es/utils/helper.js

@@ -5,7 +5,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { HDRCubeTextureLoader } from 'three/examples/jsm/loaders/HDRCubeTextureLoader.js';
 import { ANIMATE_OBJECT_OPEN_DOOR_ROTATION_UNIT, ANIMATE_STEP_MAX, DECIMAL_PLACES_2, HDR_URLS, MAX_ZOOM_IN_SCALE, MODE_ELEVATION_VIEW, UNIT_CENTIMETER, ZOOM_VARIABLE } from "../constants";
 import * as Three from 'three';
-import { isWarningItem, returnReplaceableDeepSearchType } from "./../components/viewer2d/utils";
+import { returnReplaceableDeepSearchType } from "./../components/viewer2d/utils";
+import { isWarningCabinet } from "../shared/domain/cabinet-warning";
 import { convert } from "./convert-units-lite";
 import { formatNumber } from "./math";
 import AWS from 'aws-sdk';
@@ -414,7 +415,7 @@ export function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
     //////////////////////////////////////
   } else if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'items') {
     // check this cabinet has warning box
-    updatedPayload.isWarning = isWarningItem(currentObject);
+    updatedPayload.isWarning = isWarningCabinet(currentObject);
     // check this item is available molding
     updatedPayload.isMoldingAvailable = MoldingUtils.isEnableItemForMolding(layer, currentObject);
     // check this item is snapped to wall

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

@@ -24,7 +24,7 @@ var _models = require("../../models");
 var GeomUtils = _interopRequireWildcard(require("./geom-utils"));
 var _loadObj = require("./load-obj");
 var _helper = require("../../utils/helper");
-var _utils = require("../../components/viewer2d/utils");
+var _cabinetWarning = require("../../shared/domain/cabinet-warning");
 var _cabinetAssemblyOrder = require("../cabinet/cabinet-assembly-order");
 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 _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; }
@@ -307,7 +307,7 @@ function render2DItem(element, layer, scene, sizeinfo, layoutpos, is_corner, sha
     }), /*#__PURE__*/_react["default"].createElement("g", {
       transform: "translate(".concat(padding_width, ",").concat(padding_depth, ")")
     }, txtContent)), element.category === 'cabinet' && /*#__PURE__*/_react["default"].createElement("g", {
-      visibility: (0, _utils.isWarningItem)(element) ? 'visible' : 'hidden'
+      visibility: (0, _cabinetWarning.isWarningCabinet)(element) ? 'visible' : 'hidden'
     }, warning_buttons)));
   } else {
     rendered = /*#__PURE__*/_react["default"].createElement("g", {

package/lib/components/viewer2d/item.js

@@ -11,9 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _rulerDist = _interopRequireDefault(require("./rulerDist"));
 var _convertUnitsLite = require("../../utils/convert-units-lite");
-var _export = require("../../utils/export");
 var _constants = require("../../constants");
-var _utils = require("./utils");
+var _cabinetWarning = require("../../shared/domain/cabinet-warning");
 var _geometry = require("../../utils/geometry");
 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 _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); }
 var STYLE_LINE = {
@@ -179,7 +178,7 @@ function Item(_ref, _ref2) {
     y: "-19",
     height: "16",
     width: "16",
-    style: (0, _utils.isWarningItem)(item) ? {
+    style: (0, _cabinetWarning.isWarningCabinet)(item) ? {
       transform: 'rotateX(180deg)',
       opacity: 0.5
     } : {

package/lib/components/viewer2d/utils.js

@@ -9,7 +9,6 @@ exports.getInstallationSuffix = getInstallationSuffix;
 exports.getToeKickSKU = void 0;
 exports.isEmpty = isEmpty;
 exports.isEqualInstallationType = isEqualInstallationType;
-exports.isWarningItem = void 0;
 exports.makeSKUForMagento = makeSKUForMagento;
 exports.searchForSkuValue = exports.returnReplaceableDeepSearchType = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -198,10 +197,4 @@ var areaPolygon = exports.areaPolygon = function areaPolygon(points) {
   }
   var area = det / 2;
   return signed ? area : Math.abs(area);
-};
-var isWarningItem = exports.isWarningItem = function isWarningItem(item) {
-  var _item$toJS$doorStyle;
-  if (item.category === 'cabinet') return !(item !== null && item !== void 0 && (_item$toJS$doorStyle = item.toJS().doorStyle) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.doorStyles) !== null && _item$toJS$doorStyle !== void 0 && (_item$toJS$doorStyle = _item$toJS$doorStyle.cds) !== null && _item$toJS$doorStyle !== void 0 && _item$toJS$doorStyle.filter(function (cd) {
-    return cd.itemID == (item === null || item === void 0 ? void 0 : item.getIn(['itemID']));
-  }).length) > 0;else return false;
 };

package/lib/components/viewer2d/viewer2d.js

@@ -22,7 +22,7 @@ var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _immutable = require("immutable");
 var _math = require("../../utils/math");
 var _helper = require("../../utils/helper");
-var _utils = require("./utils");
+var _cabinetWarning = require("../../shared/domain/cabinet-warning");
 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 _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; } // variables
@@ -962,7 +962,7 @@ function Viewer2D(_ref, _ref2) {
           case 'items':
             if (elementData.part === 'duplicate') {
               var currentObject = state.getIn(['scene', 'layers', layerID, 'items', elementData.id]);
-              if (!(0, _utils.isWarningItem)(currentObject)) itemsActions.duplicateSelected(currentObject, onInternalEvent); // send draw internal event when duplicating
+              if (!(0, _cabinetWarning.isWarningCabinet)(currentObject)) itemsActions.duplicateSelected(currentObject, onInternalEvent); // send draw internal event when duplicating
               break;
             } else if (elementData.part === 'remove') {
               projectActions.remove();

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

@@ -25,7 +25,6 @@ exports.parseData = parseData;
 exports.removeItem = removeItem;
 exports.removeSelItemMesh = removeSelItemMesh;
 exports.sameSign = sameSign;
-exports.showYelloBox = showYelloBox;
 exports.threedfabs = threedfabs;
 exports.tryAdjacentMD = tryAdjacentMD;
 exports.updateDoorHandleMesh = updateDoorHandleMesh;
@@ -44,9 +43,11 @@ var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _geometry2 = require("../../utils/geometry");
 var GeomUtils = _interopRequireWildcard(require("../../catalog/utils/geom-utils"));
 var _itemLoader = require("../../catalog/utils/item-loader");
+var _cabinetWarning = require("../../shared/domain/cabinet-warning");
 var _utils = require("../viewer2d/utils");
 var _helper = require("../../utils/helper");
 var _math = require("../../utils/math");
+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" != _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 _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; }
@@ -537,16 +538,14 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
               }
               var mBoxColor = 0x99c3fb;
               var _item = item.toJS();
-              if (_item.doorStyle.doorStyles !== undefined && _item.doorStyle.doorStyles.cds) {
-                if (showYelloBox(_item)) {
-                  mBoxColor = 'rgba(232,187,47,1)';
-                  var mBox = GeomUtils.makeMBoxfromObject(item3D, mBoxColor);
-                  var warningObj = createWarningObject();
-                  warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
-                  if (mBox) {
-                    mBox.add(warningObj);
-                    item3D.add(mBox);
-                  }
+              if ((0, _cabinetWarning.isWarningCabinet)(_item)) {
+                mBoxColor = 'rgba(232,187,47,1)';
+                var mBox = GeomUtils.makeMBoxfromObject(item3D, mBoxColor);
+                var warningObj = createWarningObject();
+                warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
+                if (mBox) {
+                  mBox.add(warningObj);
+                  item3D.add(mBox);
                 }
               }
             }
@@ -727,16 +726,14 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             if (item3D) {
               var _mBoxColor = 0x99c3fb;
               var _item2 = item.toJS();
-              if (_item2.doorStyle.doorStyles !== undefined && _item2.doorStyle.doorStyles.cds) {
-                if (showYelloBox(_item2)) {
-                  _mBoxColor = 'rgba(232,187,47,1)';
-                  var _mBox2 = GeomUtils.makeMBoxfromObject(item3D, _mBoxColor);
-                  var _warningObj = createWarningObject();
-                  _warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
-                  if (_mBox2) {
-                    _mBox2.add(_warningObj);
-                    item3D.add(_mBox2);
-                  }
+              if ((0, _cabinetWarning.isWarningCabinet)(_item2)) {
+                _mBoxColor = 'rgba(232,187,47,1)';
+                var _mBox2 = GeomUtils.makeMBoxfromObject(item3D, _mBoxColor);
+                var _warningObj = createWarningObject();
+                _warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
+                if (_mBox2) {
+                  _mBox2.add(_warningObj);
+                  item3D.add(_mBox2);
                 }
               }
             }
@@ -859,10 +856,8 @@ function replaceObject(modifiedPath, layer, planData, actions, sceneData, oldSce
             }
             var _mBoxColor2 = 0x99c3fb;
             var _item3 = item.toJS();
-            if (_item3.doorStyle.doorStyles !== undefined && _item3.doorStyle.doorStyles.cds) {
-              if (showYelloBox(_item3)) {
-                _mBoxColor2 = 'rgba(232,187,47,1)';
-              }
+            if ((0, _cabinetWarning.isWarningCabinet)(_item3)) {
+              _mBoxColor2 = 'rgba(232,187,47,1)';
             }
             rItem.children[0].children.forEach(function (rItemElement) {
               rItemElement.visible = false;
@@ -2082,21 +2077,19 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
     if (pivot) {
       var mBoxColor = 0x99c3fb;
       var _item = item.toJS();
-      if (_item.doorStyle.doorStyles !== undefined && _item.doorStyle.doorStyles.cds) {
-        if (showYelloBox(_item)) {
-          mBoxColor = 'rgba(232,187,47,1)';
-        } else {
-          pivot.children[0].children.forEach(function (pivotElement) {
-            pivotElement.visible = false;
-          });
-        }
-        var mBox = GeomUtils.makeMBoxfromObject(pivot, mBoxColor);
-        var warningObj = createWarningObject();
-        warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
-        if (mBox) {
-          mBox.add(warningObj);
-          pivot.add(mBox);
-        }
+      if ((0, _cabinetWarning.isWarningCabinet)(_item)) {
+        mBoxColor = 'rgba(232,187,47,1)';
+      } else {
+        pivot.children[0].children.forEach(function (pivotElement) {
+          pivotElement.visible = false;
+        });
+      }
+      var mBox = GeomUtils.makeMBoxfromObject(pivot, mBoxColor);
+      var warningObj = createWarningObject();
+      warningObj.position.set(0, item.properties.get('height').get('length') / 3, 0);
+      if (mBox) {
+        mBox.add(warningObj);
+        pivot.add(mBox);
       }
     }
 
@@ -2222,13 +2215,9 @@ function addItem(sceneData, planData, layer, itemID, catalog, itemsActions) {
       });
       if (pivot.children.length > 1) {
         var _item4 = item.toJS();
-        if (_item4.doorStyle.doorStyles !== undefined) {
-          if (_item4.category === 'cabinet') {
-            if (_item4.doorStyle.doorStyles.cds.some(function (element) {
-              return element.itemID === item.itemID;
-            })) {
-              pivot.children.pop();
-            }
+        if (_item4.category === _constants.ITEM_TYPE.CABINET) {
+          if (!(0, _cabinetWarning.isWarningCabinet)(item)) {
+            pivot.children.pop();
           } else {
             pivot.children.pop();
           }
@@ -2945,31 +2934,6 @@ function threedfabs(a) {
 function getDistanceBetweenLineSegment(pos1, pos2, pos3, pos4) {
   if (pos1.x == pos2.x && pos3.x == pos4.x) return pos3.x - pos1.x;else if (pos1.y == pos2.y && pos3.y == pos4.y) return pos3.y - pos1.y;else return -1;
 }
-
-/**
- * check to see if an item is suitable for the given doorStyle.
- * @param _item
- * @returns true if it's not suitable.
- */
-function showYelloBox(_item) {
-  var _doorStyle;
-  var doorStyle = _item === null || _item === void 0 ? void 0 : _item.doorStyle;
-
-  // If doorStyle is an Immutable Map, convert to plain JS
-  if (doorStyle && typeof doorStyle.toJS === 'function') {
-    doorStyle = doorStyle.toJS();
-  }
-  var isItemCabinet = (_item === null || _item === void 0 ? void 0 : _item.category) === 'cabinet';
-  var cds = (_doorStyle = doorStyle) === null || _doorStyle === void 0 || (_doorStyle = _doorStyle.doorStyles) === null || _doorStyle === void 0 ? void 0 : _doorStyle.cds;
-
-  // hasItemCDS: item is suitable if its itemID exists in cds
-  var hasItemCDS = isItemCabinet && Array.isArray(cds) ? cds.some(function (element) {
-    return element.itemID === _item.itemID;
-  }) : false;
-
-  // return true if it's a cabinet but not suitable for the current doorStyle
-  return isItemCabinet && !hasItemCDS;
-}
 function isSimilar(a, b) {
   if (threedfabs(a - b) <= 0.01) return 1;
   return 0;
@@ -3508,7 +3472,7 @@ function addMolding(MGArray, addItem, planData, layer, itemActions, mode) {
   if (addItem.selected && [_constants.MODE_DRAGGING_ITEM_3D, _constants.MODE_ROTATING_ITEM_3D].includes(mode)) return false;
 
   // If the item is not available for current doorStyle
-  if (showYelloBox(addItem))
+  if ((0, _cabinetWarning.isWarningCabinet)(addItem))
     // Do not add molding to that item
     return MGArray;
 

package/lib/devLiteRenderer.js

@@ -8,8 +8,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = _interopRequireWildcard(require("react"));
 var _immutable = require("immutable");
 var _reactContainerDimensions = _interopRequireDefault(require("react-container-dimensions"));
-var _get_ccdf_of_b12_brilliant = _interopRequireDefault(require("./mocks/get_ccdf_of_b12_brilliant.json"));
-var _get_ccdf_of_b12_cambridge = _interopRequireDefault(require("./mocks/get_ccdf_of_b12_cambridge.json"));
+var _getCCDFPayload = _interopRequireDefault(require("./mocks/getCCDFPayload.json"));
 var _configData = _interopRequireDefault(require("./mocks/configData.json"));
 var _project = _interopRequireDefault(require("./mocks/project.json"));
 var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload.json"));
@@ -33,7 +32,6 @@ var options = {
   unit: 'in',
   enable3D: true
 };
-var test_num = 0;
 var onInternalEvent = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(evt, callback) {
     var _t;
@@ -45,9 +43,8 @@ var onInternalEvent = /*#__PURE__*/function () {
           _context.next = _t === _constants.INTERNAL_EVENT_ITEMS_CATALOG ? 1 : 3;
           break;
         case 1:
-          console.log("Use ".concat(test_num % 2 === 1 ? 'Brilliant' : 'Cambridge'));
           _context.next = 2;
-          return callback(test_num % 2 === 1 ? _get_ccdf_of_b12_brilliant["default"] : _get_ccdf_of_b12_cambridge["default"]);
+          return callback(_getCCDFPayload["default"]);
         case 2:
           return _context.abrupt("continue", 3);
         case 3:
@@ -225,11 +222,6 @@ function WorkSpace(props) {
       setExternalEvent(evt);
     }
   }, "Add B12 Cabinet"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
-    actionType: "danger",
-    onClick: function onClick() {
-      test_num = 1;
-    }
-  }, "Use Brilliant for ITEMS_CATALOG"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     actionType: "danger",
     onClick: function onClick() {
       var evt = {
@@ -242,11 +234,6 @@ function WorkSpace(props) {
       setExternalEvent(evt);
     }
   }, "DoorStyle Change(Brilliant)"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
-    actionType: "danger",
-    onClick: function onClick() {
-      test_num = 2;
-    }
-  }, "Use Cambridge for ITEMS_CATALOG"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     actionType: "danger",
     onClick: function onClick() {
       var evt = {

package/lib/shared/domain/cabinet-warning.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isWarningCabinet = isWarningCabinet;
+var _constants = require("../../constants");
+var _immutable = require("../objects/immutable");
+// Centralized warning heuristic for cabinets across 2D/3D.
+// Rule: a cabinet is "warning" when there are no assets for the current door style.
+
+// Implementation: return true if item.category === 'cabinet' and (no ccdf or empty ccdf.assets3d)
+function isWarningCabinet(item) {
+  var js = (0, _immutable.toJSIfNeeded)(item);
+  var isCabinet = (js === null || js === void 0 ? void 0 : js.category) === _constants.ITEM_TYPE.CABINET;
+  var ccdf = js === null || js === void 0 ? void 0 : js.ccdf;
+  var hasCcdf = !!ccdf && !!(ccdf !== null && ccdf !== void 0 && ccdf.id);
+  return isCabinet && !hasCcdf;
+}

package/lib/utils/helper.js

@@ -33,6 +33,7 @@ var _HDRCubeTextureLoader = require("three/examples/jsm/loaders/HDRCubeTextureLo
 var _constants = require("../constants");
 var Three = _interopRequireWildcard(require("three"));
 var _utils = require("./../components/viewer2d/utils");
+var _cabinetWarning = require("../shared/domain/cabinet-warning");
 var _convertUnitsLite = require("./convert-units-lite");
 var _math = require("./math");
 var _awsSdk = _interopRequireDefault(require("aws-sdk"));
@@ -444,7 +445,7 @@ function updatePayloadOfInternalEvent(currentObject, layer, catalog) {
     //////////////////////////////////////
   } else if ((currentObject === null || currentObject === void 0 ? void 0 : currentObject.prototype) === 'items') {
     // check this cabinet has warning box
-    updatedPayload.isWarning = (0, _utils.isWarningItem)(currentObject);
+    updatedPayload.isWarning = (0, _cabinetWarning.isWarningCabinet)(currentObject);
     // check this item is available molding
     updatedPayload.isMoldingAvailable = _export.MoldingUtils.isEnableItemForMolding(layer, currentObject);
     // check this item is snapped to wall

package/package.json

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