@ikas/storefront 4.0.0-alpha.37 → 4.0.0-alpha.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikas/storefront",
-  "version": "4.0.0-alpha.37",
+  "version": "4.0.0-alpha.39",
   "description": "Storefront functionality for ikas storefront themes.",
   "author": "Umut Ozan Yıldırım",
   "license": "ISC",
@@ -24,11 +24,11 @@
     "libphonenumber-js": "^1.10.6"
   },
   "devDependencies": {
-    "@ikas/storefront-api": "^4.0.0-alpha.37",
-    "@ikas/storefront-config": "^4.0.0-alpha.37",
-    "@ikas/storefront-model-functions": "^4.0.0-alpha.37",
-    "@ikas/storefront-models": "^4.0.0-alpha.37",
-    "@ikas/storefront-providers": "^4.0.0-alpha.37",
+    "@ikas/storefront-api": "^4.0.0-alpha.39",
+    "@ikas/storefront-config": "^4.0.0-alpha.39",
+    "@ikas/storefront-model-functions": "^4.0.0-alpha.39",
+    "@ikas/storefront-models": "^4.0.0-alpha.39",
+    "@ikas/storefront-providers": "^4.0.0-alpha.39",
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
@@ -52,11 +52,11 @@
     "html-react-parser": "^1.4.0"
   },
   "peerDependencies": {
-    "@ikas/storefront-api": "^4.0.0-alpha.37",
-    "@ikas/storefront-config": "^4.0.0-alpha.37",
-    "@ikas/storefront-model-functions": "^4.0.0-alpha.37",
-    "@ikas/storefront-models": "^4.0.0-alpha.37",
-    "@ikas/storefront-providers": "^4.0.0-alpha.37",
+    "@ikas/storefront-api": "^4.0.0-alpha.39",
+    "@ikas/storefront-config": "^4.0.0-alpha.39",
+    "@ikas/storefront-model-functions": "^4.0.0-alpha.39",
+    "@ikas/storefront-models": "^4.0.0-alpha.39",
+    "@ikas/storefront-providers": "^4.0.0-alpha.39",
     "mobx": "^6.1.3",
     "mobx-react-lite": "^3.1.5",
     "next": "12.2.0",

package/src/components/page/index.tsx

@@ -105,7 +105,7 @@ export const IkasPage: React.FC<IkasPageProps> = observer(
 
     React.useEffect(() => {
       handleAnalytics(pageType, IkasPageDataInit.pageSpecificData);
-    }, [pageType, IkasPageDataInit.pageSpecificData]);
+    }, [pageType, pageSpecificData]); // Not IkasPageDataInit.pageSpecificData on purpose
 
     const renderedComponents = React.useMemo(() => {
       const headerComponentPropValue = _propValues.find(

package/src/models/data/order/index.ts

@@ -166,21 +166,18 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
 
   get refundableItems() {
     if (!this.refundSettings) return [];
-    return IkasOrderFunctions.getRefundableItems(this, this.refundSettings).map(
-      (i) => new IkasOrderLineItem(i)
-    );
+    return IkasOrderFunctions.getRefundableItems(
+      this,
+      this.refundSettings
+    ) as IkasOrderLineItem[];
   }
 
   get unfullfilledItems() {
-    return IkasOrderFunctions.getUnfullfilledItems(this).map(
-      (i) => new IkasOrderLineItem(i)
-    );
+    return IkasOrderFunctions.getUnfullfilledItems(this) as IkasOrderLineItem[];
   }
 
   get refundedItems() {
-    return IkasOrderFunctions.getRefundedItems(this).map(
-      (i) => new IkasOrderLineItem(i)
-    );
+    return IkasOrderFunctions.getRefundedItems(this) as IkasOrderLineItem[];
   }
 
   get totalTax() {
@@ -240,14 +237,17 @@ export class IkasOrder extends IkasBaseModel implements IOrder {
   }
 
   get couponAdjustment() {
-    const adjustment = IkasOrderFunctions.getCouponAdjustment(this);
-    return adjustment ? new IkasOrderAdjustment(adjustment) : undefined;
+    return IkasOrderFunctions.getCouponAdjustment(this) as IkasOrderAdjustment;
   }
 
   get nonCouponAdjustments() {
-    return IkasOrderFunctions.getNonCouponAdjustments(this)?.map(
-      (a) => new IkasOrderAdjustment(a)
-    );
+    return IkasOrderFunctions.getNonCouponAdjustments(
+      this
+    ) as IkasOrderAdjustment[];
+  }
+
+  get isRefundEnabled() {
+    return !this.refundableItems.some((item) => item.refundQuantity === null);
   }
 }
 

package/src/models/data/product/index.ts

@@ -23,6 +23,8 @@ import { IkasStorefrontConfig } from "@ikas/storefront-config";
 import { Analytics } from "../../../analytics";
 import { IkasVariantType } from "../variant-type";
 import { IkasBaseStore } from "../../../store/base";
+import { IkasProductAttributeMap } from "./attribute-value";
+import _groupBy from "lodash/groupBy";
 
 export class IkasProduct implements IProduct {
   id: string;
@@ -94,9 +96,7 @@ export class IkasProduct implements IProduct {
 
   get hasValidProductOptionValues() {
     if (this.productOptionSet) {
-      return IkasProductOptionSetFunctions.hasValidValues(
-        this.productOptionSet
-      );
+      return this.productOptionSet.hasValidValues;
     } else {
       return true;
     }
@@ -161,6 +161,24 @@ export class IkasProduct implements IProduct {
     );
   }
 
+  get groupedAttributeValues(): IkasProductAttributeMap[] {
+    const groupedValues = _groupBy(this.attributes, "productAttributeId");
+
+    return (this.attributes
+      ?.map((attribute) => {
+        const attributeId = attribute.productAttributeId;
+        if (!attributeId) return;
+
+        const values = groupedValues[attributeId];
+        if (values?.length && values[0].productAttribute)
+          return {
+            attribute: values[0].productAttribute,
+            values: values,
+          };
+      })
+      .filter((v) => !!v) || []) as IkasProductAttributeMap[];
+  }
+
   selectVariantValue(variantValue: IkasVariantValue) {
     const metaData = this.metaData;
     const selectedVariantValues = this.selectedVariantValues.map((vv) => {

package/src/models/data/product/option-set/index.ts

@@ -88,6 +88,10 @@ export class IkasProductOptionSet implements IProductOptionSet {
     );
   }
 
+  get hasValidValues() {
+    return this.displayedOptions.every((o) => o.hasValidValues);
+  }
+
   initOptionValues = async () => {
     this.options.forEach((o) => o.initValues());
   };

package/src/models/data/product/option-set/option/index.ts

@@ -13,7 +13,7 @@ import { makeAutoObservable } from "mobx";
 import { IkasImage } from "../../../image";
 import _sortBy from "lodash/sortBy";
 import { IkasProductOptionFunctions } from "@ikas/storefront-model-functions";
-import { uploadProductOptionFile } from "@ikas/storefront-api";
+import { getProductOptionFileUrl, uploadFile } from "@ikas/storefront-api";
 
 export class IkasProductOptionOtherPrice implements IProductOptionOtherPrice {
   currencyCode: string;
@@ -181,8 +181,9 @@ export class IkasProductOption implements IProductOption {
     this.requiredOptionValueIds = data.requiredOptionValueIds || null;
 
     this.values = data.values || [];
-    //@ts-ignore
-    this.childOptions = data.childOptions || [];
+    this.childOptions = data.childOptions
+      ? data.childOptions.map((co) => new IkasProductOption(co))
+      : [];
 
     makeAutoObservable(this);
   }
@@ -202,15 +203,37 @@ export class IkasProductOption implements IProductOption {
     )
       return [];
 
-    let fileIds = await Promise.all(
-      files.map((file) => uploadProductOptionFile(file, this))
-    );
-    fileIds = fileIds.filter((id) => id !== null);
-    return fileIds;
+    let tempUploadFiles = (
+      await Promise.all(
+        files.map((file) =>
+          getProductOptionFileUrl(
+            {
+              fileName: file.name,
+              productOptionSetId: this.productOptionSetId,
+              productOptionId: this.id,
+            },
+            file
+          )
+        )
+      )
+    ).filter((file) => file.data);
+
+    const uploadedFiles: string[] = [];
+    for (const file of tempUploadFiles) {
+      const isSuccess = await uploadFile(file.data!, file.data!.file);
+      if (isSuccess) {
+        uploadedFiles.push(file.data!.optionUrl);
+      }
+    }
+
+    return uploadedFiles;
   };
 
-  get hasValidValues() {
-    return IkasProductOptionFunctions.hasValidValues(this);
+  get hasValidValues(): boolean {
+    return (
+      IkasProductOptionFunctions.hasValidValues(this) &&
+      this.displayedChildOptions.every((o) => o.hasValidValues)
+    );
   }
 
   get values() {

package/src/models/data/product/variant/index.ts

@@ -1,6 +1,9 @@
 import { IkasProductPrice } from "./price";
 import { IkasVariantValue } from "../../variant-type/variant-value";
-import { IkasProductAttributeValue } from "../attribute-value";
+import {
+  IkasProductAttributeMap,
+  IkasProductAttributeValue,
+} from "../attribute-value";
 import { IkasProductCampaign } from "../campaign";
 import { IkasProductImage } from "../image";
 import { IkasProductVariant as IProductVariant } from "@ikas/storefront-models";
@@ -11,6 +14,7 @@ import {
   listProductBackInStockRemind,
   saveProductBackInStockRemind,
 } from "@ikas/storefront-api";
+import _groupBy from "lodash/groupBy";
 
 export class IkasProductVariant implements IProductVariant {
   id: string;
@@ -73,6 +77,24 @@ export class IkasProductVariant implements IProductVariant {
     return this._backInStockReminderSaved;
   }
 
+  get groupedAttributeValues(): IkasProductAttributeMap[] {
+    const groupedValues = _groupBy(this.attributes, "productAttributeId");
+
+    return (this.attributes
+      ?.map((attribute) => {
+        const attributeId = attribute.productAttributeId;
+        if (!attributeId) return;
+
+        const values = groupedValues[attributeId];
+        if (values?.length && values[0].productAttribute)
+          return {
+            attribute: values[0].productAttribute,
+            values: values,
+          };
+      })
+      .filter((v) => !!v) || []) as IkasProductAttributeMap[];
+  }
+
   async saveBackInStockReminder(email: string) {
     const listResponse = await listProductBackInStockRemind({
       email: { eq: email },