@crystaldesign/web-planner-logic 26.10.0-beta.2 → 26.10.0-beta.20

package/build/cjs/{DivaBoxPlanner-c8851567.js → DivaBoxPlanner-e3242372.js}

@@ -5,11 +5,11 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-89322318.js');
+var index = require('./index-30e83479.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
-var PlannerHandler2D = require('./PlannerHandler2D-21891681.js');
+var PlannerHandler2D = require('./PlannerHandler2D-5dd46e9f.js');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('axios');
 require('@crystaldesign/basket-model');

package/build/cjs/{DivaStandardPlanner-7bc436a9.js → DivaStandardPlanner-d664f65f.js}

@@ -5,9 +5,9 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-89322318.js');
+var index = require('./index-30e83479.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
-var PlannerHandler2D = require('./PlannerHandler2D-21891681.js');
+var PlannerHandler2D = require('./PlannerHandler2D-5dd46e9f.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/objectWithoutProperties');
 require('@babel/runtime/helpers/toConsumableArray');

package/build/cjs/{DoorPlanner-66d87428.js → DoorPlanner-eafbfb1a.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-require('./index-89322318.js');
+require('./index-30e83479.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');

package/build/cjs/{Host3DSignalR-86c47fd9.js → Host3DSignalR-bf95d8ac.js}

@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-89322318.js');
+var index = require('./index-30e83479.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 var signalr = require('@microsoft/signalr');
 var io = require('socket.io-client');
@@ -134,15 +134,6 @@ var Host3DSignalR = /*#__PURE__*/function () {
       LOG.debug('Receive HQRenderScript: ' + hqRenderScript);
       _this.plannerHandler3D.onReceiveHQRenderScript(hash, hqRenderScript);
     });
-    /**
-     * This function is called when a new Layer mask is rendered
-     * @param divaNr    The divaNr the layer mask belongs too
-     * @param hash      The hash value (unique identifier) of the associated rendering
-     */
-    _defineProperty__default["default"](this, "newRenderingLayerMask", function (divaNr, hash) {
-      DivaUtils__default["default"].endSpanOfApm('PlannerHandler3D requestRenderingDescriptionFromSignalR ' + hash);
-      LOG.debug('New Rendering Layer Mask finished hash: ' + hash);
-    });
     this.renderSettings = renderSettings;
     this.connectionStarted = false;
     this.successfullyLoggedIn = false;
@@ -196,7 +187,6 @@ var Host3DSignalR = /*#__PURE__*/function () {
               this.signalRConnection.on('noRenderClientFound', this.noRenderClientFound);
               this.signalRConnection.on('newRendering', this.newRendering);
               this.signalRConnection.on('newHQRenderScript', this.newHQRenderScript);
-              this.signalRConnection.on('newRenderingLayerMask', this.newRenderingLayerMask);
               this.signalRConnection.start().then(function () {
                 DivaUtils__default["default"].endSpanOfApm('PlannerHandler3D initSignalRConnection');
                 that.connectionStarted = true;
@@ -242,7 +232,7 @@ var Host3DSignalR = /*#__PURE__*/function () {
                   }
                 }, _callee);
               })));
-            case 15:
+            case 14:
             case "end":
               return _context2.stop();
           }
