@colijnit/product 2.9.0 → 2.9.1

package/app/ione-product.component.d.ts

@@ -1,4 +1,4 @@
-import { ChangeDetectorRef, EventEmitter, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import { ChangeDetectorRef, EventEmitter, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
 import { JsonUtilsService } from './utils/json-utils.service';
 import { ProductConnectorService } from './service/product-connector.service';
 import { DictionaryService } from './service/dictionary.service';
@@ -7,7 +7,7 @@ import { ArticleListObject } from '@colijnit/articleapi/build/model/article-list
 import { ProductSettingsService } from './service/product-settings.service';
 import { Selection } from '@colijnit/articleapi/build/model/selection';
 import { ArticleQuickSel } from '@colijnit/articleapi/build/model/article-quick-sel';
-export declare class IoneProductComponent implements OnChanges, OnDestroy {
+export declare class IoneProductComponent implements OnInit, OnChanges, OnDestroy {
     private _dictionary;
     private _jsonUtils;
     private _ione;
@@ -24,9 +24,11 @@ export declare class IoneProductComponent implements OnChanges, OnDestroy {
     onArticleReceived: EventEmitter<ArticleQuickSel>;
     onSelectionsReceived: EventEmitter<Selection[]>;
     onAddToQuote: EventEmitter<string>;
+    settingsLoaded: boolean;
     private _settings;
     private _subs;
     constructor(_dictionary: DictionaryService, _jsonUtils: JsonUtilsService, _ione: ProductConnectorService, _changeDetector: ChangeDetectorRef, _appEventService: ProductEventService, _settingsService: ProductSettingsService);
+    ngOnInit(): Promise<void>;
     ngOnChanges(changes: SimpleChanges): void;
     ngOnDestroy(): void;
     private _handleAnswerInfoReceived;

package/app/ione-product.module.d.ts

@@ -1,4 +1,2 @@
-import { ProductInitializerService } from './service/product-initializer.service';
-export declare function initializeApp(context: ProductInitializerService): () => Promise<void>;
 export declare class IoneProductModule {
 }

package/bundles/colijnit-product.umd.js

@@ -228,8 +228,8 @@
         function Version() {
             this.name = "@colijnit/product";
             this.description = "Product detail page project for iOne";
-            this.symVer = "2.9.0";
-            this.publishDate = "7-9-2023 15:18:44";
+            this.symVer = "2.9.1";
+            this.publishDate = "14-9-2023 16:32:35";
         }
         return Version;
     }());
@@ -1004,13 +1004,16 @@
             this.onArticleReceived = new core.EventEmitter();
             this.onSelectionsReceived = new core.EventEmitter();
             this.onAddToQuote = new core.EventEmitter();
+            this.settingsLoaded = false;
             this._subs = [];
             // this.sku = "70000107";
             this._subs.push(
             // this._dictionary.dictionaryLoaded.subscribe(d => this.upAndLoaded = true),
             this._appEventService.onAddToCart.subscribe(function (json) {
                 _this._handleAddToCart(json);
-            }), this._appEventService.onAddToQuote.subscribe(function (json) { return _this.onAddToQuote.emit(json); }), this._appEventService.onAlternativeClick.subscribe(function (article) { return _this.onAlternativeClick.emit(article); }), this._appEventService.onArticleInfoReceived.subscribe(function (info) { return _this._handleAnswerInfoReceived(info); }), this._appEventService.onArticleReceived.subscribe(function (article) { return _this.onArticleReceived.emit(article); }), this._appEventService.onSelectionsReceived.subscribe(function (selections) { return _this.onSelectionsReceived.emit(selections); }));
+            }), this._appEventService.onAddToQuote.subscribe(function (json) { return _this.onAddToQuote.emit(json); }), this._appEventService.onAlternativeClick.subscribe(function (article) { return _this.onAlternativeClick.emit(article); }), this._appEventService.onArticleInfoReceived.subscribe(function (info) { return _this._handleAnswerInfoReceived(info); }), this._appEventService.onArticleReceived.subscribe(function (article) { return _this.onArticleReceived.emit(article); }), this._appEventService.onSelectionsReceived.subscribe(function (selections) { return _this.onSelectionsReceived.emit(selections); }), this._settingsService.settingsLoaded.subscribe(function (loaded) {
+                _this.settingsLoaded = loaded;
+            }));
         }
         Object.defineProperty(IoneProductComponent.prototype, "settings", {
             get: function () {
@@ -1032,6 +1035,18 @@
             enumerable: true,
             configurable: true
         });
+        IoneProductComponent.prototype.ngOnInit = function () {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this._settingsService.initializeSettings()];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         IoneProductComponent.prototype.ngOnChanges = function (changes) {
             this._changeDetector.detectChanges();
         };
@@ -1043,7 +1058,7 @@
         };
         IoneProductComponent.prototype._handleAddToCart = function (json) {
             return __awaiter(this, void 0, void 0, function () {
-                var articleTreeData, i, good, subArticle;
+                var articleTreeData, compositeGoods, _loop_1, this_1, i;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
@@ -1052,14 +1067,32 @@
                             articleTreeData = JSON.parse(json);
                             if (!(articleTreeData.articleTree && articleTreeData.articleTree.article)) return [3 /*break*/, 7];
                             if (!(articleTreeData.articleTree.compositeGoods && Array.isArray(articleTreeData.articleTree.compositeGoods) &&
-                                articleTreeData.articleTree.compositeGoods.length > 0 && articleTreeData.articleTree.subArticles && Array.isArray(articleTreeData.articleTree.subArticles))) return [3 /*break*/, 5];
+                                articleTreeData.articleTree.compositeGoods.length > 0 &&
+                                articleTreeData.articleTree.subArticles && Array.isArray(articleTreeData.articleTree.subArticles))) return [3 /*break*/, 5];
+                            compositeGoods = articleTreeData.articleTree.compositeGoods;
+                            compositeGoods.sort(function (a, b) { return a.versionNumber < b.versionNumber ? -1 : 1; });
+                            _loop_1 = function (i) {
+                                var good, subArticle;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            good = compositeGoods[i];
+                                            subArticle = articleTreeData.articleTree.subArticles.find(function (s) { return s.goodId === good.memberGoodId; });
+                                            if (!subArticle) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, this_1._ione.addWebSessionTransactionLine(subArticle.articleNumber, good.quantity)];
+                                        case 1:
+                                            _a.sent();
+                                            _a.label = 2;
+                                        case 2: return [2 /*return*/];
+                                    }
+                                });
+                            };
+                            this_1 = this;
                             i = 0;
                             _a.label = 1;
                         case 1:
