@colijnit/configurator 259.1.2 → 259.1.3

package/app/components/selections/selections.component.d.ts

@@ -10,8 +10,8 @@ declare class SelectionViewModel {
 export declare class SelectionsComponent {
     private _builder;
     set selections(value: Selection[]);
-    selectionViewModels: SelectionViewModel[];
     selectionClick: EventEmitter<Selection>;
+    selectionViewModels: SelectionViewModel[];
     constructor(_builder: Builder);
     expandClicked(selectionViewModel: SelectionViewModel, mouseEvent: MouseEvent): void;
     selectSelection(selection: Selection, mouseEvent: MouseEvent): void;

package/bundles/colijnit-configurator.umd.js

@@ -959,6 +959,9 @@
           var con2Name = (con2.constructor.name === 'Mesh' || con2.constructor.name === 'Object3D') ? con2.name : con2.connector;
           var sameParent = (con1.constructor.name === 'Mesh' || con1.constructor.name === 'Object3D') &&
               (con2.constructor.name === 'Mesh' || con2.constructor.name === 'Object3D') ? con1.parent === con2.parent : false;
+          if (!con1Name || !con2Name) {
+              return false;
+          }
           var parts1 = con1Name.toUpperCase().split('_'), parts2 = con2Name.toUpperCase().split('_');
           if (parts1.length >= 3 && parts2.length >= 3 && !sameParent) {
               var connectable = parts1[0] === 'C' && parts2[0] === 'C' &&
@@ -984,8 +987,8 @@
           if (!scene || !parent) {
               return false;
           }
-          con1['connectedTo'] = con2.parent.name;
-          con2['connectedTo'] = con1.parent.name;
+          con1['connectedTo'] = con2 && con2.parent ? con2.parent.name : '';
+          con2['connectedTo'] = con1 && con1.parent ? con1.parent.name : '';
           var motherRotation = new THREE__namespace.Euler(0, 0, 0);
           var motherPosition = new THREE__namespace.Vector3(0, 0, 0);
           parent.updateMatrixWorld();
@@ -995,33 +998,53 @@
           parent.position.set(0, 0, 0);
           scene.updateMatrixWorld(true);
           var con1Quat = new THREE__namespace.Quaternion();
-          con1.getWorldQuaternion(con1Quat);
+          if (con1) {
+              con1.getWorldQuaternion(con1Quat);
+          }
           var con2Quat = new THREE__namespace.Quaternion();
-          con2.getWorldQuaternion(con2Quat);
+          if (con2) {
+              con2.getWorldQuaternion(con2Quat);
+          }
           var con1QuatParent = new THREE__namespace.Quaternion();
-          con1.parent.getWorldQuaternion(con1QuatParent);
+          if (con1 && con1.parent) {
+              con1.parent.getWorldQuaternion(con1QuatParent);
+          }
           var con2QuatParent = new THREE__namespace.Quaternion();
-          con2.parent.getWorldQuaternion(con2QuatParent);
+          if (con2 && con2.parent) {
+              con2.parent.getWorldQuaternion(con2QuatParent);
+          }
           var rotation = new THREE__namespace.Quaternion().multiplyQuaternions(con1Quat.invert(), con2Quat).multiply(new THREE__namespace.Quaternion().multiplyQuaternions(con1QuatParent, con1QuatParent));
-          con2.parent.quaternion.copy(rotation);
+          if (con2 && con2.parent) {
+              con2.parent.quaternion.copy(rotation);
+          }
           // Update because the matrix has been tempered with
           scene.updateMatrixWorld(true);
           // Move the connectors towards eachother
           var con1Pos = new THREE__namespace.Vector3();
-          con1.getWorldPosition(con1Pos);
+          if (con1) {
+              con1.getWorldPosition(con1Pos);
+          }
           var con2Pos = new THREE__namespace.Vector3();
-          con2.getWorldPosition(con2Pos);
+          if (con2) {
+              con2.getWorldPosition(con2Pos);
+          }
           var move = con1Pos.sub(con2Pos);
-          con2.parent.position.x += move.x;
-          con2.parent.position.y += move.y;
-          con2.parent.position.z += move.z;
+          if (con2 && con2.parent) {
+              con2.parent.position.x += move.x;
+              con2.parent.position.y += move.y;
+              con2.parent.position.z += move.z;
+          }
           // reset parent's objects rotation and position
           parent.rotation.copy(motherRotation);
           parent.position.copy(motherPosition);
           scene.updateMatrixWorld(true);
           // Set the connected flag
-          con1['connected'] = true;
-          con2['connected'] = true;
+          if (con1) {
+              con1['connected'] = true;
+          }
+          if (con2) {
+              con2['connected'] = true;
+          }
           return true;
       };
       return SceneUtils;
@@ -1095,52 +1118,66 @@
       return Material;
   }());
 
