npm - @ikas/storefront - Versions diffs - 1.0.6-alpha.3 → 1.0.7 - Mend

@ikas/storefront 1.0.6-alpha.3 → 1.0.7

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.

Files changed (3) hide show

package/build/index.es.js CHANGED Viewed

@@ -36792,26 +36792,30 @@ var IkasProductDetail = /** @class */ (function () {
     Object.defineProperty(IkasProductDetail.prototype, "displayedVariantTypes", {
         get: function () {
             var _this = this;
-            var displayedVariantTypes = this.product.variantTypes.map(function (productVariantType) {
+            var displayedVariantTypes = this.product.variantTypes.map(function (productVariantType, index) {
                 var variantType = productVariantType.variantType;
                 var displayedVariantValues = [];
+                var parentProductVariantTypes = index > 0 ? _this.product.variantTypes.slice(0, index) : null;
+                var parentSelectedVariantValues = [];
+                if (parentProductVariantTypes) {
+                    parentSelectedVariantValues = _this.selectedVariantValues.filter(function (vv) {
+                        return parentProductVariantTypes.some(function (pvt) { return pvt.variantType.id === vv.variantTypeId; });
+                    });
+                }
                 variantType.values.forEach(function (variantValue) {
-                    var otherSelectedVariantValues = _this.selectedVariantValues.filter(function (vv) { return vv.variantTypeId !== variantType.id; });
-                    var allVariantValues = otherSelectedVariantValues.concat(variantValue);
-                    var variant = _this.product.variants.find(function (v) {
-                        return v.variantValues.every(function (vv) {
-                            return allVariantValues.some(function (avv) { return avv.id === vv.id; });
-                        });
+                    var variantValues = __spreadArrays(parentSelectedVariantValues, [variantValue]);
+                    var variant = _this.product.variants.find(function (variant) {
+                        return variant.isActive &&
+                            variantValues.every(function (vv) {
+                                return variant.variantValues.some(function (vvv) { return vvv.id === vv.id; });
+                            });
                     });
                     var isSelected = _this.selectedVariant.variantValues.some(function (vv) { return vv.id === variantValue.id; });
-                    var hasStock = variant
-                        ? variant.stock > 0 && variant.isActive
-                        : true;
                     if (variant) {
                         displayedVariantValues.push({
                             variant: variant,
                             variantValue: variantValue,
-                            hasStock: hasStock,
+                            hasStock: variant.hasStock,
                             isSelected: isSelected,
                         });
                     }
@@ -36875,15 +36879,59 @@ var IkasProductDetail = /** @class */ (function () {
                 return variantValue;
             return vv;
         });
-        this.selectedVariantValues = selectedVariantValues;
+        var selectedVariant = this.product.variants.find(function (variant) {
+            return variant.isActive &&
+                selectedVariantValues.every(function (selectedVariantValue) {
+                    return variant.variantValues.some(function (vvv) { return vvv.id === selectedVariantValue.id; });
+                });
+        });
+        if (selectedVariant) {
+            this.selectedVariantValues = selectedVariantValues;
+        }
+        else {
+            var variantTypeIndex = this.product.variantTypes.findIndex(function (pvt) { return pvt.variantType.id === variantValue.variantTypeId; });
+            if (variantTypeIndex > 0) {
+                var parentVariantTypes_1 = this.product.variantTypes.slice(0, variantTypeIndex);
+                var selectedParentVariantValues = this.selectedVariantValues.filter(function (vv) {
+                    return parentVariantTypes_1.some(function (pvt) { return pvt.variantType.id === vv.variantTypeId; });
+                });
+                var allVariantValues_1 = __spreadArrays(selectedParentVariantValues, [variantValue]);
+                selectedVariant = this.product.variants.find(function (variant) {
+                    return variant.isActive &&
+                        allVariantValues_1.every(function (avv) {
+                            return variant.variantValues.some(function (vv) { return vv.id === avv.id; });
+                        });
+                });
+            }
+            else {
+                // Try to find a variant by only changing the last variant value
+                // This helps with UX
+                var notLastVariantValues_1 = selectedVariantValues.slice(0, selectedVariantValues.length - 1);
+                selectedVariant = this.product.variants.find(function (variant) {
+                    return variant.isActive &&
+                        notLastVariantValues_1.every(function (nlvv) {
+                            return variant.variantValues.some(function (vv) { return vv.id === nlvv.id; });
+                        });
+                });
+                if (!selectedVariant)
+                    selectedVariant = this.product.variants.find(function (variant) {
+                        return variant.isActive &&
+                            variant.variantValues.some(function (vv) { return vv.id === variantValue.id; });
+                    });
+            }
+            if (selectedVariant)
+                this.selectedVariantValues = selectedVariant.variantValues;
+            else
+                return; // This case should not happen
+        }
         var variantParams = this.product.variantTypes
             .map(function (pvt) {
             var vt = pvt.variantType;
-            var selectedVariant = vt.values.find(function (vv) {
+            var selectedVariantValue = vt.values.find(function (vv) {
                 return _this.selectedVariantValues.some(function (svv) { return svv.id === vv.id; });
             });
-            if (selectedVariant)
-                return vt.slug + "=" + selectedVariant.slug;
+            if (selectedVariantValue)
+                return vt.slug + "=" + selectedVariantValue.slug;
         })
             .filter(function (param) { return !!param; })
             .join("&");
@@ -38182,7 +38230,9 @@ var IkasProductList = /** @class */ (function () {
                         }
                         else {
                             data = response_1.data.map(function (product) {
-                                return new IkasProductDetail(product, product.variants[0].variantValues);
+                                var selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                                var productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
+                                return productDetail;
                             });
                         }
                         this.applyFacets(response_1.facets);
@@ -38230,7 +38280,9 @@ var IkasProductList = /** @class */ (function () {
                         if (!response)
                             return [2 /*return*/];
                         data = response.data.map(function (product) {
-                            return new IkasProductDetail(product, product.variants[0].variantValues);
+                            var selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                            var productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
+                            return productDetail;
                         });
                         this.data = data.concat(this.data);
                         this._count = response.count;
@@ -38269,7 +38321,9 @@ var IkasProductList = /** @class */ (function () {
                         if (!response)
                             return [2 /*return*/];
                         data = response.data.map(function (product) {
-                            return new IkasProductDetail(product, product.variants[0].variantValues);
+                            var selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                            var productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
+                            return productDetail;
                         });
                         this.data = this.data.concat(data);
                         this._count = response.count;
@@ -38307,7 +38361,9 @@ var IkasProductList = /** @class */ (function () {
                         if (!response)
                             return [2 /*return*/];
                         data = response.data.map(function (product) {
-                            return new IkasProductDetail(product, product.variants[0].variantValues);
+                            var selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                            var productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
+                            return productDetail;
                         });
                         this.data = data;
                         this._count = response.count;
@@ -43821,7 +43877,7 @@ var IkasProductDetailPropValueProvider = /** @class */ (function () {
     IkasProductDetailPropValueProvider.prototype.getValue = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var productSearchResponse, productList, product, optionSetResponse, variant;
+            var productSearchResponse, productList, product, optionSetResponse, variant, selectedVariant;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -43866,9 +43922,10 @@ var IkasProductDetailPropValueProvider = /** @class */ (function () {
                                 return [2 /*return*/, null];
                         }
                         else {
+                            selectedVariant = product.variants.find(function (v) { return v.isActive; });
                             return [2 /*return*/, {
                                     productDetailPropValue: this.productDetailPropValue,
-                                    productDetail: new IkasProductDetail(product, product.variants[0].variantValues),
+                                    productDetail: new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues),
                                 }];
                         }
                     case 4: return [2 /*return*/, {
@@ -44328,7 +44385,7 @@ var IkasAttributePropValueProvider = /** @class */ (function () {
     IkasAttributePropValueProvider.prototype.getValue = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var productDetail, productSearchResponse, productList, product, variant;
+            var productDetail, productSearchResponse, productList, product, variant, selectedVariant;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -44359,7 +44416,8 @@ var IkasAttributePropValueProvider = /** @class */ (function () {
                                     }
                                 }
                                 else {
-                                    productDetail = new IkasProductDetail(product, product.variants[0].variantValues);
+                                    selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                                    productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
                                 }
                             }
                         }
@@ -44381,7 +44439,7 @@ var IkasAttributeListPropValueProvider = /** @class */ (function () {
     IkasAttributeListPropValueProvider.prototype.getValue = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var productDetail, productSearchResponse, productList, product, variant;
+            var productDetail, productSearchResponse, productList, product, variant, selectedVariant;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -44413,7 +44471,8 @@ var IkasAttributeListPropValueProvider = /** @class */ (function () {
                                     }
                                 }
                                 else {
-                                    productDetail = new IkasProductDetail(product, product.variants[0].variantValues);
+                                    selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                                    productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
                                 }
                             }
                         }
@@ -45294,7 +45353,7 @@ var IkasPageDataProvider = /** @class */ (function () {
                         if (!metaData.targetId)
                             return [2 /*return*/];
                         handleProductPage = function () { return __awaiter(_this, void 0, void 0, function () {
-                            var productsResponse, product, optionSetResponse, displayedVariantType, inStockVariant;
+                            var productsResponse, product, optionSetResponse, selectedVariant, displayedVariantType, inStockVariant;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0: return [4 /*yield*/, IkasProductSearchAPI.searchProducts({
@@ -45317,7 +45376,10 @@ var IkasPageDataProvider = /** @class */ (function () {
                                         }
                                         _a.label = 3;
                                     case 3:
-                                        this.pageSpecificData = new IkasProductDetail(product, product.variants[0].variantValues);
+                                        selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                                        if (!selectedVariant)
+                                            return [2 /*return*/];
+                                        this.pageSpecificData = new IkasProductDetail(product, selectedVariant.variantValues);
                                         // Select the first displayed in stock variant
                                         if (this.pageSpecificData.displayedVariantTypes.length) {
                                             displayedVariantType = this

package/build/index.js CHANGED Viewed

@@ -36772,26 +36772,30 @@ var IkasProductDetail = /** @class */ (function () {
     Object.defineProperty(IkasProductDetail.prototype, "displayedVariantTypes", {
         get: function () {
             var _this = this;
-            var displayedVariantTypes = this.product.variantTypes.map(function (productVariantType) {
+            var displayedVariantTypes = this.product.variantTypes.map(function (productVariantType, index) {
                 var variantType = productVariantType.variantType;
                 var displayedVariantValues = [];
+                var parentProductVariantTypes = index > 0 ? _this.product.variantTypes.slice(0, index) : null;
+                var parentSelectedVariantValues = [];
+                if (parentProductVariantTypes) {
+                    parentSelectedVariantValues = _this.selectedVariantValues.filter(function (vv) {
+                        return parentProductVariantTypes.some(function (pvt) { return pvt.variantType.id === vv.variantTypeId; });
+                    });
+                }
                 variantType.values.forEach(function (variantValue) {
-                    var otherSelectedVariantValues = _this.selectedVariantValues.filter(function (vv) { return vv.variantTypeId !== variantType.id; });
-                    var allVariantValues = otherSelectedVariantValues.concat(variantValue);
-                    var variant = _this.product.variants.find(function (v) {
-                        return v.variantValues.every(function (vv) {
-                            return allVariantValues.some(function (avv) { return avv.id === vv.id; });
-                        });
+                    var variantValues = __spreadArrays(parentSelectedVariantValues, [variantValue]);
+                    var variant = _this.product.variants.find(function (variant) {
+                        return variant.isActive &&
+                            variantValues.every(function (vv) {
+                                return variant.variantValues.some(function (vvv) { return vvv.id === vv.id; });
+                            });
                     });
                     var isSelected = _this.selectedVariant.variantValues.some(function (vv) { return vv.id === variantValue.id; });
-                    var hasStock = variant
-                        ? variant.stock > 0 && variant.isActive
-                        : true;
                     if (variant) {
                         displayedVariantValues.push({
                             variant: variant,
                             variantValue: variantValue,
-                            hasStock: hasStock,
+                            hasStock: variant.hasStock,
                             isSelected: isSelected,
                         });
                     }
@@ -36855,15 +36859,59 @@ var IkasProductDetail = /** @class */ (function () {
                 return variantValue;
             return vv;
         });
-        this.selectedVariantValues = selectedVariantValues;
+        var selectedVariant = this.product.variants.find(function (variant) {
+            return variant.isActive &&
+                selectedVariantValues.every(function (selectedVariantValue) {
+                    return variant.variantValues.some(function (vvv) { return vvv.id === selectedVariantValue.id; });
+                });
+        });
+        if (selectedVariant) {
+            this.selectedVariantValues = selectedVariantValues;
+        }
+        else {
+            var variantTypeIndex = this.product.variantTypes.findIndex(function (pvt) { return pvt.variantType.id === variantValue.variantTypeId; });
+            if (variantTypeIndex > 0) {
+                var parentVariantTypes_1 = this.product.variantTypes.slice(0, variantTypeIndex);
+                var selectedParentVariantValues = this.selectedVariantValues.filter(function (vv) {
+                    return parentVariantTypes_1.some(function (pvt) { return pvt.variantType.id === vv.variantTypeId; });
+                });
+                var allVariantValues_1 = __spreadArrays(selectedParentVariantValues, [variantValue]);
+                selectedVariant = this.product.variants.find(function (variant) {
+                    return variant.isActive &&
+                        allVariantValues_1.every(function (avv) {
+                            return variant.variantValues.some(function (vv) { return vv.id === avv.id; });
+                        });
+                });
+            }
+            else {
+                // Try to find a variant by only changing the last variant value
+                // This helps with UX
+                var notLastVariantValues_1 = selectedVariantValues.slice(0, selectedVariantValues.length - 1);
+                selectedVariant = this.product.variants.find(function (variant) {
+                    return variant.isActive &&
+                        notLastVariantValues_1.every(function (nlvv) {
+                            return variant.variantValues.some(function (vv) { return vv.id === nlvv.id; });
+                        });
+                });
+                if (!selectedVariant)
+                    selectedVariant = this.product.variants.find(function (variant) {
+                        return variant.isActive &&
+                            variant.variantValues.some(function (vv) { return vv.id === variantValue.id; });
+                    });
+            }
+            if (selectedVariant)
+                this.selectedVariantValues = selectedVariant.variantValues;
+            else
+                return; // This case should not happen
+        }
         var variantParams = this.product.variantTypes
             .map(function (pvt) {
             var vt = pvt.variantType;
-            var selectedVariant = vt.values.find(function (vv) {
+            var selectedVariantValue = vt.values.find(function (vv) {
                 return _this.selectedVariantValues.some(function (svv) { return svv.id === vv.id; });
             });
-            if (selectedVariant)
-                return vt.slug + "=" + selectedVariant.slug;
+            if (selectedVariantValue)
+                return vt.slug + "=" + selectedVariantValue.slug;
         })
             .filter(function (param) { return !!param; })
             .join("&");
@@ -38162,7 +38210,9 @@ var IkasProductList = /** @class */ (function () {
                         }
                         else {
                             data = response_1.data.map(function (product) {
-                                return new IkasProductDetail(product, product.variants[0].variantValues);
+                                var selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                                var productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
+                                return productDetail;
                             });
                         }
                         this.applyFacets(response_1.facets);
@@ -38210,7 +38260,9 @@ var IkasProductList = /** @class */ (function () {
                         if (!response)
                             return [2 /*return*/];
                         data = response.data.map(function (product) {
-                            return new IkasProductDetail(product, product.variants[0].variantValues);
+                            var selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                            var productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
+                            return productDetail;
                         });
                         this.data = data.concat(this.data);
                         this._count = response.count;
@@ -38249,7 +38301,9 @@ var IkasProductList = /** @class */ (function () {
                         if (!response)
                             return [2 /*return*/];
                         data = response.data.map(function (product) {
-                            return new IkasProductDetail(product, product.variants[0].variantValues);
+                            var selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                            var productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
+                            return productDetail;
                         });
                         this.data = this.data.concat(data);
                         this._count = response.count;
@@ -38287,7 +38341,9 @@ var IkasProductList = /** @class */ (function () {
                         if (!response)
                             return [2 /*return*/];
                         data = response.data.map(function (product) {
-                            return new IkasProductDetail(product, product.variants[0].variantValues);
+                            var selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                            var productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
+                            return productDetail;
                         });
                         this.data = data;
                         this._count = response.count;
@@ -43798,7 +43854,7 @@ var IkasProductDetailPropValueProvider = /** @class */ (function () {
     IkasProductDetailPropValueProvider.prototype.getValue = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var productSearchResponse, productList, product, optionSetResponse, variant;
+            var productSearchResponse, productList, product, optionSetResponse, variant, selectedVariant;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -43843,9 +43899,10 @@ var IkasProductDetailPropValueProvider = /** @class */ (function () {
                                 return [2 /*return*/, null];
                         }
                         else {
+                            selectedVariant = product.variants.find(function (v) { return v.isActive; });
                             return [2 /*return*/, {
                                     productDetailPropValue: this.productDetailPropValue,
-                                    productDetail: new IkasProductDetail(product, product.variants[0].variantValues),
+                                    productDetail: new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues),
                                 }];
                         }
                     case 4: return [2 /*return*/, {
@@ -44305,7 +44362,7 @@ var IkasAttributePropValueProvider = /** @class */ (function () {
     IkasAttributePropValueProvider.prototype.getValue = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var productDetail, productSearchResponse, productList, product, variant;
+            var productDetail, productSearchResponse, productList, product, variant, selectedVariant;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -44336,7 +44393,8 @@ var IkasAttributePropValueProvider = /** @class */ (function () {
                                     }
                                 }
                                 else {
-                                    productDetail = new IkasProductDetail(product, product.variants[0].variantValues);
+                                    selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                                    productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
                                 }
                             }
                         }
@@ -44358,7 +44416,7 @@ var IkasAttributeListPropValueProvider = /** @class */ (function () {
     IkasAttributeListPropValueProvider.prototype.getValue = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var productDetail, productSearchResponse, productList, product, variant;
+            var productDetail, productSearchResponse, productList, product, variant, selectedVariant;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -44390,7 +44448,8 @@ var IkasAttributeListPropValueProvider = /** @class */ (function () {
                                     }
                                 }
                                 else {
-                                    productDetail = new IkasProductDetail(product, product.variants[0].variantValues);
+                                    selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                                    productDetail = new IkasProductDetail(product, (selectedVariant || product.variants[0]).variantValues);
                                 }
                             }
                         }
@@ -45271,7 +45330,7 @@ var IkasPageDataProvider = /** @class */ (function () {
                         if (!metaData.targetId)
                             return [2 /*return*/];
                         handleProductPage = function () { return __awaiter(_this, void 0, void 0, function () {
-                            var productsResponse, product, optionSetResponse, displayedVariantType, inStockVariant;
+                            var productsResponse, product, optionSetResponse, selectedVariant, displayedVariantType, inStockVariant;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0: return [4 /*yield*/, IkasProductSearchAPI.searchProducts({
@@ -45294,7 +45353,10 @@ var IkasPageDataProvider = /** @class */ (function () {
                                         }
                                         _a.label = 3;
                                     case 3:
-                                        this.pageSpecificData = new IkasProductDetail(product, product.variants[0].variantValues);
+                                        selectedVariant = product.variants.find(function (v) { return v.isActive; });
+                                        if (!selectedVariant)
+                                            return [2 /*return*/];
+                                        this.pageSpecificData = new IkasProductDetail(product, selectedVariant.variantValues);
                                         // Select the first displayed in stock variant
                                         if (this.pageSpecificData.displayedVariantTypes.length) {
                                             displayedVariantType = this

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront",
-  "version": "1.0.6-alpha.3",
+  "version": "1.0.7",
   "main": "./build/index.js",
   "module": "./build/index.es.js",
   "author": "Umut Ozan Yıldırım",