npm - kitchen-simulator - Versions diffs - 10.1.0 → 10.2.0 - Mend

kitchen-simulator 10.1.0 → 10.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/es/class/item.js +4 -7
package/es/devLiteRenderer.js +32 -6
package/es/events/external/handlers.changeDoorStyle.js +10 -7
package/es/events/external/handlers.loadProject.js +18 -16
package/es/mappings/external-events/mappers/ccdfMapper.js +3 -4
package/es/mappings/external-events/mappers/ccdfToCDSMapper.js +2 -5
package/lib/class/item.js +4 -7
package/lib/devLiteRenderer.js +32 -6
package/lib/events/external/handlers.changeDoorStyle.js +10 -7
package/lib/events/external/handlers.loadProject.js +18 -16
package/lib/mappings/external-events/mappers/ccdfMapper.js +3 -4
package/lib/mappings/external-events/mappers/ccdfToCDSMapper.js +2 -5
package/package.json +1 -1
package/es/shared/domain/cabinet-identity.js +0 -6
package/lib/shared/domain/cabinet-identity.js +0 -12

package/es/class/item.js CHANGED Viewed

@@ -15,7 +15,6 @@ import { hasMoldingLayout } from "../utils/molding";
 import { getInstallationSuffix, isEmpty } from "../components/viewer2d/utils";
 import { historyPush } from "../utils/history";
 import { toJSIfNeeded } from "../shared/objects/immutable";
-import { normalizeLongName } from "../shared/domain/cabinet-identity";
 var allItemRect;
 var allItemSnap;
 var allLines;