+  var BaseUtils = /** @class */ (function () {
+      function BaseUtils() {
+      }
+      BaseUtils.prototype.log = function (message) {
+          if (this.debug) {
+              this.debug(message);
+              console.log(new Date(), message);
+          }
+      };
+      return BaseUtils;
+  }());
+
   // @dynamic
-  var ImageUtils = /** @class */ (function () {
+  var ImageUtils = /** @class */ (function (_super) {
+      __extends(ImageUtils, _super);
       function ImageUtils() {
+          return _super !== null && _super.apply(this, arguments) || this;
       }
       ImageUtils.CreateTextureFromBase64 = function (id, base64, material, defaultFlip) {
-          var _this = this;
           if (defaultFlip === void 0) { defaultFlip = false; }
-          return new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
-              var _a, loader;
-              return __generator(this, function (_b) {
-                  switch (_b.label) {
+          var _a, _b;
+          return __awaiter(this, void 0, void 0, function () {
+              var texture_1, loader_1, texture, err_1;
+              return __generator(this, function (_c) {
+                  switch (_c.label) {
                       case 0:
-                          if (!ImageUtils.textures.has(id)) return [3 /*break*/, 1];
-                          resolve(ImageUtils.textures.get(id));
-                          return [3 /*break*/, 5];
+                          if (ImageUtils.textures.has(id)) {
+                              return [2 /*return*/, ImageUtils.textures.get(id)];
+                          }
+                          _c.label = 1;
                       case 1:
-                          if (!!base64) return [3 /*break*/, 2];
-                          resolve(new THREE__namespace.Texture());
-                          return [3 /*break*/, 5];
+                          _c.trys.push([1, 5, , 6]);
+                          if (!window.textureLoader) return [3 /*break*/, 3];
+                          return [4 /*yield*/, window.textureLoader(base64, material)];
                       case 2:
-                          if (!window.hasOwnProperty('textureLoader')) return [3 /*break*/, 4];
-                          _a = resolve;
-                          return [4 /*yield*/, window.textureLoader(base64)];
+                          texture_1 = _c.sent();
+                          ImageUtils.textures.set(id, texture_1);
+                          return [2 /*return*/, texture_1];
                       case 3:
-                          _a.apply(void 0, [_b.sent()]);
-                          return [3 /*break*/, 5];
+                          loader_1 = new THREE__namespace.TextureLoader();
+                          return [4 /*yield*/, new Promise(function (resolve, reject) {
+                                  loader_1.load(base64, resolve, undefined, function (err) { return reject(err); });
+                              })];
                       case 4:
-                          loader = new THREE__namespace.TextureLoader();
-                          loader.load(base64, function (texture) {
-                              texture.anisotropy = 16;
-                              texture.wrapS = THREE__namespace.RepeatWrapping;
-                              texture.wrapT = THREE__namespace.RepeatWrapping;
-                              texture.repeat = new THREE__namespace.Vector2(material ? material.repeatX : 1, material ? material.repeatY : 1);
-                              texture.flipY = defaultFlip;
-                              texture.needsUpdate = true;
-                              ImageUtils.textures.set(id, texture);
-                              resolve(texture);
-                          }, function () {
-                          }, function () {
-                              resolve(new THREE__namespace.Texture());
-                          });
-                          _b.label = 5;
-                      case 5: return [2 /*return*/];
+                          texture = _c.sent();
+                          texture.anisotropy = 16;
+                          texture.wrapS = THREE__namespace.RepeatWrapping;
+                          texture.wrapT = THREE__namespace.RepeatWrapping;
+                          texture.repeat = new THREE__namespace.Vector2((_a = material === null || material === void 0 ? void 0 : material.repeatX) !== null && _a !== void 0 ? _a : 1, (_b = material === null || material === void 0 ? void 0 : material.repeatY) !== null && _b !== void 0 ? _b : 1);
+                          texture.flipY = defaultFlip;
+                          texture.needsUpdate = true;
+                          ImageUtils.textures.set(id, texture);
+                          return [2 /*return*/, texture];
+                      case 5:
+                          err_1 = _c.sent();
+                          return [2 /*return*/, null];
+                      case 6: return [2 /*return*/];
                   }
               });
-          }); });
+          });
       };
       ImageUtils.getDocBodyWithMimeTypeDefinition = function (fileName, documentBody) {
           if (documentBody === null) {
@@ -1171,7 +1208,7 @@
           ImageUtils.textures.clear();
       };
       return ImageUtils;
-  }());
+  }(BaseUtils));
   ImageUtils.textures = new Map();
 
   var FurnitureMaterial = /** @class */ (function (_super) {
@@ -1857,10 +1894,13 @@
   }());
   VariationUtils.MaterialCache = new Map();
 
