@crystaldesign/web-planner-logic 24.11.0-beta.2 → 24.11.0-beta.21
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.
- package/build/cjs/{DivaBoxPlanner-fc403f96.js → DivaBoxPlanner-4f3790ec.js} +2 -2
- package/build/cjs/{DivaStandardPlanner-381861d5.js → DivaStandardPlanner-667e5cf0.js} +2 -2
- package/build/cjs/{DoorPlanner-4534b32f.js → DoorPlanner-697dd3d9.js} +1 -1
- package/build/cjs/{Host3DSignalR-e6cae920.js → Host3DSignalR-ad7cc0de.js} +1 -1
- package/build/cjs/{LiviqueWWSHandler-9bc80b98.js → LiviqueWWSHandler-44e25ef6.js} +1 -1
- package/build/cjs/{PfisterWWSHandler-24c470e2.js → PfisterWWSHandler-0dab97a9.js} +1 -1
- package/build/cjs/{PlannerHandler2D-fbc28e95.js → PlannerHandler2D-c5049cf4.js} +1 -1
- package/build/cjs/{ProductBasketHandler-08dcf24e.js → ProductBasketHandler-fd87c645.js} +1 -1
- package/build/cjs/{SeriousBasketHandler-a4647e89.js → SeriousBasketHandler-82414e54.js} +1 -1
- package/build/cjs/{ShelfPlanner-561be11e.js → ShelfPlanner-def9ee33.js} +6 -4
- package/build/cjs/{StandardWWSHandler-e211a327.js → StandardWWSHandler-7f2bca9a.js} +1 -1
- package/build/cjs/{index-4d5cef6f.js → index-44574518.js} +193 -147
- package/build/cjs/index.js +1 -1
- package/build/esm/{DivaBoxPlanner-8ef0722c.js → DivaBoxPlanner-d6b8ba23.js} +2 -2
- package/build/esm/{DivaStandardPlanner-19cc5ac0.js → DivaStandardPlanner-f96e0baf.js} +2 -2
- package/build/esm/{DoorPlanner-c3fe5ecf.js → DoorPlanner-27ae2306.js} +1 -1
- package/build/esm/{Host3DSignalR-5d78c3f5.js → Host3DSignalR-367240d7.js} +1 -1
- package/build/esm/{LiviqueWWSHandler-2f2cc617.js → LiviqueWWSHandler-aec5991a.js} +1 -1
- package/build/esm/{PfisterWWSHandler-701e95ee.js → PfisterWWSHandler-afd83f13.js} +1 -1
- package/build/esm/{PlannerHandler2D-bf892db2.js → PlannerHandler2D-193e7ebc.js} +1 -1
- package/build/esm/{ProductBasketHandler-a1dd8bb2.js → ProductBasketHandler-46d884fe.js} +1 -1
- package/build/esm/{SeriousBasketHandler-d5b6a347.js → SeriousBasketHandler-82a5da8e.js} +1 -1
- package/build/esm/{ShelfPlanner-e3b31a33.js → ShelfPlanner-3bade33c.js} +6 -4
- package/build/esm/{StandardWWSHandler-d2f8cb1c.js → StandardWWSHandler-86d63e5f.js} +1 -1
- package/build/esm/{index-bbda3bc5.js → index-218c9bd1.js} +193 -147
- package/build/esm/index.js +1 -1
- package/build/types/web-planner-logic/src/interface/API/ViewConfigDataType.d.ts +3 -2
- package/build/types/web-planner-logic/src/interface/API/ViewConfigDataType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/DivaCatalogDataType.d.ts +0 -1
- package/build/types/web-planner-logic/src/interface/DivaCatalogDataType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/ConfigTree/DivaConfigTreeHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/ConfigTree/Shelfplanner/ShelfPlanner.d.ts +1 -1
- package/build/types/web-planner-logic/src/logic/ConfigTree/Shelfplanner/ShelfPlanner.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Planner/DivaPlannerHandler.d.ts +2 -6
- package/build/types/web-planner-logic/src/logic/Planner/DivaPlannerHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Planner/Rendering/PlannerHandler3D.d.ts +1 -2
- package/build/types/web-planner-logic/src/logic/Planner/Rendering/PlannerHandler3D.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Set/DivaSetHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/model/DivaCatalogData.d.ts +0 -1
- package/build/types/web-planner-logic/src/model/DivaCatalogData.d.ts.map +1 -1
- package/package.json +2 -2
|
@@ -18160,7 +18160,6 @@ var DivaCatalogData = /*#__PURE__*/function () {
|
|
|
18160
18160
|
supplierCatalogName: json.SupplierCatalogName,
|
|
18161
18161
|
additionalCatalogPrice: json.AdditionalCatalogPrice,
|
|
18162
18162
|
additionalCatalogPriceText: json.AdditionalCatalogPriceText,
|
|
18163
|
-
autoSelectFirstValue: true,
|
|
18164
18163
|
rounding: json.Rounding,
|
|
18165
18164
|
digits: json.Digits,
|
|
18166
18165
|
useEkPrices: this.api.useEkPrices,
|
|
@@ -19065,11 +19064,6 @@ var DivaCatalogData = /*#__PURE__*/function () {
|
|
|
19065
19064
|
get: function get() {
|
|
19066
19065
|
return this.catalogData.dontShowAccStep;
|
|
19067
19066
|
}
|
|
19068
|
-
}, {
|
|
19069
|
-
key: "autoSelectFirstValue",
|
|
19070
|
-
value: function autoSelectFirstValue() {
|
|
19071
|
-
return this.catalogData.autoSelectFirstValue;
|
|
19072
|
-
}
|
|
19073
19067
|
|
|
19074
19068
|
//Planner configurations
|
|
19075
19069
|
}, {
|
|
@@ -21360,7 +21354,7 @@ var DivaArticle = /*#__PURE__*/function () {
|
|
|
21360
21354
|
get: function get() {
|
|
21361
21355
|
var _this$accessoireParen7;
|
|
21362
21356
|
if (this.relatedToShelfGrid !== undefined && (_this$accessoireParen7 = this.accessoireParentArticle) !== null && _this$accessoireParen7 !== void 0 && _this$accessoireParen7.shelfPlanner) {
|
|
21363
|
-
return this.accessoireParentArticle.shelfPlanner.getRelatedToGridIdByArticleCodex(this.articleCodex);
|
|
21357
|
+
return this.accessoireParentArticle.shelfPlanner.getRelatedToGridIdByArticleCodex(this.articleCodex, this.relatedToShelfGrid);
|
|
21364
21358
|
}
|
|
21365
21359
|
return undefined;
|
|
21366
21360
|
}
|
|
@@ -23537,7 +23531,7 @@ var DivaArticle = /*#__PURE__*/function () {
|
|
|
23537
23531
|
break;
|
|
23538
23532
|
}
|
|
23539
23533
|
_context.next = 4;
|
|
23540
|
-
return Promise.resolve().then(function () { return require('./ShelfPlanner-
|
|
23534
|
+
return Promise.resolve().then(function () { return require('./ShelfPlanner-def9ee33.js'); });
|
|
23541
23535
|
case 4:
|
|
23542
23536
|
_yield$import = _context.sent;
|
|
23543
23537
|
ShelfPlanner = _yield$import["default"];
|
|
@@ -28000,7 +27994,7 @@ var DivaSet = /*#__PURE__*/function () {
|
|
|
28000
27994
|
break;
|
|
28001
27995
|
}
|
|
28002
27996
|
_context4.next = 3;
|
|
28003
|
-
return Promise.resolve().then(function () { return require('./DoorPlanner-
|
|
27997
|
+
return Promise.resolve().then(function () { return require('./DoorPlanner-697dd3d9.js'); });
|
|
28004
27998
|
case 3:
|
|
28005
27999
|
_yield$import = _context4.sent;
|
|
28006
28000
|
DoorPlanner = _yield$import["default"];
|
|
@@ -30678,7 +30672,8 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
|
|
|
30678
30672
|
groupedGrids.push({
|
|
30679
30673
|
addToSpecificTabGroup: group.addToTabgroup ? (_configTree$getTabgro = configTree.getTabgroupKeyByOptionCodex('OPT' + group.addToTabgroup)) !== null && _configTree$getTabgro !== void 0 ? _configTree$getTabgro : 'ShelfPlanner' : 'ShelfPlanner',
|
|
30680
30674
|
grids: [grid],
|
|
30681
|
-
groupName: group.Group
|
|
30675
|
+
groupName: group.Group,
|
|
30676
|
+
forOtherGroups: true
|
|
30682
30677
|
});
|
|
30683
30678
|
}
|
|
30684
30679
|
};
|
|
@@ -30702,7 +30697,7 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
|
|
|
30702
30697
|
var groupId = (_group$groupName = group.groupName) !== null && _group$groupName !== void 0 ? _group$groupName : 'Shelfgroup';
|
|
30703
30698
|
var newConfigStep = this.createConfigStep(set, false, group.groupName, _toConsumableArray__default["default"](new Set(group.grids.map(function (g) {
|
|
30704
30699
|
return g.basketId;
|
|
30705
|
-
}))), group.groupName, 'BasketId', groupId, configTree, false, group.grids[0].getShelfParentShelfId(), group.grids[0].getRequiredWarning((_set$WebConfig2 = set.WebConfig) === null || _set$WebConfig2 === void 0 ? void 0 : _set$WebConfig2.language), true, set.configAccessoiresInAccessoireStep, undefined, undefined, 'SHELFPLANNER');
|
|
30700
|
+
}))), group.groupName, 'BasketId', groupId, configTree, false, group.grids[0].getShelfParentShelfId(), group.grids[0].getRequiredWarning((_set$WebConfig2 = set.WebConfig) === null || _set$WebConfig2 === void 0 ? void 0 : _set$WebConfig2.language), true, set.configAccessoiresInAccessoireStep, undefined, undefined, group.forOtherGroups ? 'SHELFPLANNER' : undefined);
|
|
30706
30701
|
configTree.addConfigStep(tabgroupKey, group.groupName, group.groupName, newConfigStep);
|
|
30707
30702
|
}
|
|
30708
30703
|
}
|
|
@@ -30715,8 +30710,9 @@ var DivaConfigTreeHandler = /*#__PURE__*/function () {
|
|
|
30715
30710
|
if (ops && basketId && parentCodex && ((_ops$optionOcd = ops.optionOcd) !== null && _ops$optionOcd !== void 0 ? _ops$optionOcd : ops.optionCodex) !== parentCodex) {
|
|
30716
30711
|
var article = set.getArticleByBasketId(basketId);
|
|
30717
30712
|
if (article) {
|
|
30713
|
+
var _ops$visibleOptionVal;
|
|
30718
30714
|
if (!!article.getArticleOptionState(ops.option.parentOptionCodex).isDifferentOption) return true;
|
|
30719
|
-
var rul = ops.visibleOptionValues[Object.keys(ops.visibleOptionValues)[0]].rul;
|
|
30715
|
+
var rul = (_ops$visibleOptionVal = ops.visibleOptionValues[Object.keys(ops.visibleOptionValues)[0]]) === null || _ops$visibleOptionVal === void 0 ? void 0 : _ops$visibleOptionVal.rul;
|
|
30720
30716
|
if (rul) {
|
|
30721
30717
|
var parentOptions = DivaUtils__default["default"].getOptionsByRule(rul);
|
|
30722
30718
|
return !!parentOptions.find(function (o) {
|
|
@@ -33931,15 +33927,14 @@ var DivaSetHandler = /*#__PURE__*/function () {
|
|
|
33931
33927
|
key: "getSetImage",
|
|
33932
33928
|
value: (function () {
|
|
33933
33929
|
var _getSetImage = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee30(set, overwriteLastSavedRendering) {
|
|
33934
|
-
var setImage,
|
|
33930
|
+
var setImage, is3D;
|
|
33935
33931
|
return _regeneratorRuntime__default["default"].wrap(function _callee30$(_context32) {
|
|
33936
33932
|
while (1) switch (_context32.prev = _context32.next) {
|
|
33937
33933
|
case 0:
|
|
33938
33934
|
setImage = undefined;
|
|
33939
|
-
catalogData = set.CatalogData;
|
|
33940
33935
|
is3D = ['3DImage', 'BoxPlanner', 'RTViewer'].includes(set.getPlannerMode());
|
|
33941
33936
|
if (!is3D) {
|
|
33942
|
-
_context32.next =
|
|
33937
|
+
_context32.next = 10;
|
|
33943
33938
|
break;
|
|
33944
33939
|
}
|
|
33945
33940
|
LOG$8.startTransaction({
|
|
@@ -33947,17 +33942,17 @@ var DivaSetHandler = /*#__PURE__*/function () {
|
|
|
33947
33942
|
message: 'render 3D Image',
|
|
33948
33943
|
eventId: 'RENDER_3D_IMAGE'
|
|
33949
33944
|
});
|
|
33950
|
-
_context32.next =
|
|
33951
|
-
return set.plannerHandler.saveSetImage(
|
|
33952
|
-
case
|
|
33953
|
-
_context32.next =
|
|
33945
|
+
_context32.next = 6;
|
|
33946
|
+
return set.plannerHandler.saveSetImage(overwriteLastSavedRendering);
|
|
33947
|
+
case 6:
|
|
33948
|
+
_context32.next = 8;
|
|
33954
33949
|
return set.plannerHandler.getSetImageAsUrl(set.getSetId());
|
|
33955
|
-
case
|
|
33950
|
+
case 8:
|
|
33956
33951
|
setImage = _context32.sent;
|
|
33957
33952
|
LOG$8.successTransaction('RENDER_3D_IMAGE');
|
|
33958
|
-
case
|
|
33953
|
+
case 10:
|
|
33959
33954
|
return _context32.abrupt("return", setImage);
|
|
33960
|
-
case
|
|
33955
|
+
case 11:
|
|
33961
33956
|
case "end":
|
|
33962
33957
|
return _context32.stop();
|
|
33963
33958
|
}
|
|
@@ -35216,7 +35211,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
|
|
|
35216
35211
|
break;
|
|
35217
35212
|
case 3:
|
|
35218
35213
|
_context13.next = 5;
|
|
35219
|
-
return Promise.resolve().then(function () { return require('./PfisterWWSHandler-
|
|
35214
|
+
return Promise.resolve().then(function () { return require('./PfisterWWSHandler-0dab97a9.js'); });
|
|
35220
35215
|
case 5:
|
|
35221
35216
|
_yield$import = _context13.sent;
|
|
35222
35217
|
PfisterWWSHandler = _yield$import["default"];
|
|
@@ -35224,7 +35219,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
|
|
|
35224
35219
|
return _context13.abrupt("break", 33);
|
|
35225
35220
|
case 9:
|
|
35226
35221
|
_context13.next = 11;
|
|
35227
|
-
return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-
|
|
35222
|
+
return Promise.resolve().then(function () { return require('./LiviqueWWSHandler-44e25ef6.js'); });
|
|
35228
35223
|
case 11:
|
|
35229
35224
|
_yield$import2 = _context13.sent;
|
|
35230
35225
|
LiviqueWWSHandler = _yield$import2["default"];
|
|
@@ -35232,7 +35227,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
|
|
|
35232
35227
|
return _context13.abrupt("break", 33);
|
|
35233
35228
|
case 15:
|
|
35234
35229
|
_context13.next = 17;
|
|
35235
|
-
return Promise.resolve().then(function () { return require('./SeriousBasketHandler-
|
|
35230
|
+
return Promise.resolve().then(function () { return require('./SeriousBasketHandler-82414e54.js'); });
|
|
35236
35231
|
case 17:
|
|
35237
35232
|
_yield$import3 = _context13.sent;
|
|
35238
35233
|
SeriousWWSHandler = _yield$import3["default"];
|
|
@@ -35240,7 +35235,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
|
|
|
35240
35235
|
return _context13.abrupt("break", 33);
|
|
35241
35236
|
case 21:
|
|
35242
35237
|
_context13.next = 23;
|
|
35243
|
-
return Promise.resolve().then(function () { return require('./ProductBasketHandler-
|
|
35238
|
+
return Promise.resolve().then(function () { return require('./ProductBasketHandler-fd87c645.js'); });
|
|
35244
35239
|
case 23:
|
|
35245
35240
|
_yield$import4 = _context13.sent;
|
|
35246
35241
|
ProductWWSHandler = _yield$import4["default"];
|
|
@@ -35248,7 +35243,7 @@ var DivaBasketHandler = /*#__PURE__*/function () {
|
|
|
35248
35243
|
return _context13.abrupt("break", 33);
|
|
35249
35244
|
case 27:
|
|
35250
35245
|
_context13.next = 29;
|
|
35251
|
-
return Promise.resolve().then(function () { return require('./StandardWWSHandler-
|
|
35246
|
+
return Promise.resolve().then(function () { return require('./StandardWWSHandler-7f2bca9a.js'); });
|
|
35252
35247
|
case 29:
|
|
35253
35248
|
_yield$import5 = _context13.sent;
|
|
35254
35249
|
StandardWWSHandler = _yield$import5["default"];
|
|
@@ -36618,7 +36613,7 @@ var PlannerHandler3D = /*#__PURE__*/function () {
|
|
|
36618
36613
|
while (1) switch (_context3.prev = _context3.next) {
|
|
36619
36614
|
case 0:
|
|
36620
36615
|
_context3.next = 2;
|
|
36621
|
-
return Promise.resolve().then(function () { return require('./Host3DSignalR-
|
|
36616
|
+
return Promise.resolve().then(function () { return require('./Host3DSignalR-ad7cc0de.js'); });
|
|
36622
36617
|
case 2:
|
|
36623
36618
|
_yield$import = _context3.sent;
|
|
36624
36619
|
Host3DSignalR = _yield$import["default"];
|
|
@@ -36767,7 +36762,9 @@ var PlannerHandler3D = /*#__PURE__*/function () {
|
|
|
36767
36762
|
|
|
36768
36763
|
//Do not display the rendering if it was saved in real Time mode withough cache - it was only saved when entering the Zusammenfassung for saving it later in the Basket
|
|
36769
36764
|
|
|
36770
|
-
if (
|
|
36765
|
+
if (this.checkRenderingReady(params.hash, waitedRendering) && waitedRendering.MediaServiceSaveMode == 'STREAM') {
|
|
36766
|
+
this.updatePlannerRendering(waitedRendering);
|
|
36767
|
+
}
|
|
36771
36768
|
return;
|
|
36772
36769
|
}
|
|
36773
36770
|
if (params.url) {
|
|
@@ -37208,6 +37205,8 @@ var PlannerHandler3D = /*#__PURE__*/function () {
|
|
|
37208
37205
|
}
|
|
37209
37206
|
}
|
|
37210
37207
|
case 31:
|
|
37208
|
+
return _context7.abrupt("return", renderHash);
|
|
37209
|
+
case 32:
|
|
37211
37210
|
case "end":
|
|
37212
37211
|
return _context7.stop();
|
|
37213
37212
|
}
|
|
@@ -37381,11 +37380,6 @@ var PlannerHandler3D = /*#__PURE__*/function () {
|
|
|
37381
37380
|
value: function checkConnectionInitialized() {
|
|
37382
37381
|
return !!this.connectionHandler;
|
|
37383
37382
|
}
|
|
37384
|
-
}, {
|
|
37385
|
-
key: "checkIsWaitingForRendering",
|
|
37386
|
-
value: function checkIsWaitingForRendering() {
|
|
37387
|
-
return this.waitForRenderings.size > 0;
|
|
37388
|
-
}
|
|
37389
37383
|
}, {
|
|
37390
37384
|
key: "checkIsWaitingForHQRenderScript",
|
|
37391
37385
|
value: function checkIsWaitingForHQRenderScript() {
|
|
@@ -38165,7 +38159,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38165
38159
|
break;
|
|
38166
38160
|
case 8:
|
|
38167
38161
|
_context4.next = 10;
|
|
38168
|
-
return Promise.resolve().then(function () { return require('./DivaStandardPlanner-
|
|
38162
|
+
return Promise.resolve().then(function () { return require('./DivaStandardPlanner-667e5cf0.js'); });
|
|
38169
38163
|
case 10:
|
|
38170
38164
|
_yield$import = _context4.sent;
|
|
38171
38165
|
DivaStandardPlanner = _yield$import["default"];
|
|
@@ -38176,7 +38170,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38176
38170
|
return _context4.abrupt("break", 21);
|
|
38177
38171
|
case 15:
|
|
38178
38172
|
_context4.next = 17;
|
|
38179
|
-
return Promise.resolve().then(function () { return require('./DivaBoxPlanner-
|
|
38173
|
+
return Promise.resolve().then(function () { return require('./DivaBoxPlanner-4f3790ec.js'); });
|
|
38180
38174
|
case 17:
|
|
38181
38175
|
_yield$import2 = _context4.sent;
|
|
38182
38176
|
DivaBoxPlanner = _yield$import2["default"];
|
|
@@ -38434,30 +38428,40 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38434
38428
|
key: "saveSetHQRenderScript",
|
|
38435
38429
|
value: function () {
|
|
38436
38430
|
var _saveSetHQRenderScript = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee9() {
|
|
38437
|
-
var checkingTimes, i;
|
|
38431
|
+
var hash, checkingTimes, i;
|
|
38438
38432
|
return _regeneratorRuntime__default["default"].wrap(function _callee9$(_context9) {
|
|
38439
38433
|
while (1) switch (_context9.prev = _context9.next) {
|
|
38440
38434
|
case 0:
|
|
38441
38435
|
DivaUtils__default["default"].startSpanOfApm('DivaPlannerHandler saveSetHQRenderScript');
|
|
38442
|
-
|
|
38443
|
-
|
|
38436
|
+
_context9.next = 3;
|
|
38437
|
+
return this.request3D(false, true);
|
|
38438
|
+
case 3:
|
|
38439
|
+
hash = _context9.sent;
|
|
38440
|
+
if (hash) {
|
|
38441
|
+
_context9.next = 6;
|
|
38442
|
+
break;
|
|
38443
|
+
}
|
|
38444
|
+
return _context9.abrupt("return");
|
|
38445
|
+
case 6:
|
|
38446
|
+
checkingTimes = 200;
|
|
38444
38447
|
i = 0;
|
|
38445
|
-
case
|
|
38446
|
-
if (!(this.handler3D.
|
|
38447
|
-
_context9.next =
|
|
38448
|
+
case 8:
|
|
38449
|
+
if (!(this.handler3D.getWaitForHqRenderScript(hash) && checkingTimes > i)) {
|
|
38450
|
+
_context9.next = 14;
|
|
38448
38451
|
break;
|
|
38449
38452
|
}
|
|
38450
|
-
_context9.next =
|
|
38451
|
-
return DivaUtils__default["default"].Sleep(
|
|
38452
|
-
case
|
|
38453
|
+
_context9.next = 11;
|
|
38454
|
+
return DivaUtils__default["default"].Sleep(50);
|
|
38455
|
+
case 11:
|
|
38453
38456
|
i++;
|
|
38454
|
-
_context9.next =
|
|
38457
|
+
_context9.next = 8;
|
|
38455
38458
|
break;
|
|
38456
|
-
case
|
|
38459
|
+
case 14:
|
|
38460
|
+
LOG$2.debug('saving performance: HQ Renderscript recieved after ' + i * checkingTimes + ' ms');
|
|
38457
38461
|
if (this.handler3D.checkIsWaitingForHQRenderScript() && checkingTimes == i) {
|
|
38458
38462
|
LOG$2.error(new DivaUtils.DivaError('could not saveSetHQRenderScript'));
|
|
38459
38463
|
}
|
|
38460
|
-
case
|
|
38464
|
+
case 16:
|
|
38461
38465
|
case "end":
|
|
38462
38466
|
return _context9.stop();
|
|
38463
38467
|
}
|
|
@@ -38471,8 +38475,8 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38471
38475
|
}, {
|
|
38472
38476
|
key: "saveSetImage",
|
|
38473
38477
|
value: function () {
|
|
38474
|
-
var _saveSetImage = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(
|
|
38475
|
-
var sumWaitingMS, rendering;
|
|
38478
|
+
var _saveSetImage = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee10(overwriteLastSavedRendering) {
|
|
38479
|
+
var hash, sumWaitingMS, rendering;
|
|
38476
38480
|
return _regeneratorRuntime__default["default"].wrap(function _callee10$(_context10) {
|
|
38477
38481
|
while (1) switch (_context10.prev = _context10.next) {
|
|
38478
38482
|
case 0:
|
|
@@ -38480,10 +38484,11 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38480
38484
|
|
|
38481
38485
|
//Save permanent rendering
|
|
38482
38486
|
if (!(overwriteLastSavedRendering || !this.handler3D.hasLastSavedRendering())) {
|
|
38483
|
-
_context10.next =
|
|
38487
|
+
_context10.next = 15;
|
|
38484
38488
|
break;
|
|
38485
38489
|
}
|
|
38486
|
-
|
|
38490
|
+
_context10.next = 4;
|
|
38491
|
+
return this.request3D(true, false, false, undefined, true, {
|
|
38487
38492
|
width: 100,
|
|
38488
38493
|
height: 100,
|
|
38489
38494
|
isFullscreenRendering: false,
|
|
@@ -38491,39 +38496,49 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38491
38496
|
mediaServiceSaveMode: 'PERMANENT',
|
|
38492
38497
|
doShow3DDimensionLines: false
|
|
38493
38498
|
});
|
|
38494
|
-
sumWaitingMS = 0;
|
|
38495
38499
|
case 4:
|
|
38496
|
-
|
|
38497
|
-
|
|
38500
|
+
hash = _context10.sent;
|
|
38501
|
+
if (hash) {
|
|
38502
|
+
_context10.next = 7;
|
|
38498
38503
|
break;
|
|
38499
38504
|
}
|
|
38500
|
-
|
|
38501
|
-
|
|
38502
|
-
|
|
38505
|
+
return _context10.abrupt("return", false);
|
|
38506
|
+
case 7:
|
|
38507
|
+
sumWaitingMS = 0;
|
|
38503
38508
|
case 8:
|
|
38504
|
-
|
|
38505
|
-
|
|
38506
|
-
|
|
38509
|
+
if (!(this.handler3D.getWaitForRendering(hash) && sumWaitingMS < RenderSettings.TIMEOUT_WAITFORSAVEDRENDERING_MS)) {
|
|
38510
|
+
_context10.next = 14;
|
|
38511
|
+
break;
|
|
38512
|
+
}
|
|
38513
|
+
sumWaitingMS += 50;
|
|
38507
38514
|
_context10.next = 12;
|
|
38508
|
-
return
|
|
38515
|
+
return DivaUtils__default["default"].Sleep(50);
|
|
38509
38516
|
case 12:
|
|
38517
|
+
_context10.next = 8;
|
|
38518
|
+
break;
|
|
38519
|
+
case 14:
|
|
38520
|
+
LOG$2.debug('saving performance: 3D Image recieved after ' + sumWaitingMS + ' ms');
|
|
38521
|
+
case 15:
|
|
38522
|
+
_context10.next = 17;
|
|
38523
|
+
return this.handler3D.getLastSavedRendering();
|
|
38524
|
+
case 17:
|
|
38510
38525
|
rendering = _context10.sent;
|
|
38511
38526
|
if (!(!rendering || !rendering.UrlToSavedRendering)) {
|
|
38512
|
-
_context10.next =
|
|
38527
|
+
_context10.next = 21;
|
|
38513
38528
|
break;
|
|
38514
38529
|
}
|
|
38515
38530
|
DivaUtils__default["default"].endSpanOfApm('DivaPlannerHandler saveSetImage');
|
|
38516
38531
|
return _context10.abrupt("return", false);
|
|
38517
|
-
case
|
|
38532
|
+
case 21:
|
|
38518
38533
|
DivaUtils__default["default"].endSpanOfApm('DivaPlannerHandler saveSetImage');
|
|
38519
38534
|
return _context10.abrupt("return", true);
|
|
38520
|
-
case
|
|
38535
|
+
case 23:
|
|
38521
38536
|
case "end":
|
|
38522
38537
|
return _context10.stop();
|
|
38523
38538
|
}
|
|
38524
38539
|
}, _callee10, this);
|
|
38525
38540
|
}));
|
|
38526
|
-
function saveSetImage(_x16
|
|
38541
|
+
function saveSetImage(_x16) {
|
|
38527
38542
|
return _saveSetImage.apply(this, arguments);
|
|
38528
38543
|
}
|
|
38529
38544
|
return saveSetImage;
|
|
@@ -38590,7 +38605,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38590
38605
|
}
|
|
38591
38606
|
}, _callee11, this);
|
|
38592
38607
|
}));
|
|
38593
|
-
function saveAlternateSetImages(
|
|
38608
|
+
function saveAlternateSetImages(_x17, _x18) {
|
|
38594
38609
|
return _saveAlternateSetImages.apply(this, arguments);
|
|
38595
38610
|
}
|
|
38596
38611
|
return saveAlternateSetImages;
|
|
@@ -38618,7 +38633,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38618
38633
|
}
|
|
38619
38634
|
}, _callee12, this);
|
|
38620
38635
|
}));
|
|
38621
|
-
function saveSet2DImage(
|
|
38636
|
+
function saveSet2DImage(_x19, _x20, _x21, _x22) {
|
|
38622
38637
|
return _saveSet2DImage.apply(this, arguments);
|
|
38623
38638
|
}
|
|
38624
38639
|
return saveSet2DImage;
|
|
@@ -38701,7 +38716,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38701
38716
|
}
|
|
38702
38717
|
}, _callee13, this);
|
|
38703
38718
|
}));
|
|
38704
|
-
function addPlannerElement(
|
|
38719
|
+
function addPlannerElement(_x23, _x24, _x25) {
|
|
38705
38720
|
return _addPlannerElement.apply(this, arguments);
|
|
38706
38721
|
}
|
|
38707
38722
|
return addPlannerElement;
|
|
@@ -38738,7 +38753,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38738
38753
|
}
|
|
38739
38754
|
}, _callee14, this);
|
|
38740
38755
|
}));
|
|
38741
|
-
function deletePlannerElement(
|
|
38756
|
+
function deletePlannerElement(_x26, _x27, _x28, _x29) {
|
|
38742
38757
|
return _deletePlannerElement.apply(this, arguments);
|
|
38743
38758
|
}
|
|
38744
38759
|
return deletePlannerElement;
|
|
@@ -38791,7 +38806,7 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38791
38806
|
}
|
|
38792
38807
|
}, _callee15, this);
|
|
38793
38808
|
}));
|
|
38794
|
-
function copyPlannerElements(
|
|
38809
|
+
function copyPlannerElements(_x30, _x31, _x32) {
|
|
38795
38810
|
return _copyPlannerElements.apply(this, arguments);
|
|
38796
38811
|
}
|
|
38797
38812
|
return copyPlannerElements;
|
|
@@ -38910,65 +38925,95 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
38910
38925
|
}
|
|
38911
38926
|
}, {
|
|
38912
38927
|
key: "request3D",
|
|
38913
|
-
value: function
|
|
38914
|
-
var
|
|
38915
|
-
|
|
38916
|
-
|
|
38917
|
-
|
|
38918
|
-
|
|
38919
|
-
|
|
38920
|
-
|
|
38921
|
-
|
|
38922
|
-
|
|
38923
|
-
|
|
38924
|
-
|
|
38925
|
-
|
|
38926
|
-
|
|
38927
|
-
|
|
38928
|
-
|
|
38929
|
-
|
|
38930
|
-
|
|
38931
|
-
|
|
38932
|
-
|
|
38933
|
-
|
|
38934
|
-
|
|
38935
|
-
|
|
38936
|
-
|
|
38937
|
-
|
|
38938
|
-
|
|
38939
|
-
|
|
38940
|
-
|
|
38941
|
-
|
|
38942
|
-
|
|
38943
|
-
|
|
38944
|
-
|
|
38945
|
-
|
|
38946
|
-
|
|
38947
|
-
|
|
38948
|
-
|
|
38949
|
-
|
|
38950
|
-
|
|
38951
|
-
|
|
38952
|
-
|
|
38953
|
-
|
|
38954
|
-
|
|
38955
|
-
|
|
38956
|
-
|
|
38957
|
-
|
|
38958
|
-
|
|
38959
|
-
|
|
38960
|
-
|
|
38961
|
-
|
|
38962
|
-
|
|
38963
|
-
|
|
38964
|
-
|
|
38965
|
-
|
|
38966
|
-
|
|
38967
|
-
|
|
38968
|
-
|
|
38928
|
+
value: function () {
|
|
38929
|
+
var _request3D = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee16(doRequestRendering, doRequestHqRenderScript, alternateRenderingsExist, alternateRenderInfo, forceReloadPlanning, renderRequestInfos, viewpoint) {
|
|
38930
|
+
var _this3 = this;
|
|
38931
|
+
var plannerData, loadedCatData, plannerExists, savedSetId;
|
|
38932
|
+
return _regeneratorRuntime__default["default"].wrap(function _callee16$(_context16) {
|
|
38933
|
+
while (1) switch (_context16.prev = _context16.next) {
|
|
38934
|
+
case 0:
|
|
38935
|
+
if (!doRequestRendering) {
|
|
38936
|
+
_context16.next = 9;
|
|
38937
|
+
break;
|
|
38938
|
+
}
|
|
38939
|
+
if (renderRequestInfos) {
|
|
38940
|
+
_context16.next = 6;
|
|
38941
|
+
break;
|
|
38942
|
+
}
|
|
38943
|
+
LOG$2.error(new DivaUtils.DivaError('Error requesting 3D rendering. No renderRequestInfo is set'));
|
|
38944
|
+
return _context16.abrupt("return");
|
|
38945
|
+
case 6:
|
|
38946
|
+
if (!(renderRequestInfos.width <= 0 || isNaN(renderRequestInfos.width) || renderRequestInfos.height <= 0 || isNaN(renderRequestInfos.height))) {
|
|
38947
|
+
_context16.next = 9;
|
|
38948
|
+
break;
|
|
38949
|
+
}
|
|
38950
|
+
LOG$2.error(new DivaUtils.DivaError('Error requesting rendering. Not valid width or height request width: ' + renderRequestInfos.width + ' height: ' + renderRequestInfos.height));
|
|
38951
|
+
return _context16.abrupt("return");
|
|
38952
|
+
case 9:
|
|
38953
|
+
plannerData = this.handler3D.initPlannerData(this.plannerHandlerFunctions.doAllowSetPlanner());
|
|
38954
|
+
loadedCatData = [];
|
|
38955
|
+
plannerExists = false;
|
|
38956
|
+
savedSetId = undefined;
|
|
38957
|
+
this.plannerList.forEach(function (planner, setId) {
|
|
38958
|
+
var _renderRequestInfos$d;
|
|
38959
|
+
savedSetId = setId;
|
|
38960
|
+
var config = planner.getSetData(true, _this3.plannerHandlerFunctions.doAllowSetPlanner(), (_renderRequestInfos$d = renderRequestInfos === null || renderRequestInfos === void 0 ? void 0 : renderRequestInfos.doShow3DDimensionLines) !== null && _renderRequestInfos$d !== void 0 ? _renderRequestInfos$d : false, alternateRenderInfo);
|
|
38961
|
+
var setData = config.constructionSet;
|
|
38962
|
+
|
|
38963
|
+
//Add technical Info to setData
|
|
38964
|
+
var bboxInfo2D = _this3.get2DViewPlannerBoundingBox();
|
|
38965
|
+
setData.TechSize = {
|
|
38966
|
+
Width: bboxInfo2D.size.x,
|
|
38967
|
+
Height: bboxInfo2D.size.y,
|
|
38968
|
+
Depth: bboxInfo2D.size.z
|
|
38969
|
+
};
|
|
38970
|
+
plannerData.SCE.ROO[0].SET.push(setData);
|
|
38971
|
+
plannerExists = true;
|
|
38972
|
+
var catalog = planner.getCatalogData();
|
|
38973
|
+
if (renderRequestInfos) renderRequestInfos.plannerMeasureDigits = catalog.PlannerMeasureDigits;
|
|
38974
|
+
loadedCatData.push({
|
|
38975
|
+
catalogCodex: catalog.catalogCodex,
|
|
38976
|
+
catalogGUID: catalog.catalogGuid,
|
|
38977
|
+
lang: catalog.api.getLanguage()
|
|
38978
|
+
});
|
|
38979
|
+
});
|
|
38980
|
+
if (!plannerExists) {
|
|
38981
|
+
_context16.next = 19;
|
|
38982
|
+
break;
|
|
38983
|
+
}
|
|
38984
|
+
// if not in set planner mode overwrite s1 with correct setId
|
|
38985
|
+
if (!this.plannerHandlerFunctions.doAllowSetPlanner()) {
|
|
38986
|
+
plannerData.SCE.ROO[0].SET[0].ID = savedSetId;
|
|
38987
|
+
plannerData.SCE.ROO[0].SelectSet = savedSetId;
|
|
38988
|
+
}
|
|
38989
|
+
_context16.next = 18;
|
|
38990
|
+
return this.handler3D.request3D({
|
|
38991
|
+
doRequestRendering: doRequestRendering,
|
|
38992
|
+
doRequestHqRenderScript: doRequestHqRenderScript,
|
|
38993
|
+
divaNr: this.divaNr,
|
|
38994
|
+
planningData: plannerData,
|
|
38995
|
+
catalogData: loadedCatData[0],
|
|
38996
|
+
renderRequestInfos: renderRequestInfos,
|
|
38997
|
+
forceReloadPlanning: forceReloadPlanning,
|
|
38998
|
+
alternateRenderInfo: alternateRenderInfo,
|
|
38999
|
+
alternateRenderingsExist: alternateRenderingsExist,
|
|
39000
|
+
camera: viewpoint
|
|
39001
|
+
});
|
|
39002
|
+
case 18:
|
|
39003
|
+
return _context16.abrupt("return", _context16.sent);
|
|
39004
|
+
case 19:
|
|
39005
|
+
return _context16.abrupt("return");
|
|
39006
|
+
case 20:
|
|
39007
|
+
case "end":
|
|
39008
|
+
return _context16.stop();
|
|
39009
|
+
}
|
|
39010
|
+
}, _callee16, this);
|
|
39011
|
+
}));
|
|
39012
|
+
function request3D(_x33, _x34, _x35, _x36, _x37, _x38, _x39) {
|
|
39013
|
+
return _request3D.apply(this, arguments);
|
|
38969
39014
|
}
|
|
38970
|
-
|
|
38971
|
-
|
|
39015
|
+
return request3D;
|
|
39016
|
+
}()
|
|
38972
39017
|
/**
|
|
38973
39018
|
* This function returns the Project (JSON) of the planning data of a specific set.
|
|
38974
39019
|
* @param setId Only contains planner Information of this set
|
|
@@ -39001,15 +39046,6 @@ var DivaPlannerHandler = /*#__PURE__*/function () {
|
|
|
39001
39046
|
}
|
|
39002
39047
|
return JSON.stringify(plannerData);
|
|
39003
39048
|
}
|
|
39004
|
-
|
|
39005
|
-
/**
|
|
39006
|
-
* This function indicates if the 3d handler is still waiting for any rendering. It returnes false when no render job is open.
|
|
39007
|
-
*/
|
|
39008
|
-
}, {
|
|
39009
|
-
key: "checkIsWaitingForRendering",
|
|
39010
|
-
value: function checkIsWaitingForRendering() {
|
|
39011
|
-
return this.handler3D.checkIsWaitingForRendering();
|
|
39012
|
-
}
|
|
39013
39049
|
}, {
|
|
39014
39050
|
key: "createPlanningHash",
|
|
39015
39051
|
value:
|
|
@@ -39699,6 +39735,7 @@ var DivaWebPlanner = /*#__PURE__*/function () {
|
|
|
39699
39735
|
}());
|
|
39700
39736
|
_defineProperty__default["default"](this, "fillBaksetforOnWebPlanerConfigChange", /*#__PURE__*/function () {
|
|
39701
39737
|
var _ref12 = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee12(myValues, isInit) {
|
|
39738
|
+
var _myValues;
|
|
39702
39739
|
var set, articles, article;
|
|
39703
39740
|
return _regeneratorRuntime__default["default"].wrap(function _callee12$(_context12) {
|
|
39704
39741
|
while (1) switch (_context12.prev = _context12.next) {
|
|
@@ -39716,22 +39753,31 @@ var DivaWebPlanner = /*#__PURE__*/function () {
|
|
|
39716
39753
|
}
|
|
39717
39754
|
return _context12.abrupt("return");
|
|
39718
39755
|
case 5:
|
|
39719
|
-
if (
|
|
39720
|
-
|
|
39721
|
-
|
|
39722
|
-
|
|
39723
|
-
|
|
39756
|
+
if (myValues) {
|
|
39757
|
+
_context12.next = 11;
|
|
39758
|
+
break;
|
|
39759
|
+
}
|
|
39760
|
+
//get first option of the first article
|
|
39761
|
+
articles = set.getDivaArticles();
|
|
39762
|
+
article = articles[Object.keys(articles)[0]];
|
|
39763
|
+
if (article) {
|
|
39764
|
+
_context12.next = 10;
|
|
39765
|
+
break;
|
|
39724
39766
|
}
|
|
39767
|
+
return _context12.abrupt("return");
|
|
39768
|
+
case 10:
|
|
39769
|
+
myValues = article === null || article === void 0 ? void 0 : article.VariantValuesWithoutFreetext;
|
|
39770
|
+
case 11:
|
|
39725
39771
|
_context12.t0 = _this.divaBasketHandler;
|
|
39726
39772
|
_context12.t1 = set;
|
|
39727
|
-
_context12.next =
|
|
39773
|
+
_context12.next = 15;
|
|
39728
39774
|
return setHandlerInstance.fillOrderLinesAndOrderSets(_this.sets, _this.divaBasketHandler, true, _this.doAllowSetPlanner(), _this.ReturnTo);
|
|
39729
|
-
case
|
|
39775
|
+
case 15:
|
|
39730
39776
|
_context12.t2 = _context12.sent;
|
|
39731
|
-
_context12.t3 = Object.keys(myValues);
|
|
39777
|
+
_context12.t3 = Object.keys((_myValues = myValues) !== null && _myValues !== void 0 ? _myValues : {});
|
|
39732
39778
|
_context12.t4 = isInit;
|
|
39733
39779
|
return _context12.abrupt("return", _context12.t0.fillBaksetforOnWebPlanerConfigChange.call(_context12.t0, _context12.t1, _context12.t2, _context12.t3, _context12.t4));
|
|
39734
|
-
case
|
|
39780
|
+
case 19:
|
|
39735
39781
|
case "end":
|
|
39736
39782
|
return _context12.stop();
|
|
39737
39783
|
}
|
package/build/cjs/index.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var index = require('./index-
|
|
5
|
+
var index = require('./index-44574518.js');
|
|
6
6
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
7
7
|
require('@babel/runtime/helpers/classCallCheck');
|
|
8
8
|
require('@babel/runtime/helpers/createClass');
|
|
@@ -3,10 +3,10 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
|
3
3
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
4
4
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
5
5
|
import _regeneratorRuntime from '@babel/runtime/regenerator';
|
|
6
|
-
import { V as Vector3, B as BoundingBox } from './index-
|
|
6
|
+
import { V as Vector3, B as BoundingBox } from './index-218c9bd1.js';
|
|
7
7
|
import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
|
|
8
8
|
import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
|
|
9
|
-
import { d as dockingPointHandlerInst, P as PlannerElementData, h as handler2D } from './PlannerHandler2D-
|
|
9
|
+
import { d as dockingPointHandlerInst, P as PlannerElementData, h as handler2D } from './PlannerHandler2D-193e7ebc.js';
|
|
10
10
|
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
11
11
|
import '@babel/runtime/helpers/slicedToArray';
|
|
12
12
|
import 'axios';
|