@@ -269,15 +268,13 @@ var Item = /*#__PURE__*/function () {
         idSet = new Set(targetItemIDs);
       }
       layer.items.forEach(function (it) {
-        var _idSet, _ccdf_list$find, _picked$door_finish_i;
+        var _idSet, _picked$door_finish_i;
         var should = applyScope === DOORSTYLE_SCOPE_ALL ? true : (_idSet = idSet) === null || _idSet === void 0 ? void 0 : _idSet.has(it.id);
         if (!should) return;
-        // Prefer stable join key: long_name. Fall back to cabinet_id for older payloads.
-        var picked = (_ccdf_list$find = ccdf_list.find(function (c) {
-          return (c === null || c === void 0 ? void 0 : c.long_name) && (it === null || it === void 0 ? void 0 : it.long_name) && normalizeLongName(c.long_name) === normalizeLongName(it.long_name);
-        })) !== null && _ccdf_list$find !== void 0 ? _ccdf_list$find : ccdf_list.find(function (c) {
-          return (c === null || c === void 0 ? void 0 : c.cabinet_id) === it.itemID;
+        // Join key: scene_cabinet_id (instance id).
+        var picked = ccdf_list.find(function (c) {
+          return (c === null || c === void 0 ? void 0 : c.scene_cabinet_id) && c.scene_cabinet_id === it.id;
         });
         if (!picked) return;
         state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'ccdf'], _objectSpread(_objectSpread({}, picked), {}, {

package/es/devLiteRenderer.js CHANGED Viewed

@@ -4,12 +4,14 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useState, useEffect } from 'react';
 import { Map } from 'immutable';
 import ContainerDimensions from 'react-container-dimensions';
-import projectItemsCatalog from "./mocks/projectItemsCatalog.json";
+import ccdfPayload1 from "./mocks/get_ccdf_of_b12_brilliant.json";
+import ccdfPayload2 from "./mocks/get_ccdf_of_b12_cambridge.json";
 import configData from "./mocks/configData.json";
 import projectJson from "./mocks/project.json";
 import cabinetPaylod from "./mocks/cabinetPayload.json";
 import appliancePaylod from "./mocks/appliancePayload.json";
-import doorStylePayload from "./mocks/doorStylePayload.json";
+import doorStylePayload_brilliant from "./mocks/doorStylePayload_brilliant.json";
+import doorStylePayload_cambridge from "./mocks/doorStylePayload_cambridge.json";
 import roomShapePayload from "./mocks/roomShapePayload.json";
 import lightingPayload from "./mocks/lightingPayload.json";
 import furnishingPayload from "./mocks/furnishingPayload.json";
@@ -27,6 +29,7 @@ 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;
@@ -38,8 +41,9 @@ 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(projectItemsCatalog);
+          return callback(test_num % 2 === 1 ? ccdfPayload1 : ccdfPayload2);
         case 2:
           return _context.abrupt("continue", 3);
         case 3:
@@ -217,18 +221,40 @@ 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 = {
+        type: EXTERNAL_EVENT_CHANGE_DOORSTYLE,
+        payload: {
+          doorStyle: doorStylePayload_brilliant === null || doorStylePayload_brilliant === void 0 ? void 0 : doorStylePayload_brilliant.doorStyle,
+          applyScope: doorStylePayload_brilliant === null || doorStylePayload_brilliant === void 0 ? void 0 : doorStylePayload_brilliant.applyScope
+        }
+      };
+      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 = {
         type: EXTERNAL_EVENT_CHANGE_DOORSTYLE,
         payload: {
-          doorStyle: doorStylePayload === null || doorStylePayload === void 0 ? void 0 : doorStylePayload.doorStyle,
-          applyScope: doorStylePayload === null || doorStylePayload === void 0 ? void 0 : doorStylePayload.applyScope
+          doorStyle: doorStylePayload_cambridge === null || doorStylePayload_cambridge === void 0 ? void 0 : doorStylePayload_cambridge.doorStyle,
+          applyScope: doorStylePayload_cambridge === null || doorStylePayload_cambridge === void 0 ? void 0 : doorStylePayload_cambridge.applyScope
         }
       };
       setExternalEvent(evt);
     }
-  }, "DoorStyle Change(New-Cambriage)"), /*#__PURE__*/React.createElement(Button, {
+  }, "DoorStyle Change(Cambriage)"), /*#__PURE__*/React.createElement(Button, {
     actionType: "danger",
     onClick: function onClick() {
       var evt = {

package/es/events/external/handlers.changeDoorStyle.js CHANGED Viewed

@@ -40,19 +40,22 @@ function _handleChangeDoorStyleEvent() {
         case 4:
           ccdf_list = [];
           _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
-            var item;
+            var item, _doorStyle$id2, _item$long_name;
             return _regeneratorRuntime.wrap(function (_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
                   item = targetItems[i];
                   if (!ccdf_list.some(function (v) {
-                    return item.itemID === v.itemID && item.name === v.name && doorStyle.id === v.doorFinishId;
+                    return v.scene_cabinet_id === item.id;
                   })) {
                     ccdf_list.push({
-                      cabinetSku: item.type,
-                      sizeInfo: item.sizeinfo,
-                      catalogSku: item.sku_number,
-                      ccdf: item.ccdf
+                      cabinet_sku: item.type,
+                      sizeinfo: item.sizeinfo,
+                      catalog_cabinet_sku: item.sku_number,
+                      ccdf: item.ccdf,
+                      door_finish_id: (_doorStyle$id2 = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id2 !== void 0 ? _doorStyle$id2 : null,
+                      long_name: (_item$long_name = item === null || item === void 0 ? void 0 : item.long_name) !== null && _item$long_name !== void 0 ? _item$long_name : null,
+                      scene_cabinet_id: item.id
                     });
                   }
                 case 1:
@@ -109,7 +112,7 @@ function _handleChangeDoorStyleEvent() {
                     case 3:
                       // Persist ccdf on affected instances so SYNC includes the latest ccdf.id for each item.
                       // IMPORTANT: host response `ccdf_list[]` may not include `door_finish_id`.
-                      // Use request doorFinishId (doorStyle.id) as the source of truth for door_finish_id.
+                      // Use request door_finish_id (doorStyle.id) as the source of truth for door_finish_id.
                       props.itemsActions.setItemsCCDF((_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [], applyScope, itemIds, (_doorStyle$id = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id !== void 0 ? _doorStyle$id : null);
                       props.itemsActions.setDoorStyle(doorStyle, itemCDS, applyScope, itemIds);
                     case 4:

package/es/events/external/handlers.loadProject.js CHANGED Viewed

@@ -6,7 +6,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { convert } from "../../utils/convert-units-lite";
 import { INTERNAL_EVENT_ITEMS_CATALOG } from "../../constants";
 import { Scene, State } from "../../models";
-import { normalizeLongName } from "../../shared/domain/cabinet-identity";
 export function handleLoadProjectEvent(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
   return _handleLoadProjectEvent.apply(this, arguments);
 }
@@ -30,14 +29,19 @@ function _handleLoadProjectEvent() {
               }
               /////////
               if (!ccdf_list.some(function (v) {
-                var _it$doorStyle;
-                return it.itemID === v.itemID && it.name === v.name && ((_it$doorStyle = it.doorStyle) === null || _it$doorStyle === void 0 ? void 0 : _it$doorStyle.id) === v.doorFinishId;
-              })) ccdf_list.push({
-                cabinetSku: it.type,
-                sizeInfo: it.sizeinfo,
-                catalogSku: it.sku_number,
-                ccdf: it.ccdf
-              });
+                return v.scene_cabinet_id === it.id;
+              })) {
+                var _it$long_name;
+                ccdf_list.push({
+                  cabinet_sku: it.type,
+                  sizeinfo: it.sizeinfo,
+                  catalog_cabinet_sku: it.sku_number,
+                  ccdf: it.ccdf,
+                  door_finish_id: door_finish_id,
+                  long_name: (_it$long_name = it === null || it === void 0 ? void 0 : it.long_name) !== null && _it$long_name !== void 0 ? _it$long_name : null,
+                  scene_cabinet_id: scene_cabinet_id
+                });
+              }
             });
             newScene = new Scene(evt === null || evt === void 0 ? void 0 : evt.payload);
             tempState = new State({
@@ -63,18 +67,16 @@ function _handleLoadProjectEvent() {
                         // Attach matched ccdf to each scene instance before loading into state,
                         // so SYNC payload includes `scene.layers[].items[].ccdf.id`.
                         // IMPORTANT: host response `ccdf_list[]` may not include `door_finish_id`.
-                        // Use request payload (`ccdf_list[].doorFinishId`) as door_finish_id source.
+                        // Use request payload (`ccdf_list[].door_finish_id`) / scene doorStyle.id as door_finish_id source.
                         try {
                           resp = (_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [];
                           Object.keys(items).forEach(function (k) {
-                            var _it$doorStyle$id, _it$doorStyle2, _resp$find;
+                            var _it$doorStyle$id, _it$doorStyle;
                             var it = items[k];
-                            var desiredDoorFinishId = (_it$doorStyle$id = it === null || it === void 0 || (_it$doorStyle2 = it.doorStyle) === null || _it$doorStyle2 === void 0 ? void 0 : _it$doorStyle2.id) !== null && _it$doorStyle$id !== void 0 ? _it$doorStyle$id : null;
+                            var desiredDoorFinishId = (_it$doorStyle$id = it === null || it === void 0 || (_it$doorStyle = it.doorStyle) === null || _it$doorStyle === void 0 ? void 0 : _it$doorStyle.id) !== null && _it$doorStyle$id !== void 0 ? _it$doorStyle$id : null;
                             if (!desiredDoorFinishId) return;
-                            var picked = (_resp$find = resp.find(function (c) {
-                              return (c === null || c === void 0 ? void 0 : c.long_name) && (it === null || it === void 0 ? void 0 : it.long_name) && normalizeLongName(c.long_name) === normalizeLongName(it.long_name);
-                            })) !== null && _resp$find !== void 0 ? _resp$find : resp.find(function (c) {
-                              return (c === null || c === void 0 ? void 0 : c.cabinet_id) === it.itemID;
+                            var picked = resp.find(function (c) {
+                              return (c === null || c === void 0 ? void 0 : c.scene_cabinet_id) && c.scene_cabinet_id === it.id;
                             });
                             if (picked) {
                               var _picked$door_finish_i;

package/es/mappings/external-events/mappers/ccdfMapper.js CHANGED Viewed

@@ -1,7 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { isEmpty } from "../../../components/viewer2d/utils";
 import { toJSIfNeeded } from "../../../shared/objects/immutable";
-import { normalizeLongName } from "../../../shared/domain/cabinet-identity";
 export function ccdfMapper(ccdf_list, layer) {
   // This function make cabinet definition using ccdf, layer's item information and catalog
   // console.log(ccdf_list, catalog);
@@ -22,11 +21,11 @@ export function ccdfMapper(ccdf_list, layer) {
     var correctItemId = '';
     for (var i = 0; i < itemKeys.length; i++) {
       var it = layerJS.items[itemKeys[i]];
-      // Prefer stable join key: long_name. Fall back to cabinet_id.
-      if (!isEmpty(ccdf === null || ccdf === void 0 ? void 0 : ccdf.long_name) && !isEmpty(it === null || it === void 0 ? void 0 : it.long_name) && normalizeLongName(it.long_name) === normalizeLongName(ccdf.long_name) || it.itemID === ccdf.cabinet_id) correctItemId = layerJS.items[itemKeys[i]].id;
+      // Join key: scene_cabinet_id (instance id).
+      if (!!(ccdf !== null && ccdf !== void 0 && ccdf.scene_cabinet_id) && (it === null || it === void 0 ? void 0 : it.id) === ccdf.scene_cabinet_id) correctItemId = layerJS.items[itemKeys[i]].id;
     }
     var cd = layerJS.items[correctItemId];
-    if (cd && (!isEmpty(ccdf === null || ccdf === void 0 ? void 0 : ccdf.long_name) && !isEmpty(cd === null || cd === void 0 ? void 0 : cd.long_name) && normalizeLongName(cd.long_name) === normalizeLongName(ccdf.long_name) || cd.itemID === ccdf.cabinet_id)) {
+    if (cd && !!(ccdf !== null && ccdf !== void 0 && ccdf.scene_cabinet_id) && (cd === null || cd === void 0 ? void 0 : cd.id) === ccdf.scene_cabinet_id) {
       if (!isEmpty(ccdf === null || ccdf === void 0 ? void 0 : ccdf.id)) {
         cdfId = ccdf.id;
       }

package/es/mappings/external-events/mappers/ccdfToCDSMapper.js CHANGED Viewed

@@ -1,5 +1,4 @@
 import { isEmpty } from "../../../components/viewer2d/utils";
-import { normalizeLongName } from "../../../shared/domain/cabinet-identity";
 export function mapFromCCDFToCDS(ccdf_list) {
   var sceneItems = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   // This function make CDS from CCDF_List
@@ -33,11 +32,9 @@ export function mapFromCCDFToCDS(ccdf_list) {
     // Prefer stable join key: long_name -> scene item's itemID.
     // Fall back to host cabinet_id for backward compatibility.
     var resolvedItemID = asItem === null || asItem === void 0 ? void 0 : asItem.cabinet_id;
-    var ln = asItem === null || asItem === void 0 ? void 0 : asItem.long_name;
-    if (itemsArray && !isEmpty(ln)) {
-      var nl = normalizeLongName(ln);
+    if (itemsArray) {
       var match = itemsArray.find(function (it) {
-        return normalizeLongName(it === null || it === void 0 ? void 0 : it.long_name) === nl;
+        return it.id === asItem.scene_cabinet_id;
       });
       if (match !== null && match !== void 0 && match.itemID) resolvedItemID = match.itemID;
     }

package/lib/class/item.js CHANGED Viewed

@@ -20,7 +20,6 @@ var _molding = require("../utils/molding");
 var _utils = require("../components/viewer2d/utils");
 var _history = require("../utils/history");
 var _immutable2 = require("../shared/objects/immutable");
-var _cabinetIdentity = require("../shared/domain/cabinet-identity");
 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; }
 var allItemRect;
@@ -276,15 +275,13 @@ var Item = exports["default"] = /*#__PURE__*/function () {
         idSet = new Set(targetItemIDs);
       }
       layer.items.forEach(function (it) {
-        var _idSet, _ccdf_list$find, _picked$door_finish_i;
+        var _idSet, _picked$door_finish_i;
         var should = applyScope === _constants.DOORSTYLE_SCOPE_ALL ? true : (_idSet = idSet) === null || _idSet === void 0 ? void 0 : _idSet.has(it.id);
         if (!should) return;
-        // Prefer stable join key: long_name. Fall back to cabinet_id for older payloads.
-        var picked = (_ccdf_list$find = ccdf_list.find(function (c) {
-          return (c === null || c === void 0 ? void 0 : c.long_name) && (it === null || it === void 0 ? void 0 : it.long_name) && (0, _cabinetIdentity.normalizeLongName)(c.long_name) === (0, _cabinetIdentity.normalizeLongName)(it.long_name);
-        })) !== null && _ccdf_list$find !== void 0 ? _ccdf_list$find : ccdf_list.find(function (c) {
-          return (c === null || c === void 0 ? void 0 : c.cabinet_id) === it.itemID;
+        // Join key: scene_cabinet_id (instance id).
+        var picked = ccdf_list.find(function (c) {
+          return (c === null || c === void 0 ? void 0 : c.scene_cabinet_id) && c.scene_cabinet_id === it.id;
         });
         if (!picked) return;
         state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'ccdf'], _objectSpread(_objectSpread({}, picked), {}, {

package/lib/devLiteRenderer.js CHANGED Viewed

@@ -8,12 +8,14 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _react = _interopRequireWildcard(require("react"));
 var _immutable = require("immutable");
 var _reactContainerDimensions = _interopRequireDefault(require("react-container-dimensions"));
-var _projectItemsCatalog = _interopRequireDefault(require("./mocks/projectItemsCatalog.json"));
+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 _configData = _interopRequireDefault(require("./mocks/configData.json"));
 var _project = _interopRequireDefault(require("./mocks/project.json"));
 var _cabinetPayload = _interopRequireDefault(require("./mocks/cabinetPayload.json"));
 var _appliancePayload = _interopRequireDefault(require("./mocks/appliancePayload.json"));
-var _doorStylePayload = _interopRequireDefault(require("./mocks/doorStylePayload.json"));
+var _doorStylePayload_brilliant = _interopRequireDefault(require("./mocks/doorStylePayload_brilliant.json"));
+var _doorStylePayload_cambridge = _interopRequireDefault(require("./mocks/doorStylePayload_cambridge.json"));
 var _roomShapePayload = _interopRequireDefault(require("./mocks/roomShapePayload.json"));
 var _lightingPayload = _interopRequireDefault(require("./mocks/lightingPayload.json"));
 var _furnishingPayload = _interopRequireDefault(require("./mocks/furnishingPayload.json"));
@@ -31,6 +33,7 @@ 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;
@@ -42,8 +45,9 @@ 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(_projectItemsCatalog["default"]);
+          return callback(test_num % 2 === 1 ? _get_ccdf_of_b12_brilliant["default"] : _get_ccdf_of_b12_cambridge["default"]);
         case 2:
           return _context.abrupt("continue", 3);
         case 3:
@@ -221,18 +225,40 @@ 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 = {
+        type: _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE,
+        payload: {
+          doorStyle: _doorStylePayload_brilliant["default"] === null || _doorStylePayload_brilliant["default"] === void 0 ? void 0 : _doorStylePayload_brilliant["default"].doorStyle,
+          applyScope: _doorStylePayload_brilliant["default"] === null || _doorStylePayload_brilliant["default"] === void 0 ? void 0 : _doorStylePayload_brilliant["default"].applyScope
+        }
+      };
+      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 = {
         type: _constants.EXTERNAL_EVENT_CHANGE_DOORSTYLE,
         payload: {
-          doorStyle: _doorStylePayload["default"] === null || _doorStylePayload["default"] === void 0 ? void 0 : _doorStylePayload["default"].doorStyle,
-          applyScope: _doorStylePayload["default"] === null || _doorStylePayload["default"] === void 0 ? void 0 : _doorStylePayload["default"].applyScope
+          doorStyle: _doorStylePayload_cambridge["default"] === null || _doorStylePayload_cambridge["default"] === void 0 ? void 0 : _doorStylePayload_cambridge["default"].doorStyle,
+          applyScope: _doorStylePayload_cambridge["default"] === null || _doorStylePayload_cambridge["default"] === void 0 ? void 0 : _doorStylePayload_cambridge["default"].applyScope
         }
       };
       setExternalEvent(evt);
     }
-  }, "DoorStyle Change(New-Cambriage)"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
+  }, "DoorStyle Change(Cambriage)"), /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     actionType: "danger",
     onClick: function onClick() {
       var evt = {

package/lib/events/external/handlers.changeDoorStyle.js CHANGED Viewed

@@ -47,19 +47,22 @@ function _handleChangeDoorStyleEvent() {
         case 4:
           ccdf_list = [];
           _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
-            var item;
+            var item, _doorStyle$id2, _item$long_name;
             return _regenerator["default"].wrap(function (_context2) {
               while (1) switch (_context2.prev = _context2.next) {
                 case 0:
                   item = targetItems[i];
                   if (!ccdf_list.some(function (v) {
-                    return item.itemID === v.itemID && item.name === v.name && doorStyle.id === v.doorFinishId;
+                    return v.scene_cabinet_id === item.id;
                   })) {
                     ccdf_list.push({
-                      cabinetSku: item.type,
-                      sizeInfo: item.sizeinfo,
-                      catalogSku: item.sku_number,
-                      ccdf: item.ccdf
+                      cabinet_sku: item.type,
+                      sizeinfo: item.sizeinfo,
+                      catalog_cabinet_sku: item.sku_number,
+                      ccdf: item.ccdf,
+                      door_finish_id: (_doorStyle$id2 = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id2 !== void 0 ? _doorStyle$id2 : null,
+                      long_name: (_item$long_name = item === null || item === void 0 ? void 0 : item.long_name) !== null && _item$long_name !== void 0 ? _item$long_name : null,
+                      scene_cabinet_id: item.id
                     });
                   }
                 case 1:
@@ -116,7 +119,7 @@ function _handleChangeDoorStyleEvent() {
                     case 3:
                       // Persist ccdf on affected instances so SYNC includes the latest ccdf.id for each item.
                       // IMPORTANT: host response `ccdf_list[]` may not include `door_finish_id`.
-                      // Use request doorFinishId (doorStyle.id) as the source of truth for door_finish_id.
+                      // Use request door_finish_id (doorStyle.id) as the source of truth for door_finish_id.
                       props.itemsActions.setItemsCCDF((_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [], applyScope, itemIds, (_doorStyle$id = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id !== void 0 ? _doorStyle$id : null);
                       props.itemsActions.setDoorStyle(doorStyle, itemCDS, applyScope, itemIds);
                     case 4:

package/lib/events/external/handlers.loadProject.js CHANGED Viewed

@@ -11,7 +11,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _convertUnitsLite = require("../../utils/convert-units-lite");
 var _constants = require("../../constants");
 var _models = require("../../models");
-var _cabinetIdentity = require("../../shared/domain/cabinet-identity");
 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; }
 function handleLoadProjectEvent(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8) {
@@ -37,14 +36,19 @@ function _handleLoadProjectEvent() {
               }
               /////////
               if (!ccdf_list.some(function (v) {
-                var _it$doorStyle;
-                return it.itemID === v.itemID && it.name === v.name && ((_it$doorStyle = it.doorStyle) === null || _it$doorStyle === void 0 ? void 0 : _it$doorStyle.id) === v.doorFinishId;
-              })) ccdf_list.push({
-                cabinetSku: it.type,
-                sizeInfo: it.sizeinfo,
-                catalogSku: it.sku_number,
-                ccdf: it.ccdf
-              });
+                return v.scene_cabinet_id === it.id;
+              })) {
+                var _it$long_name;
+                ccdf_list.push({
+                  cabinet_sku: it.type,
+                  sizeinfo: it.sizeinfo,
+                  catalog_cabinet_sku: it.sku_number,
+                  ccdf: it.ccdf,
+                  door_finish_id: door_finish_id,
+                  long_name: (_it$long_name = it === null || it === void 0 ? void 0 : it.long_name) !== null && _it$long_name !== void 0 ? _it$long_name : null,
+                  scene_cabinet_id: scene_cabinet_id
+                });
+              }
             });
             newScene = new _models.Scene(evt === null || evt === void 0 ? void 0 : evt.payload);
             tempState = new _models.State({
@@ -70,18 +74,16 @@ function _handleLoadProjectEvent() {
                         // Attach matched ccdf to each scene instance before loading into state,
                         // so SYNC payload includes `scene.layers[].items[].ccdf.id`.
                         // IMPORTANT: host response `ccdf_list[]` may not include `door_finish_id`.
-                        // Use request payload (`ccdf_list[].doorFinishId`) as door_finish_id source.
+                        // Use request payload (`ccdf_list[].door_finish_id`) / scene doorStyle.id as door_finish_id source.
                         try {
                           resp = (_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [];
                           Object.keys(items).forEach(function (k) {
-                            var _it$doorStyle$id, _it$doorStyle2, _resp$find;
+                            var _it$doorStyle$id, _it$doorStyle;
                             var it = items[k];
-                            var desiredDoorFinishId = (_it$doorStyle$id = it === null || it === void 0 || (_it$doorStyle2 = it.doorStyle) === null || _it$doorStyle2 === void 0 ? void 0 : _it$doorStyle2.id) !== null && _it$doorStyle$id !== void 0 ? _it$doorStyle$id : null;
+                            var desiredDoorFinishId = (_it$doorStyle$id = it === null || it === void 0 || (_it$doorStyle = it.doorStyle) === null || _it$doorStyle === void 0 ? void 0 : _it$doorStyle.id) !== null && _it$doorStyle$id !== void 0 ? _it$doorStyle$id : null;
                             if (!desiredDoorFinishId) return;
-                            var picked = (_resp$find = resp.find(function (c) {
-                              return (c === null || c === void 0 ? void 0 : c.long_name) && (it === null || it === void 0 ? void 0 : it.long_name) && (0, _cabinetIdentity.normalizeLongName)(c.long_name) === (0, _cabinetIdentity.normalizeLongName)(it.long_name);
-                            })) !== null && _resp$find !== void 0 ? _resp$find : resp.find(function (c) {
-                              return (c === null || c === void 0 ? void 0 : c.cabinet_id) === it.itemID;
+                            var picked = resp.find(function (c) {
+                              return (c === null || c === void 0 ? void 0 : c.scene_cabinet_id) && c.scene_cabinet_id === it.id;
                             });
                             if (picked) {
                               var _picked$door_finish_i;

package/lib/mappings/external-events/mappers/ccdfMapper.js CHANGED Viewed

@@ -8,7 +8,6 @@ exports.ccdfMapper = ccdfMapper;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _utils = require("../../../components/viewer2d/utils");
 var _immutable = require("../../../shared/objects/immutable");
-var _cabinetIdentity = require("../../../shared/domain/cabinet-identity");
 function ccdfMapper(ccdf_list, layer) {
   // This function make cabinet definition using ccdf, layer's item information and catalog
   // console.log(ccdf_list, catalog);
@@ -29,11 +28,11 @@ function ccdfMapper(ccdf_list, layer) {
     var correctItemId = '';
     for (var i = 0; i < itemKeys.length; i++) {
       var it = layerJS.items[itemKeys[i]];
-      // Prefer stable join key: long_name. Fall back to cabinet_id.
-      if (!(0, _utils.isEmpty)(ccdf === null || ccdf === void 0 ? void 0 : ccdf.long_name) && !(0, _utils.isEmpty)(it === null || it === void 0 ? void 0 : it.long_name) && (0, _cabinetIdentity.normalizeLongName)(it.long_name) === (0, _cabinetIdentity.normalizeLongName)(ccdf.long_name) || it.itemID === ccdf.cabinet_id) correctItemId = layerJS.items[itemKeys[i]].id;
+      // Join key: scene_cabinet_id (instance id).
+      if (!!(ccdf !== null && ccdf !== void 0 && ccdf.scene_cabinet_id) && (it === null || it === void 0 ? void 0 : it.id) === ccdf.scene_cabinet_id) correctItemId = layerJS.items[itemKeys[i]].id;
     }
     var cd = layerJS.items[correctItemId];
-    if (cd && (!(0, _utils.isEmpty)(ccdf === null || ccdf === void 0 ? void 0 : ccdf.long_name) && !(0, _utils.isEmpty)(cd === null || cd === void 0 ? void 0 : cd.long_name) && (0, _cabinetIdentity.normalizeLongName)(cd.long_name) === (0, _cabinetIdentity.normalizeLongName)(ccdf.long_name) || cd.itemID === ccdf.cabinet_id)) {
+    if (cd && !!(ccdf !== null && ccdf !== void 0 && ccdf.scene_cabinet_id) && (cd === null || cd === void 0 ? void 0 : cd.id) === ccdf.scene_cabinet_id) {
       if (!(0, _utils.isEmpty)(ccdf === null || ccdf === void 0 ? void 0 : ccdf.id)) {
         cdfId = ccdf.id;
       }

package/lib/mappings/external-events/mappers/ccdfToCDSMapper.js CHANGED Viewed

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mapFromCCDFToCDS = mapFromCCDFToCDS;
 var _utils = require("../../../components/viewer2d/utils");
-var _cabinetIdentity = require("../../../shared/domain/cabinet-identity");
 function mapFromCCDFToCDS(ccdf_list) {
   var sceneItems = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   // This function make CDS from CCDF_List
@@ -39,11 +38,9 @@ function mapFromCCDFToCDS(ccdf_list) {
     // Prefer stable join key: long_name -> scene item's itemID.
     // Fall back to host cabinet_id for backward compatibility.
     var resolvedItemID = asItem === null || asItem === void 0 ? void 0 : asItem.cabinet_id;
-    var ln = asItem === null || asItem === void 0 ? void 0 : asItem.long_name;
-    if (itemsArray && !(0, _utils.isEmpty)(ln)) {
-      var nl = (0, _cabinetIdentity.normalizeLongName)(ln);
+    if (itemsArray) {
       var match = itemsArray.find(function (it) {
-        return (0, _cabinetIdentity.normalizeLongName)(it === null || it === void 0 ? void 0 : it.long_name) === nl;
+        return it.id === asItem.scene_cabinet_id;
       });
       if (match !== null && match !== void 0 && match.itemID) resolvedItemID = match.itemID;
     }

package/package.json CHANGED Viewed

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

package/es/shared/domain/cabinet-identity.js DELETED Viewed

@@ -1,6 +0,0 @@
-// Domain utilities for identifying cabinets across backend responses and scene state.
-// We normalize `long_name` because it is the stable identity across door-style changes.
-export function normalizeLongName(value) {
-  return (value !== null && value !== void 0 ? value : '').toString().trim().toLowerCase();
-}

package/lib/shared/domain/cabinet-identity.js DELETED Viewed

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.normalizeLongName = normalizeLongName;
-// Domain utilities for identifying cabinets across backend responses and scene state.
-// We normalize `long_name` because it is the stable identity across door-style changes.
-function normalizeLongName(value) {
-  return (value !== null && value !== void 0 ? value : '').toString().trim().toLowerCase();
-}