@colijnit/homedecorator 262.1.4 → 262.1.5

package/fesm2022/colijnit-homedecorator.mjs

@@ -43,9 +43,7 @@ import { XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerM
 import { RGBFormat, LinearToneMapping, AgXToneMapping, LinearFilter as LinearFilter$1, LinearSRGBColorSpace as LinearSRGBColorSpace$1, SrcAlphaSaturateFactor, FloatType as FloatType$1 } from 'three/src/constants.js';
 import md5 from 'md5';
 import { NodeType } from '@colijnit/configuratorapi/build/enum/node-type.enum';
-import { ConfiguratorStatisticsEnvironment } from '@colijnit/configuratorapi/build/model/configurator-statistics-environment';
 import { Options } from '@colijnit/ioneconnector/build/model/options';
-import { FrozenArticle } from '@colijnit/configuratorapi/build/model/frozen-article';
 import { SelectorWithOptions } from '@colijnit/configuratorapi/build/model/selector-with-options';
 import { ImageUtils } from '@colijnit/configuratorapi/build/utils/image-utils';
 import * as i1 from '@angular/common/http';
@@ -4003,6 +4001,18 @@ class HomedecoratorConnectorAdapterService {
     // public getJsonMatchTableArticles(): Promise<void> {
     //   return this.connector.getJsonMatchTableArticles();
     // }
+    async prepareArticleForCart(goodId, quantity = 1, shouldGetArticleTree = false, showLoader = true, instanceId = undefined) {
+        const response = await this.articleApi.prepareArticleForCart('Homedecorator', 'Sales', 'Homedecorator', goodId, shouldGetArticleTree, quantity, instanceId, showLoader);
+        if (response && response.validationResult && response.validationResult.success) {
+            if (typeof response.resultObject !== 'string') {
+                return this._boFactory.makeWithRawBackendData(ArticleFullObject, response.resultObject);
+            }
+            return response.resultObject;
+        }
+        else {
+            return null;
+        }
+    }
     async setInstanceToConfigure(id) {
         try {
             if (id !== null) {
@@ -6869,8 +6879,8 @@ class HomedecoratorConnectorService {
     googleTranslateEnabled() {
         return this._connector.googleTranslateEnabled();
     }
-    getJsonConfiguredArticles(goodId, goodType, quantity, externalSource = false, showLoader = true, instanceId, configuratorStatistics) {
-        return this._connector.getJsonConfiguredArticles(goodId, goodType, quantity, externalSource, showLoader, instanceId, configuratorStatistics);
+    prepareArticleForCart(goodId, quantity, externalSource = false, showLoader = true, instanceId) {
+        return this._connector.prepareArticleForCart(goodId, quantity, !!externalSource, showLoader, instanceId);
     }
     // public getJsonMatchTableArticles(): Promise<any> {
     //   return this._connector.getJsonMatchTableArticles();
@@ -6903,7 +6913,7 @@ class HomedecoratorConnectorService {
         });
         this.articleReceived.next(article);
         this._article = article;
-        this._articlePrice = article.price;
+        this._articlePrice = article ? article.price : null;
         // Sometimes the sku is not returned in Article
         this._article.sku = sku;
         return article;
@@ -7189,23 +7199,21 @@ class HomedecoratorConnectorService {
         });
     }
     async addToCart(goodId, goodType, quantity, instanceId, externalSource) {
-        let json;
-        const statistics = new ConfiguratorStatisticsEnvironment();
-        statistics.userType = 'Homedecorator';
-        statistics.transactionType = 'Sales';
-        statistics.actionDomain = 'Homedecorator';
-        statistics.sessionId = this._settingsService.settings.session ? this._settingsService.settings.session.sessionId : 'unknown';
-        statistics.webHost = window.location.host;
-        statistics.bundleHost = window.location.host;
-        json = await this.getJsonConfiguredArticles(goodId, goodType, quantity, externalSource, true, instanceId, statistics);
-        const frozenArticle = JSON.parse(json);
+        const response = await this.prepareArticleForCart(goodId, quantity, externalSource, true, instanceId);
+        let article;
+        if (typeof response === 'string') {
+            article = JSON.parse(response);
+        }
+        else {
+            article = response;
+        }
         this._googleTagManager.sendEvent(GoogleTagManagerEvent.AddToCart, {
-            'articleNr': frozenArticle.articleNr,
-            'product': frozenArticle.articleName,
-            'composition': frozenArticle instanceof FrozenArticle ? frozenArticle.compositions : frozenArticle.configurationText
+            'articleNr': article.selectorData ? article.selectorData.articleNr : article.articleNr,
+            'product': article.selectorData ? article.selectorData.articleName : article.name,
+            'composition': article.selectorData ? article.selectorData.configurationText : article.configuration
         });
-        this._messageService.emit(MessageType.ArticleCreated, json);
-        return json;
+        this._messageService.emit(MessageType.ArticleCreated, article);
+        return article;
     }
     handleAnswersReceived() {
         this._preloadCachedImages(this.activeAnswers);
@@ -17279,10 +17287,9 @@ class WallItem extends Item {
                 // if elevation is higher than the wall, use maxY
                 // vec3.y = Math.min(this._getMaxY(wall) / 2, this.halfSize.y + this.elevation);
                 vec3.y = Math.min(maxY, this.halfSize.y + this.elevation);
-            }
-            else if (this.elevationAdjustable && this.onWall) {
-                // if the item is adjustable & is placed on the wall
-                vec3.y = Math.min(this._getMaxY(wall), this.halfSize.y + this.elevation);
+                // } else if (this.elevationAdjustable && this.onWall) { /* no idea why this is done, but it causes problems for positioning items */
+                //   // if the item is adjustable & is placed on the wall
+                //   vec3.y = Math.min(this._getMaxY(wall), this.halfSize.y + this.elevation);
             }
             else {
                 if (vec3.y < minY) {
@@ -28700,7 +28707,7 @@ class RenderService {
         this._appEventService = _appEventService;
         this._dictionaryService = _dictionaryService;
         this.renderImageChanged = new BehaviorSubject('');
-        this.renderImageError = new BehaviorSubject('');
+        this.renderImageError = new Subject();
         this.blenderRenderStarted = new Subject();
         this.renderUpdateImageChanged = new BehaviorSubject(undefined);
         this.renderRoomImageChanged = new BehaviorSubject('');
@@ -43305,10 +43312,10 @@ class RoomPlannerComponent {
         if (object.metadata) {
             this.showContextMenu = false;
             await this._connectorAdapterService.initConnector(object.metadata.externalSettings ? object.metadata.externalSettings.settings : this.settingsService.settings, object.metadata.externalSettings ? object.metadata.externalSettings.name : undefined, false, object.metadata.externalSettings && object.metadata.externalSettings.externalSourceId ? object.metadata.externalSettings.externalSourceId : null);
-            const json = await this._connectorService.addToCart(+object.metadata.goodId, object.metadata.goodType, 1, object.metadata.itemId, !!(object.metadata.externalSettings && object.metadata.externalSettings.externalSourceId));
+            const article = await this._connectorService.addToCart(+object.metadata.goodId, object.metadata.goodType, 1, object.metadata.itemId, !!(object.metadata.externalSettings && object.metadata.externalSettings.externalSourceId));
             if (object.metadata.externalSettings) {
                 const externalSource = {
-                    article: json,
+                    article: article,
                     quantity: 1,
                     catalogDefinition: object.metadata.externalSettings.catalogDefinition,
                     externalSource: this._connectorAdapterService.getExternalSourceFromId(object.metadata.externalSettings.externalSourceId)
@@ -43316,7 +43323,7 @@ class RoomPlannerComponent {
                 this._appEventService.addExternalSourceToCart.next(externalSource);
             }
             else {
-                this._appEventService.addToCart.next({ article: json, quantity: 1 });
+                this._appEventService.addToCart.next({ article: article, quantity: 1 });
             }
         }
     }
@@ -49699,7 +49706,7 @@ class HomedecoratorComponent {
         return this._settings;
     }
     constructor(appService, // don't remove this, needs to be created on a high level
-    controllerService, appState, presetsService, screenAnalysis, _iconRegistry, _domSanitizer, _messageService, _homedecoratorService, _parentEventService, _ownEventService, _integrationService, _sceneService, _webWorkerService, _configurationPresetLoadService) {
+    controllerService, appState, presetsService, screenAnalysis, _iconRegistry, _domSanitizer, _messageService, _homedecoratorService, _parentEventService, _ownEventService, _integrationService, _sceneService, _webWorkerService, _configurationPresetLoadService, _injector) {
         this.appService = appService;
         this.controllerService = controllerService;
         this.appState = appState;
@@ -49715,6 +49722,7 @@ class HomedecoratorComponent {
         this._sceneService = _sceneService;
         this._webWorkerService = _webWorkerService;
         this._configurationPresetLoadService = _configurationPresetLoadService;
+        this._injector = _injector;
         this.generalFilterOrders = [
             { name: 'CATEGORY', order: 1 },
             { name: 'TURNOVER_GROUP', order: 2 },
@@ -49801,6 +49809,7 @@ class HomedecoratorComponent {
         // };
         this._subs = [];
         this._initCommunication = false;
+        ServiceLocator.injector = this._injector;
         this._eventService = _parentEventService || _ownEventService;
         this._webWorkerService.initWorkers();
     }
@@ -49931,7 +49940,7 @@ class HomedecoratorComponent {
     _initConnection() {
         this._homedecoratorService.init(this._settings);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: HomedecoratorComponent, deps: [{ token: HomedecoratorAppService }, { token: HomedecoratorConnectorService }, { token: AppStateService }, { token: PresetsService }, { token: ScreenSizeAnalysisService }, { token: i5.MatIconRegistry }, { token: i1$1.DomSanitizer }, { token: MessageBusService }, { token: HomedecoratorService }, { token: HomedecoratorAppEventService, optional: true, skipSelf: true }, { token: HomedecoratorAppEventService, optional: true, self: true }, { token: IntegrationService }, { token: SceneService }, { token: WebWorkerService }, { token: ConfigurationPresetLoadService }], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: HomedecoratorComponent, deps: [{ token: HomedecoratorAppService }, { token: HomedecoratorConnectorService }, { token: AppStateService }, { token: PresetsService }, { token: ScreenSizeAnalysisService }, { token: i5.MatIconRegistry }, { token: i1$1.DomSanitizer }, { token: MessageBusService }, { token: HomedecoratorService }, { token: HomedecoratorAppEventService, optional: true, skipSelf: true }, { token: HomedecoratorAppEventService, optional: true, self: true }, { token: IntegrationService }, { token: SceneService }, { token: WebWorkerService }, { token: ConfigurationPresetLoadService }, { token: i0.Injector }], target: i0.ɵɵFactoryTarget.Component }); }
     static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: HomedecoratorComponent, isStandalone: false, selector: "co-homedecorator", inputs: { generalFilterOrders: "generalFilterOrders", purchaseFilterOrders: "purchaseFilterOrders", logisticsFilterOrders: "logisticsFilterOrders", initCommunication: "initCommunication", projectToLoad: "projectToLoad", shareButton: "shareButton", loadWithConfigurationPreset: "loadWithConfigurationPreset", settings: "settings" }, host: { listeners: { "document:keyup": "keyup($event)" }, properties: { "class.co-homedecorator": "this.showClass" } }, providers: [
             APPLICATION_SERVICES_PROVIDERS
         ], ngImport: i0, template: `
@@ -50033,7 +50042,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                     type: Optional
                 }, {
                     type: Self
-                }] }, { type: IntegrationService }, { type: SceneService }, { type: WebWorkerService }, { type: ConfigurationPresetLoadService }], propDecorators: { generalFilterOrders: [{
+                }] }, { type: IntegrationService }, { type: SceneService }, { type: WebWorkerService }, { type: ConfigurationPresetLoadService }, { type: i0.Injector }], propDecorators: { generalFilterOrders: [{
                 type: Input
             }], purchaseFilterOrders: [{
                 type: Input
@@ -52703,11 +52712,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
         }] });
 
 class HomedecoratorModule {
-    constructor(_injector) {
-        this._injector = _injector;
-        ServiceLocator.injector = this._injector;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: HomedecoratorModule, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: HomedecoratorModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
     static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.16", ngImport: i0, type: HomedecoratorModule, bootstrap: [HomedecoratorComponent], declarations: [HomedecoratorComponent], imports: [CommonModule,
             ProgressBarModule,
             LoadingOverlayModule,
@@ -52756,7 +52761,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                     ],
                     bootstrap: [HomedecoratorComponent]
                 }]
-        }], ctorParameters: () => [{ type: i0.Injector }] });
+        }] });
 
 class MaterialBuilderComponent {
     set settings(value) {