-  var VariationHelper = /** @class */ (function () {
+  var VariationHelper = /** @class */ (function (_super) {
+      __extends(VariationHelper, _super);
       function VariationHelper() {
-          this._variations = [];
-          this._lastKnownVariations = new Map();
+          var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+          _this._variations = [];
+          _this._lastKnownVariations = new Map();
+          return _this;
       }
       VariationHelper.prototype.clearCache = function () {
           var variationMap = Array.from(this._lastKnownVariations.values());
@@ -2004,7 +2044,7 @@
                       case 4: return [3 /*break*/, 6];
                       case 5:
                           e_2 = _a.sent();
-                          this._log(e_2.message);
+                          this.log(e_2.message);
                           return [3 /*break*/, 6];
                       case 6: return [2 /*return*/];
                   }
@@ -2444,14 +2484,8 @@
           }
           return new THREE.Color();
       };
-      VariationHelper.prototype._log = function (message) {
-          if (this.debug) {
-              this.debug(message);
-              console.log(new Date(), message);
-          }
-      };
       return VariationHelper;
-  }());
+  }(BaseUtils));
 
   var ConfiguratorService = /** @class */ (function () {
       function ConfiguratorService() {
@@ -2512,10 +2546,12 @@
                       case 0: return [4 /*yield*/, this._configuratorApi.getSelections(showLoader)];
                       case 1:
                           selections = _a.sent();
-                          selections.resultObjects.filter(function (s) {
-                              (isNill_function.isNill(s.hierarchicalPublicationCode) || ((s.hierarchicalPublicationCode & publicationCode) > 0)) && ((s.nodeType === nodeType_enum.NodeType.Question && (((s.questionPublicationCode & publicationCode) > 0) || isNill_function.isNill(s.questionPublicationCode))) ||
-                                  (s.nodeType === nodeType_enum.NodeType.Answer && (((s.answerPublicationCode & publicationCode) > 0) || isNill_function.isNill(s.answerPublicationCode))));
-                          });
+                          if (selections && selections.resultObjects) {
+                              selections.resultObjects.filter(function (s) {
+                                  (isNill_function.isNill(s.hierarchicalPublicationCode) || ((s.hierarchicalPublicationCode & publicationCode) > 0)) && ((s.nodeType === nodeType_enum.NodeType.Question && (((s.questionPublicationCode & publicationCode) > 0) || isNill_function.isNill(s.questionPublicationCode))) ||
+                                      (s.nodeType === nodeType_enum.NodeType.Answer && (((s.answerPublicationCode & publicationCode) > 0) || isNill_function.isNill(s.answerPublicationCode))));
+                              });
+                          }
                           return [2 /*return*/, selections];
                   }
               });
@@ -2542,11 +2578,13 @@
                       case 0: return [4 /*yield*/, this._configuratorApi.getQuestionAndAnswers(showLoader)];
                       case 1:
                           questionAndAnswers = _a.sent();
-                          questionAndAnswers.answers.filter(function (answer) {
-                              (notNill_function.notNill(answer.hierarchicalPublicationCode) && (answer.hierarchicalPublicationCode & publicationCode) === 0) ||
-                                  (answer.type === nodeType_enum.NodeType.Question && (answer.questionPublicationCode & publicationCode) === 0 && notNill_function.notNill(answer.questionPublicationCode)) ||
-                                  (answer.type === nodeType_enum.NodeType.Answer && (answer.publicationCode & publicationCode) === 0 && notNill_function.notNill(answer.publicationCode));
-                          });
+                          if (questionAndAnswers && questionAndAnswers.answers) {
+                              questionAndAnswers.answers.filter(function (answer) {
+                                  (notNill_function.notNill(answer.hierarchicalPublicationCode) && (answer.hierarchicalPublicationCode & publicationCode) === 0) ||
+                                      (answer.type === nodeType_enum.NodeType.Question && (answer.questionPublicationCode & publicationCode) === 0 && notNill_function.notNill(answer.questionPublicationCode)) ||
+                                      (answer.type === nodeType_enum.NodeType.Answer && (answer.publicationCode & publicationCode) === 0 && notNill_function.notNill(answer.publicationCode));
+                              });
+                          }
                           return [2 /*return*/, questionAndAnswers];
                   }
               });
