@colijnit/product 256.1.0 → 256.1.2

package/app/components/image-carousel/image-carousel.component.d.ts

@@ -34,6 +34,7 @@ export declare class ImageCarouselComponent implements OnInit, OnDestroy {
     handleThumbClick(index: number): void;
     onForceRenderImage(): void;
     getImageSrc(image: CoDocument | CustomEvent): SafeUrl;
+    private _filterValidImages;
     private _loadImages;
     private _scrollCarouselToIndex;
 }

package/app/service/product-connector-adapter.service.d.ts

@@ -9,12 +9,15 @@ import { DeliveryPrognosis } from '@colijnit/articleapi/build/model/delivery-pro
 import { DocumentContent } from '@colijnit/articleapi/build/model/document-content';
 import { Transaction } from '@colijnit/transactionapi/build/transaction';
 import { ArticleListObjectExtended } from '@colijnit/articleapi/build/model/article-list-object-extended.bo';
+import { ProductEventService } from './product-event.service';
 export declare class ProductConnectorAdapterService implements OnDestroy {
+    private _eventService;
     readonly showLoader: Subject<boolean>;
     articleConnector?: Articles;
     transactionConnector: Transaction;
     private _boFactory;
-    constructor();
+    private _subs;
+    constructor(_eventService: ProductEventService);
     ngOnDestroy(): void;
     initConnector(options: Options): Promise<void>;
     setInstance(instanceId: string): void;

package/app/service/product-event.service.d.ts

@@ -3,6 +3,7 @@ import { ArticleListObject } from '@colijnit/articleapi/build/model/article-list
 import { Selection } from '@colijnit/articleapi/build/model/selection';
 import { ArticleQuickSel } from '@colijnit/articleapi/build/model/article-quick-sel';
 import { ArticleListObjectExtended } from '@colijnit/articleapi/build/model/article-list-object-extended.bo';
+import { ValidationMessage } from '@colijnit/ioneconnector/build/model/validation-message';
 export declare class ProductEventService {
     onAddToCart: Subject<{
         article: string | ArticleListObjectExtended;
@@ -19,4 +20,5 @@ export declare class ProductEventService {
     onDraftRenderImageReceived: Subject<string>;
     onArticleInfoReceived: Subject<string>;
     onUpdateProductInfoTab: Subject<number>;
+    errorMessage: Subject<ValidationMessage[]>;
 }

package/bundles/colijnit-product.umd.js

@@ -31,8 +31,8 @@
         function Version() {
             this.name = "@colijnit/product";
             this.description = "Product detail page project for iOne";
-            this.symVer = "256.1.0";
-            this.publishDate = "10/15/2024, 10:47:35 AM";
+            this.symVer = "256.1.2";
+            this.publishDate = "8-11-2024 14:14:34";
         }
         return Version;
     }());
@@ -598,15 +598,40 @@
         return ProductSettings;
     }());
 