@@ -369,14 +359,14 @@ var Host3DSignalR = /*#__PURE__*/function () {
         }, 300);
         //request new rendering only if the webPlanner in not already waiting for it or if the mediaServiceMode have changed from STREAM to TEMP
       } else {
-        var _params$requestRender14;
+        var _params$requestRender13;
         var rendering = undefined;
         var hqRenderScript = undefined;
         if (params !== null && params !== void 0 && params.doRequestRendering) {
-          var _params$requestRender, _params$requestRender2, _params$requestRender3, _params$requestRender4, _params$requestRender5, _params$requestRender6, _params$requestRender7, _params$requestRender8, _params$requestRender9, _params$requestRender10, _params$requestRender11, _params$requestRender12, _params$requestRender13;
-          rendering = new index.Rendering(params.planningHash, params.renderHash, (_params$requestRender = params.requestRenderingParams) === null || _params$requestRender === void 0 ? void 0 : _params$requestRender.viewPointName, (_params$requestRender2 = params.requestRenderingParams) === null || _params$requestRender2 === void 0 ? void 0 : _params$requestRender2.width, (_params$requestRender3 = params.requestRenderingParams) === null || _params$requestRender3 === void 0 ? void 0 : _params$requestRender3.height, (_params$requestRender4 = params.requestRenderingParams) === null || _params$requestRender4 === void 0 ? void 0 : _params$requestRender4.isFullscreenRendering, (_params$requestRender5 = params.requestRenderingParams) === null || _params$requestRender5 === void 0 ? void 0 : _params$requestRender5.hasDimensionLines, (_params$requestRender6 = params.requestRenderingParams) === null || _params$requestRender6 === void 0 ? void 0 : _params$requestRender6.plannerMeasureDigits, (_params$requestRender7 = params.requestRenderingParams) === null || _params$requestRender7 === void 0 ? void 0 : _params$requestRender7.planner3DGridEnabled, (_params$requestRender8 = params.requestRenderingParams) !== null && _params$requestRender8 !== void 0 && _params$requestRender8.viewPointInfo ? params.requestRenderingParams.viewPointInfo.isStatic : false, (_params$requestRender9 = params.requestRenderingParams) === null || _params$requestRender9 === void 0 ? void 0 : _params$requestRender9.mediaServiceSaveMode, (_params$requestRender10 = params.requestRenderingParams) === null || _params$requestRender10 === void 0 ? void 0 : _params$requestRender10.alternateRenderingsExist, (_params$requestRender11 = params.requestRenderingParams) === null || _params$requestRender11 === void 0 ? void 0 : _params$requestRender11.alternateRenderInfo);
-          rendering.CatalogCodex = (_params$requestRender12 = params.requestRenderingParams) === null || _params$requestRender12 === void 0 ? void 0 : _params$requestRender12.catalogData.catalogCodex;
-          rendering.CatalogGUID = (_params$requestRender13 = params.requestRenderingParams) === null || _params$requestRender13 === void 0 ? void 0 : _params$requestRender13.catalogData.catalogGUID;
+          var _params$requestRender, _params$requestRender2, _params$requestRender3, _params$requestRender4, _params$requestRender5, _params$requestRender6, _params$requestRender7, _params$requestRender8, _params$requestRender9, _params$requestRender10, _params$requestRender11, _params$requestRender12;
+          rendering = new index.Rendering(params.planningHash, params.renderHash, (_params$requestRender = params.requestRenderingParams) === null || _params$requestRender === void 0 ? void 0 : _params$requestRender.viewPointName, (_params$requestRender2 = params.requestRenderingParams) === null || _params$requestRender2 === void 0 ? void 0 : _params$requestRender2.width, (_params$requestRender3 = params.requestRenderingParams) === null || _params$requestRender3 === void 0 ? void 0 : _params$requestRender3.height, (_params$requestRender4 = params.requestRenderingParams) === null || _params$requestRender4 === void 0 ? void 0 : _params$requestRender4.isFullscreenRendering, (_params$requestRender5 = params.requestRenderingParams) === null || _params$requestRender5 === void 0 ? void 0 : _params$requestRender5.hasDimensionLines, (_params$requestRender6 = params.requestRenderingParams) === null || _params$requestRender6 === void 0 ? void 0 : _params$requestRender6.plannerMeasureDigits, (_params$requestRender7 = params.requestRenderingParams) !== null && _params$requestRender7 !== void 0 && _params$requestRender7.viewPointInfo ? params.requestRenderingParams.viewPointInfo.isStatic : false, (_params$requestRender8 = params.requestRenderingParams) === null || _params$requestRender8 === void 0 ? void 0 : _params$requestRender8.mediaServiceSaveMode, (_params$requestRender9 = params.requestRenderingParams) === null || _params$requestRender9 === void 0 ? void 0 : _params$requestRender9.alternateRenderingsExist, (_params$requestRender10 = params.requestRenderingParams) === null || _params$requestRender10 === void 0 ? void 0 : _params$requestRender10.alternateRenderInfo);
+          rendering.CatalogCodex = (_params$requestRender11 = params.requestRenderingParams) === null || _params$requestRender11 === void 0 ? void 0 : _params$requestRender11.catalogData.catalogCodex;
+          rendering.CatalogGUID = (_params$requestRender12 = params.requestRenderingParams) === null || _params$requestRender12 === void 0 ? void 0 : _params$requestRender12.catalogData.catalogGUID;
         }
         if (params.doRequestHqRenderScript) {
           hqRenderScript = new index.HQRenderScript(params.planningHash);
@@ -384,7 +374,7 @@ var Host3DSignalR = /*#__PURE__*/function () {
 
         //Create options Request
         var options3DHost = this.create3DHostRequestOption(params);
-        LOG.debug('request 3D (mediaType ' + ((_params$requestRender14 = params.requestRenderingParams) === null || _params$requestRender14 === void 0 ? void 0 : _params$requestRender14.mediaServiceSaveMode) + ') from 3D Host' + JSON.stringify(params));
+        LOG.debug('request 3D (mediaType ' + ((_params$requestRender13 = params.requestRenderingParams) === null || _params$requestRender13 === void 0 ? void 0 : _params$requestRender13.mediaServiceSaveMode) + ') from 3D Host' + JSON.stringify(params));
         if (params.doReloadWholePlanning) {
           LOG.debug('Host3DSignalR SaveProjectWithOptions');
           this.signalRConnection.invoke('SaveProjectWithOptions', this.sessionID, params.divaNr, JSON.stringify(params.planningData), this.renderSettings.RenderGroup, JSON.stringify(options3DHost));
@@ -404,14 +394,13 @@ var Host3DSignalR = /*#__PURE__*/function () {
   }, {
     key: "create3DHostRequestOption",
     value: function create3DHostRequestOption(params) {
-      var _params$requestRender15, _params$requestRender16, _params$requestRender17, _params$requestRender18, _params$requestRender19, _params$requestRender20, _params$requestRender21, _params$requestRender22, _params$requestRender23, _params$requestRender24, _params$requestRender25, _params$requestRender26, _params$requestRender27, _params$requestRender28, _params$requestRender29, _params$requestRender30, _params$requestRender31;
+      var _params$requestRender14, _params$requestRender15, _params$requestRender16, _params$requestRender17, _params$requestRender18, _params$requestRender19, _params$requestRender20, _params$requestRender21, _params$requestRender22, _params$requestRender23, _params$requestRender24, _params$requestRender25, _params$requestRender26, _params$requestRender27, _params$requestRender28, _params$requestRender29;
       var size = params.requestRenderingParams ? params.requestRenderingParams.width + ':' + params.requestRenderingParams.height : '';
-      var bgMode = params !== null && params !== void 0 && params.doRequestRendering && (_params$requestRender15 = params.requestRenderingParams) !== null && _params$requestRender15 !== void 0 && _params$requestRender15.planner3DGridEnabled ? 'layermask' : '';
-      var signalRSavingMode = params !== null && params !== void 0 && params.doRequestRendering ? ((_params$requestRender16 = params.requestRenderingParams) === null || _params$requestRender16 === void 0 ? void 0 : _params$requestRender16.mediaServiceSaveMode) == 'STREAM' ? 0 : ((_params$requestRender17 = params.requestRenderingParams) === null || _params$requestRender17 === void 0 ? void 0 : _params$requestRender17.mediaServiceSaveMode) == 'PERMANENT' ? 1 : -1 : -1;
+      var signalRSavingMode = params !== null && params !== void 0 && params.doRequestRendering ? ((_params$requestRender14 = params.requestRenderingParams) === null || _params$requestRender14 === void 0 ? void 0 : _params$requestRender14.mediaServiceSaveMode) == 'STREAM' ? 0 : ((_params$requestRender15 = params.requestRenderingParams) === null || _params$requestRender15 === void 0 ? void 0 : _params$requestRender15.mediaServiceSaveMode) == 'PERMANENT' ? 1 : -1 : -1;
       var functionType = '';
       if (params.requestRenderingParams && params.requestRenderingParams.functionType) functionType = params.requestRenderingParams.functionType;
       var articleCodices = '[]';
-      if (params !== null && params !== void 0 && params.doRequestRendering && (_params$requestRender18 = params.requestRenderingParams) !== null && _params$requestRender18 !== void 0 && _params$requestRender18.articleCodices) {
+      if (params !== null && params !== void 0 && params.doRequestRendering && (_params$requestRender16 = params.requestRenderingParams) !== null && _params$requestRender16 !== void 0 && _params$requestRender16.articleCodices) {
         articleCodices = '[';
         for (var i = 0; i < params.requestRenderingParams.articleCodices.length; i++) {
           articleCodices += '"' + params.requestRenderingParams.articleCodices[i] + '"' + (i < params.requestRenderingParams.articleCodices.length - 1 ? ',' : '');
@@ -421,23 +410,23 @@ var Host3DSignalR = /*#__PURE__*/function () {
       var options = {
         rendering: params === null || params === void 0 ? void 0 : params.doRequestRendering,
         hqrenderscript: params.doRequestHqRenderScript,
-        VPName: (_params$requestRender19 = (_params$requestRender20 = params.requestRenderingParams) === null || _params$requestRender20 === void 0 ? void 0 : _params$requestRender20.viewPointName) !== null && _params$requestRender19 !== void 0 ? _params$requestRender19 : '',
+        VPName: (_params$requestRender17 = (_params$requestRender18 = params.requestRenderingParams) === null || _params$requestRender18 === void 0 ? void 0 : _params$requestRender18.viewPointName) !== null && _params$requestRender17 !== void 0 ? _params$requestRender17 : '',
         VPSize: size,
         VPFilename: params.renderHash,
         PlanningHash: params.planningHash,
         RenderHash: params.renderHash,
-        plannerMeasureDigits: (_params$requestRender21 = (_params$requestRender22 = params.requestRenderingParams) === null || _params$requestRender22 === void 0 ? void 0 : _params$requestRender22.plannerMeasureDigits) !== null && _params$requestRender21 !== void 0 ? _params$requestRender21 : 0,
+        plannerMeasureDigits: (_params$requestRender19 = (_params$requestRender20 = params.requestRenderingParams) === null || _params$requestRender20 === void 0 ? void 0 : _params$requestRender20.plannerMeasureDigits) !== null && _params$requestRender19 !== void 0 ? _params$requestRender19 : 0,
         Format: 'JPG',
-        BG: bgMode,
+        BG: '',
         MSSM: signalRSavingMode,
         OrgId: this.renderSettings.OrganizationId,
         FunctionType: functionType,
-        CatalogCodex: (_params$requestRender23 = (_params$requestRender24 = params.requestRenderingParams) === null || _params$requestRender24 === void 0 ? void 0 : _params$requestRender24.catalogData.catalogCodex) !== null && _params$requestRender23 !== void 0 ? _params$requestRender23 : '',
-        CatalogGuid: (_params$requestRender25 = (_params$requestRender26 = params.requestRenderingParams) === null || _params$requestRender26 === void 0 ? void 0 : _params$requestRender26.catalogData.catalogGUID) !== null && _params$requestRender25 !== void 0 ? _params$requestRender25 : '',
-        ArticleCodices: (_params$requestRender27 = (_params$requestRender28 = params.requestRenderingParams) === null || _params$requestRender28 === void 0 ? void 0 : _params$requestRender28.articleCodices) !== null && _params$requestRender27 !== void 0 ? _params$requestRender27 : [],
+        CatalogCodex: (_params$requestRender21 = (_params$requestRender22 = params.requestRenderingParams) === null || _params$requestRender22 === void 0 ? void 0 : _params$requestRender22.catalogData.catalogCodex) !== null && _params$requestRender21 !== void 0 ? _params$requestRender21 : '',
+        CatalogGuid: (_params$requestRender23 = (_params$requestRender24 = params.requestRenderingParams) === null || _params$requestRender24 === void 0 ? void 0 : _params$requestRender24.catalogData.catalogGUID) !== null && _params$requestRender23 !== void 0 ? _params$requestRender23 : '',
+        ArticleCodices: (_params$requestRender25 = (_params$requestRender26 = params.requestRenderingParams) === null || _params$requestRender26 === void 0 ? void 0 : _params$requestRender26.articleCodices) !== null && _params$requestRender25 !== void 0 ? _params$requestRender25 : [],
         UserSessionId: DivaUtils__default["default"].SessionId,
-        v: (_params$requestRender29 = (_params$requestRender30 = params.requestRenderingParams) === null || _params$requestRender30 === void 0 ? void 0 : _params$requestRender30.catalogData.catalogGUID) !== null && _params$requestRender29 !== void 0 ? _params$requestRender29 : '',
-        hybrid3DInfo: (_params$requestRender31 = params.requestRenderingParams) === null || _params$requestRender31 === void 0 ? void 0 : _params$requestRender31.hybrid3DInfo
+        v: (_params$requestRender27 = (_params$requestRender28 = params.requestRenderingParams) === null || _params$requestRender28 === void 0 ? void 0 : _params$requestRender28.catalogData.catalogGUID) !== null && _params$requestRender27 !== void 0 ? _params$requestRender27 : '',
+        hybrid3DInfo: (_params$requestRender29 = params.requestRenderingParams) === null || _params$requestRender29 === void 0 ? void 0 : _params$requestRender29.hybrid3DInfo
       };
       return options;
     }

package/build/cjs/{LiviqueWWSHandler-e0237503.js → LiviqueWWSHandler-354d24e6.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-require('./index-89322318.js');
+require('./index-30e83479.js');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
 require('@babel/runtime/helpers/defineProperty');

package/build/cjs/{PfisterWWSHandler-91a53f99.js → PfisterWWSHandler-36496b1d.js}

@@ -2,7 +2,7 @@
 
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
-var index = require('./index-89322318.js');
+var index = require('./index-30e83479.js');
 var basketModel = require('@crystaldesign/basket-model');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');

package/build/cjs/{PlannerHandler2D-21891681.js → PlannerHandler2D-5dd46e9f.js}

@@ -5,7 +5,7 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var index = require('./index-89322318.js');
+var index = require('./index-30e83479.js');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var fabric = require('fabric');

package/build/cjs/{SeriousBasketHandler-39f6c012.js → SeriousBasketHandler-3e617693.js}

@@ -3,7 +3,7 @@
 var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
 var _createClass = require('@babel/runtime/helpers/createClass');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
-var index = require('./index-89322318.js');
+var index = require('./index-30e83479.js');
 var DivaUtils = require('@crystaldesign/diva-utils');
 require('@babel/runtime/helpers/slicedToArray');
 require('@babel/runtime/helpers/asyncToGenerator');
@@ -290,16 +290,18 @@ var StandardWWSHandler = /*#__PURE__*/function () {
             var _optionState$vCodex;
             var coloCodex = (_optionState$vCodex = optionState.vCodex) !== null && _optionState$vCodex !== void 0 ? _optionState$vCodex : optionState.valCodex;
             if (coloCodex) {
-              var _optionState$val;
+              var _optionState$val$grou, _optionState$val, _article$getMergesToO;
               colorCodices.push(coloCodex);
               var isMainColor = false;
               if (!this.mainColorFound && optionState.optionCodex == MAIN_COLOR_OPTIONCODEX) {
                 isMainColor = true;
                 this.mainColorFound = true;
               }
+              //IDM has no group name on the value itself: there the Bezugsgruppe is its own feature, merged into this one only for the view
+              var groupName = (_optionState$val$grou = (_optionState$val = optionState.val) === null || _optionState$val === void 0 ? void 0 : _optionState$val.groupName) !== null && _optionState$val$grou !== void 0 ? _optionState$val$grou : (_article$getMergesToO = article.getMergesToOPGParentOps(optionState.optionCodex)) === null || _article$getMergesToO === void 0 ? void 0 : _article$getMergesToO.valName;
               formattedOptions.push({
                 PosNr: finalPosNr,
-                Text: ((_optionState$val = optionState.val) !== null && _optionState$val !== void 0 && _optionState$val.groupName ? optionState.val.groupName + ' ' : '') + optionState.valName,
+                Text: (groupName ? groupName + ' ' : '') + optionState.valName,
                 Title: optionState.optionOrigName,
                 Codex: optionState.vCodex && optionState.vCodex !== optionState.valName ? optionState.vCodex : '',
                 IsMainColor: isMainColor