@@ -2595,18 +2633,20 @@
       function ObjectUtils() {
       }
       ObjectUtils.DisposeNode = function (node) {
-          node.traverse(function (obj) {
-              if (obj instanceof THREE.Mesh) {
-                  if (obj.geometry) {
-                      obj.geometry.dispose();
+          if (node) {
+              node.traverse(function (obj) {
+                  if (obj instanceof THREE.Mesh) {
+                      if (obj.geometry) {
+                          obj.geometry.dispose();
+                      }
+                      ObjectUtils.DisposeMaterial(obj.material);
                   }
-                  ObjectUtils.DisposeMaterial(obj.material);
-              }
-              if (typeof obj.dispose === 'function') {
-                  // @ts-ignore
-                  obj.dispose();
-              }
-          });
+                  if (typeof obj.dispose === 'function') {
+                      // @ts-ignore
+                      obj.dispose();
+                  }
+              });
+          }
       };
       ObjectUtils.DisposeMaterial = function (material) {
           var _this = this;
@@ -2819,8 +2859,8 @@
                       case 0: return [4 /*yield*/, this._configuratorService.getQuestionAndAnswers(false, publicationCode)];
                       case 1:
                           questionsAndAnswers = _a.sent();
-                          this._answers = questionsAndAnswers.answers;
-                          this.answersReceived.next(questionsAndAnswers.answers);
+                          this._answers = questionsAndAnswers && questionsAndAnswers.answers ? questionsAndAnswers.answers : [];
+                          this.answersReceived.next(this._answers);
                           return [2 /*return*/];
                   }
               });
@@ -2836,7 +2876,7 @@
                           return [4 /*yield*/, this.getQuestionAndAnswers()];
                       case 2:
                           _a.sent();