+    var ProductEventService = /** @class */ (function () {
+        function ProductEventService() {
+            this.onAddToCart = new rxjs.Subject();
+            this.onAlternativeClick = new rxjs.Subject();
+            this.onAddToQuote = new rxjs.Subject();
+            this.onForceRenderImage = new rxjs.Subject();
+            this.onArticleReceived = new rxjs.Subject();
+            this.onSelectionsReceived = new rxjs.Subject();
+            this.onImageReceived = new rxjs.Subject();
+            this.onRenderStarted = new rxjs.Subject();
+            this.onRenderImageReceived = new rxjs.Subject();
+            this.onDraftRenderImageReceived = new rxjs.Subject();
+            this.onArticleInfoReceived = new rxjs.Subject();
+            this.onUpdateProductInfoTab = new rxjs.Subject();
+            this.errorMessage = new rxjs.Subject();
+        }
+        return ProductEventService;
+    }());
+    ProductEventService.decorators = [
+        { type: i0.Directive },
+        { type: i0.Injectable }
+    ];
+
     // Sole responsibility is simply to wrap around a colijn.Connector to create a stable inner interface to the library in a 1:1 method way.
     // Only to be used by the IOneControllerService.
     var ProductConnectorAdapterService = /** @class */ (function () {
-        function ProductConnectorAdapterService() {
+        function ProductConnectorAdapterService(_eventService) {
+            this._eventService = _eventService;
             this.showLoader = new rxjs.Subject();
             this._boFactory = new businessObjectFactory.BusinessObjectFactory();
+            this._subs = [];
         }
         ProductConnectorAdapterService.prototype.ngOnDestroy = function () {
-            this.articleConnector.showLoader.unsubscribe();
+            this._subs.forEach(function (s) { return s.unsubscribe(); });
         };
         ProductConnectorAdapterService.prototype.initConnector = function (options) {
             return __awaiter(this, void 0, void 0, function () {
@@ -619,7 +644,9 @@
                         case 1:
                             _a.sent();
                             this.transactionConnector = new transaction.Transaction(options);
-                            this.articleConnector.showLoader.subscribe(function (value) { return _this.showLoader.next(value); });
+                            this._subs.push(
+                            // @ts-ignore
+                            this.articleConnector.showLoader.subscribe(function (value) { return _this.showLoader.next(value); }));
                             return [2 /*return*/];
                     }
                 });
@@ -750,8 +777,12 @@
             if (externalSource === void 0) { externalSource = false; }
             if (showLoader === void 0) { showLoader = true; }
             return __awaiter(this, void 0, void 0, function () {
+                var _this = this;
                 return __generator(this, function (_a) {
-                    return [2 /*return*/, this.articleConnector.getJsonArticleFlatTree(goodId, goodType, quantity, externalSource, showLoader, instanceId, configuratorStatistics)];
+                    return [2 /*return*/, this.articleConnector.getJsonArticleFlatTree(goodId, goodType, quantity, externalSource, showLoader, instanceId, configuratorStatistics).catch(function (messages) {
+                            _this._eventService.errorMessage.next(messages);
+                            return null;
+                        })];
                 });
             });
         };
@@ -854,7 +885,9 @@
     ProductConnectorAdapterService.decorators = [
         { type: i0.Injectable }
     ];
-    ProductConnectorAdapterService.ctorParameters = function () { return []; };
+    ProductConnectorAdapterService.ctorParameters = function () { return [
+        { type: ProductEventService }
+    ]; };
 
     var LanguageCode;
     (function (LanguageCode) {
@@ -1256,34 +1289,6 @@
         { type: ProductSettingsService }
     ]; };
 
-    var ProductEventService = /** @class */ (function () {
-        function ProductEventService() {
-            this.onAddToCart = new rxjs.Subject();
-            this.onAlternativeClick = new rxjs.Subject();
-            this.onAddToQuote = new rxjs.Subject();
-            this.onForceRenderImage = new rxjs.Subject();
-            this.onArticleReceived = new rxjs.Subject();
-            this.onSelectionsReceived = new rxjs.Subject();
-            this.onImageReceived = new rxjs.Subject();
-            this.onRenderStarted = new rxjs.Subject();
-            this.onRenderImageReceived = new rxjs.Subject();
-            this.onDraftRenderImageReceived = new rxjs.Subject();
-            this.onArticleInfoReceived = new rxjs.Subject();
-            this.onUpdateProductInfoTab = new rxjs.Subject();
-        }
-        return ProductEventService;
-    }());
-    ProductEventService.decorators = [
-        { type: i0.Directive },
-        { type: i0.Injectable }
-    ];
-    ProductEventService.propDecorators = {
-        onAddToCart: [{ type: i0.Output }],
-        onAlternativeClick: [{ type: i0.Output }],
-        onAddToQuote: [{ type: i0.Output }],
-        onForceRenderImage: [{ type: i0.Output }]
-    };
-
     var IoneProductComponent = /** @class */ (function () {
         function IoneProductComponent(_dictionary, _jsonUtils, _ione, _changeDetector, _appEventService, _settingsService) {
             var _this = this;
@@ -1885,7 +1890,7 @@
             },
             set: function (value) {
                 if (value && value.length > 0) {
-                    this._images = value;
+                    this._images = this._filterValidImages(value);
                     this._loadImages();
                     this._changeDetector.detectChanges();
                 }
@@ -1949,6 +1954,15 @@
             }
             return this._domSanitizer.bypassSecurityTrustUrl(source);
         };
+        ImageCarouselComponent.prototype._filterValidImages = function (value) {
+            if (!value) {
+                return [];
+            }
+            return value.filter(function (doc) {
+                var pattern = /\.(jpg|jpeg|png|gif|bmp|tiff|webp)$/i;
+                return pattern.test(doc.fileName) || !!doc.filePath;
+            });
+        };
         ImageCarouselComponent.prototype._loadImages = function () {
             var _this = this;
             if (this._images) {
@@ -2291,30 +2305,40 @@
         };
         ProductAddtocartComponent.prototype.handleAddToCartClick = function (quantity) {
             return __awaiter(this, void 0, void 0, function () {
-                var _a, _b, _c, article, article;
-                return __generator(this, function (_d) {
-                    switch (_d.label) {
+                var article, article, article;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
                         case 0:
-                            if (!this.createFrozenArticle) return [3 /*break*/, 4];
+                            if (!this.createFrozenArticle) return [3 /*break*/, 7];
                             if (!(this.article.goodType === 'B')) return [3 /*break*/, 2];
-                            _b = (_a = this._appEventService.onAddToCart).next;
-                            _c = {};
                             return [4 /*yield*/, this._getJSONFromArticleObject({ article: this.article, quantity: quantity })];
                         case 1:
-                            _b.apply(_a, [(_c.article = _d.sent(),
-                                    _c.quantity = quantity,
-                                    _c)]);
-                            return [3 /*break*/, 3];
+                            article = _a.sent();
+                            if (article) {
+                                this._appEventService.onAddToCart.next({ article: article, quantity: quantity });
+                            }
+                            return [3 /*break*/, 6];
                         case 2:
-                            article = this._ioneControllerService.convertArticleFullObjectToArticleExtended(this.article);
-                            this._appEventService.onAddToCart.next({ article: article, quantity: quantity });
-                            _d.label = 3;
-                        case 3: return [3 /*break*/, 5];
+                            article = void 0;
+                            if (!!!this.externalSource) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this._getJSONFromArticleObject({ article: this.article, quantity: quantity })];
+                        case 3:
+                            article = _a.sent();
+                            return [3 /*break*/, 5];
                         case 4:
+                            article = this._ioneControllerService.convertArticleFullObjectToArticleExtended(this.article);
+                            _a.label = 5;
+                        case 5:
+                            if (article) {
+                                this._appEventService.onAddToCart.next({ article: article, quantity: quantity });
+                            }
+                            _a.label = 6;
+                        case 6: return [3 /*break*/, 8];
+                        case 7:
                             article = this._ioneControllerService.convertArticleFullObjectToArticleExtended(this.article);
                             this._appEventService.onAddToCart.next({ article: article, quantity: quantity });
-                            _d.label = 5;
-                        case 5: return [2 /*return*/];
+                            _a.label = 8;
+                        case 8: return [2 /*return*/];
                     }
                 });
             });
@@ -3214,7 +3238,10 @@
                         IoneProductComponent
                     ],
                     providers: [
-                        ProductSettingsService
+                        ProductSettingsService,
+                        ProductConnectorService,
+                        ProductEventService,
+                        ProductConnectorAdapterService
                     ]
                 },] }
     ];
@@ -3316,7 +3343,6 @@
                     selector: 'co-product-external-source',
                     template: "\n        <ng-container *ngIf=\"loaded\">\n            <ng-container *ngIf=\"showProduct\">\n                <app-product-page\n                        [sku]=\"sku\"\n                        [settings]=\"externalSettings\"\n                        [externalSource]=\"externalSource\"\n                ></app-product-page>\n            </ng-container>\n            <ng-container *ngIf=\"!showProduct\">\n                <iframe width=\"100%\" height=\"100%\" [src]=\"safeUrl\" frameborder=\"0\" allowfullscreen></iframe>\n            </ng-container>\n        </ng-container>\n    ",
                     providers: [
-                        ProductEventService,
                         ProductSettingsService,
                         ProductConnectorAdapterService,
                         ProductConnectorService