-                            if (!(i < articleTreeData.articleTree.compositeGoods.length - 1)) return [3 /*break*/, 4];
-                            good = articleTreeData.articleTree.compositeGoods[i];
-                            subArticle = articleTreeData.articleTree.subArticles[i];
-                            return [4 /*yield*/, this._ione.addWebSessionTransactionLine(subArticle.articleNumber, good.quantity)];
+                            if (!(i < compositeGoods.length)) return [3 /*break*/, 4];
+                            return [5 /*yield**/, _loop_1(i)];
                         case 2:
                             _a.sent();
                             _a.label = 3;
@@ -1116,7 +1149,7 @@
         IoneProductComponent = __decorate([
             core.Component({
                 selector: 'app-ione-product',
-                template: "\n    <app-product-page [sku]=\"sku\"\n    ></app-product-page>\n  ",
+                template: "\n    <app-product-page *ngIf=\"settingsLoaded\"\n        [sku]=\"sku\"\n    ></app-product-page>\n  ",
                 providers: [
                     ProductEventService,
                     ProductSettingsService,
@@ -1130,29 +1163,6 @@
         return IoneProductComponent;
     }());
 
-    var ProductInitializerService = /** @class */ (function () {
-        function ProductInitializerService(_settingsService) {
-            this._settingsService = _settingsService;
-        }
-        ProductInitializerService.prototype.initializeApp = function () {
-            return __awaiter(this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    return [2 /*return*/, this._settingsService.initializeSettings()];
-                });
-            });
-        };
-        ProductInitializerService.ctorParameters = function () { return [
-            { type: ProductSettingsService }
-        ]; };
-        ProductInitializerService.ɵprov = core.ɵɵdefineInjectable({ factory: function ProductInitializerService_Factory() { return new ProductInitializerService(core.ɵɵinject(ProductSettingsService)); }, token: ProductInitializerService, providedIn: "root" });
-        ProductInitializerService = __decorate([
-            core.Injectable({
-                providedIn: 'root',
-            })
-        ], ProductInitializerService);
-        return ProductInitializerService;
-    }());
-
     var ProductExternalSourceComponent = /** @class */ (function () {
         function ProductExternalSourceComponent(_sanitizer, _productConnectorService, _appEventService) {
             this._sanitizer = _sanitizer;
@@ -2740,10 +2750,6 @@
         return ProductExternalSourceModule;
     }());
 
-    function initializeApp(context) {
-        var x = function () { return context.initializeApp(); };
-        return x;
-    }
     var IoneProductModule = /** @class */ (function () {
         function IoneProductModule() {
         }
@@ -2761,14 +2767,7 @@
                 entryComponents: [
                     IoneProductComponent
                 ],
-                providers: [
-                    {
-                        provide: core.APP_INITIALIZER,
-                        useFactory: initializeApp,
-                        deps: [ProductInitializerService],
-                        multi: true
-                    }
-                ],
+                providers: [],
                 exports: [IoneProductComponent],
                 bootstrap: [
                     IoneProductComponent
@@ -2782,12 +2781,10 @@
     exports.ProductExternalSourceComponent = ProductExternalSourceComponent;
     exports.ProductExternalSourceModule = ProductExternalSourceModule;
     exports.Version = Version;
-    exports.initializeApp = initializeApp;
     exports.ɵa = ProductPageModule;
     exports.ɵb = PipeModule;
     exports.ɵba = ProductSymbolsComponent;
     exports.ɵbb = IoneProductComponent;
-    exports.ɵbc = ProductInitializerService;
     exports.ɵc = LocalizePipe;
     exports.ɵd = DictionaryService;
     exports.ɵe = JsonUtilsService;