-                          if (this._answers.length === 0) {
+                          if (this._answers && this._answers.length === 0) {
                               this._build();
                           }
                           return [2 /*return*/];
@@ -2893,9 +2933,12 @@
           }
       };
       Builder.prototype._preloadMaterials = function () {
-          this._variationHelper.preloadVariations(this._decos
-              .filter(function (d) { return d.gameObjectName && d.type === decoNodeType_enum.DecoNodeType.Variation; })
-              .map(function (d) { return d.gameObjectName; }));
+          if (this._decos && this._decos.length) {
+              var materials = __spreadArray([], __read(new Set(this._decos
+                  .filter(function (d) { return d.gameObjectName && d.type === decoNodeType_enum.DecoNodeType.Variation; })
+                  .map(function (d) { return d.gameObjectName; }))));
+              this._variationHelper.preloadVariations(materials);
+          }
       };
       Builder.prototype._setInstanceId = function (sku, instanceId, goodId) {
           return __awaiter(this, void 0, void 0, function () {
@@ -3041,6 +3084,9 @@
       };
       Builder.prototype._prepareTheSelections = function () {
           var _this = this;
+          if (!this._selections || !this._selections.length) {
+              return;
+          }
           var selections = this._selections.slice();
           var selectionOfArticle = selections.find(function (s) { return s.nodeType === nodeType_enum.NodeType.Article; });
           var adjustableSelections = selections.filter(function (s) { return s.addAdjust === '2'; });
@@ -3170,17 +3216,19 @@
        * @private
        */
       Builder.prototype._getMaterialIdFromParent = function (id) {
-          var idx = this._selections.findIndex(function (s) { return s.node === id; });
-          var currentLevel = 999;
-          if (idx > -1) {
-              for (var i = idx; i > 0; i--) {
-                  var selection = this._selections[i];
-                  if (selection.presentationLevel >= currentLevel) {
-                      break;
-                  }
-                  currentLevel = selection.presentationLevel;
-                  if (selection.hdecoGameObject) {
-                      return selection.hdecoGameObject;
+          if (this._selections) {
+              var idx = this._selections.findIndex(function (s) { return s.node === id; });
+              var currentLevel = 999;
+              if (idx > -1) {
+                  for (var i = idx; i > 0; i--) {
+                      var selection = this._selections[i];
+                      if (selection.presentationLevel >= currentLevel) {
+                          break;
+                      }
+                      currentLevel = selection.presentationLevel;
+                      if (selection.hdecoGameObject) {
+                          return selection.hdecoGameObject;
+                      }
                   }
               }
           }
@@ -3268,7 +3316,7 @@
                       case 0: return [4 /*yield*/, this._configuratorService.getGoodIdFromSku(sku, false)];
                       case 1:
                           response = _a.sent();
-                          if (response.validationResult.success && response.resultObject) {
+                          if (response && response.validationResult && response.validationResult.success && response.resultObject) {
                               return [2 /*return*/, response.resultObject];
                           }
                           return [2 /*return*/];
@@ -3297,7 +3345,7 @@
                       case 2: return [4 /*yield*/, this._configuratorService.getArticleQuickSel(goodId, false)];
                       case 3:
                           articleResponse = _a.sent();
-                          if (articleResponse.validationResult.success && articleResponse.resultObject) {
+                          if (articleResponse && articleResponse.validationResult && articleResponse.validationResult.success && articleResponse.resultObject) {
                               if (articleResponse.resultObject.hasOwnProperty('oArticle')) {
                                   obj = Array.isArray(articleResponse.resultObject['oArticle']) ? articleResponse.resultObject['oArticle'][0] : articleResponse.resultObject['oArticle'];
                                   article$1 = this._boFactory.makeWithRawBackendData(article.Article, obj);
@@ -3323,7 +3371,7 @@
                           return [4 /*yield*/, this._configuratorService.getSelections(false, publicationCode)];
                       case 1:
                           selectionResponse = _a.sent();
-                          if (selectionResponse.resultObjects && selectionResponse.resultObjects.length > 0) {
+                          if (selectionResponse && selectionResponse.resultObjects && selectionResponse.resultObjects.length > 0) {
                               this._selections = this._boFactory.makeBOArrayFromRawBackendDataArray(selection.Selection, selectionResponse.resultObjects);
                               this._selections.forEach(function (s) { return s.instanceId = instanceId; });
                               // const filtered: Selection[] = this._selections.filter(s => s.nodeType !== NodeType.Article && s.presentationLevel === 1);
@@ -3347,7 +3395,7 @@
                           return [4 /*yield*/, this._configuratorService.getDecos(false)];
                       case 1:
                           decosResponse = _a.sent();
-                          if (decosResponse.resultObjects && decosResponse.resultObjects.length > 0) {
+                          if (decosResponse && decosResponse.resultObjects && decosResponse.resultObjects.length > 0) {
                               this._decos = this._boFactory.makeBOArrayFromRawBackendDataArray(decoNode.DecoNode, decosResponse.resultObjects);
                               this.decosReceived.next(this._decos);
                           }
@@ -3361,6 +3409,9 @@
       };
       Builder.prototype._linkSelectionsAndDecos = function () {
           var _this = this;
+          if (!this._selections || !this._selections.length) {
+              return;
+          }
           var len = this._selections.length;
           var _loop_2 = function (i) {
               // const id: string = this.selections[i].artNodeIdDeco;
@@ -3382,9 +3433,12 @@
           }
       };
       Builder.prototype._getVariations = function () {
-          return this._decos.filter(function (deco) {
-              return deco.type === decoNodeType_enum.DecoNodeType.Variation;
-          });
+          if (this._decos && this._decos.length) {
+              return this._decos.filter(function (deco) {
+                  return deco.type === decoNodeType_enum.DecoNodeType.Variation;
+              });
+          }
+          return [];
       };
       Builder.prototype._loadVariations = function (obj) {
           return __awaiter(this, void 0, void 0, function () {
@@ -3412,6 +3466,9 @@
           });
       };
       Builder.prototype._getAdjustables = function () {
+          if (!this._selections || !this._selections.length) {
+              return [];
+          }
           return this._selections.filter(function (s) {
               var node = s.decoNode;
               return node && node.gameObjectName && node.type === decoNodeType_enum.DecoNodeType.Part && node.kind === decoNodeKind_enum.DecoNodeKind.Adjustable;
@@ -3710,8 +3767,8 @@
   var SelectionsComponent = /** @class */ (function () {
       function SelectionsComponent(_builder) {
           this._builder = _builder;
-          this.selectionViewModels = [];
           this.selectionClick = new i0.EventEmitter();
+          this.selectionViewModels = [];
       }
       Object.defineProperty(SelectionsComponent.prototype, "selections", {
           set: function (value) {