@ikas/storefront 4.0.0-alpha.49 → 4.0.0-alpha.5

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

@@ -13,17 +13,16 @@ import {
 } from "@ikas/storefront-models";
 import { IkasProductOptionSet } from "./option-set";
 import { makeAutoObservable } from "mobx";
-import { IkasProductFunctions } from "@ikas/storefront-model-functions";
+import {
+  IkasProductFunctions,
+  IkasProductOptionSetFunctions,
+} from "@ikas/storefront-model-functions";
 import { IkasVariantValue } from "../variant-type/variant-value";
 import { IkasProductCampaign } from "./campaign";
 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";
-import { IkasProductBaseUnit } from "./base-unit";
-import { formatCurrency } from "../../../utils";
 
 export class IkasProduct implements IProduct {
   id: string;
@@ -39,7 +38,6 @@ export class IkasProduct implements IProduct {
   attributes: IkasProductAttributeValue[];
   variantTypes: IkasProductVariantType[];
   productOptionSetId: string | null = null;
-  baseUnit: IkasProductBaseUnit | null;
 
   // Extra
   productOptionSet?: IkasProductOptionSet | null = null;
@@ -71,9 +69,6 @@ export class IkasProduct implements IProduct {
       ? data.variantTypes.map((v) => new IkasProductVariantType(v))
       : [];
     this.productOptionSetId = data.productOptionSetId || null;
-    this.baseUnit = data.baseUnit
-      ? new IkasProductBaseUnit(data.baseUnit)
-      : null;
 
     this.productOptionSet = data.productOptionSet
       ? new IkasProductOptionSet(data.productOptionSet)
@@ -99,7 +94,9 @@ export class IkasProduct implements IProduct {
 
   get hasValidProductOptionValues() {
     if (this.productOptionSet) {
-      return this.productOptionSet.hasValidValues;
+      return IkasProductOptionSetFunctions.hasValidValues(
+        this.productOptionSet
+      );
     } else {
       return true;
     }
@@ -164,28 +161,6 @@ 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[];
-  }
-
-  get selectedVariantUnitPriceText() {
-    return this.getVariantUnitPriceText(this.selectedVariant);
-  }
-
   selectVariantValue(variantValue: IkasVariantValue) {
     const metaData = this.metaData;
     const selectedVariantValues = this.selectedVariantValues.map((vv) => {
@@ -283,19 +258,6 @@ export class IkasProduct implements IProduct {
     Analytics.productView(this);
   }
 
-  getVariantUnitPriceText(variant: IkasProductVariant) {
-    const price = variant.price;
-    if (!price.unitPrice || !this.baseUnit) {
-      return;
-    }
-
-    return `${formatCurrency(
-      price.unitPrice,
-      price.currency || "",
-      price.currencySymbol || ""
-    )} / ${this.baseUnit?.unit?.name}`;
-  }
-
   private setOptionPrices() {
     const variant = this.variants[0];
     if (!variant) return;

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

@@ -79,18 +79,13 @@ export class IkasProductOptionSet implements IProductOptionSet {
       ? data.translations?.map((o) => new IkasProductOptionSetTranslations(o))
       : null;
 
-    this.initOptionValues();
     makeAutoObservable(this);
   }
 
   get displayedOptions() {
-    return IkasProductOptionSetFunctions.getDisplayedOptions(
-      this
-    ) as IkasProductOption[];
-  }
-
-  get hasValidValues() {
-    return this.displayedOptions.every((o) => o.hasValidValues);
+    return IkasProductOptionSetFunctions.getDisplayedOptions(this).map(
+      (o) => new IkasProductOption(o)
+    );
   }
 
   initOptionValues = async () => {

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 { getProductOptionFileUrl, uploadFile } from "@ikas/storefront-api";
+import { uploadProductOptionFile } from "@ikas/storefront-api";
 
 export class IkasProductOptionOtherPrice implements IProductOptionOtherPrice {
   currencyCode: string;
@@ -181,17 +181,16 @@ export class IkasProductOption implements IProductOption {
     this.requiredOptionValueIds = data.requiredOptionValueIds || null;
 
     this.values = data.values || [];
-    this.childOptions = data.childOptions
-      ? data.childOptions.map((co) => new IkasProductOption(co))
-      : [];
+    //@ts-ignore
+    this.childOptions = data.childOptions || [];
 
     makeAutoObservable(this);
   }
 
   get displayedChildOptions() {
-    return IkasProductOptionFunctions.getDisplayedChildOptions(
-      this
-    ) as IkasProductOption[];
+    return IkasProductOptionFunctions.getDisplayedChildOptions(this).map(
+      (o) => new IkasProductOption(o)
+    );
   }
 
   productOptionFileUpload = async (files: File[]) => {
@@ -203,37 +202,15 @@ export class IkasProductOption implements IProductOption {
     )
       return [];
 
-    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;
+    let fileIds = await Promise.all(
+      files.map((file) => uploadProductOptionFile(file, this))
+    );
+    fileIds = fileIds.filter((id) => id !== null);
+    return fileIds;
   };
 
-  get hasValidValues(): boolean {
-    return (
-      IkasProductOptionFunctions.hasValidValues(this) &&
-      this.displayedChildOptions.every((o) => o.hasValidValues)
-    );
+  get hasValidValues() {
+    return IkasProductOptionFunctions.hasValidValues(this);
   }
 
   get values() {

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

@@ -1,9 +1,6 @@
 import { IkasProductPrice } from "./price";
 import { IkasVariantValue } from "../../variant-type/variant-value";
-import {
-  IkasProductAttributeMap,
-  IkasProductAttributeValue,
-} from "../attribute-value";
+import { IkasProductAttributeValue } from "../attribute-value";
 import { IkasProductCampaign } from "../campaign";
 import { IkasProductImage } from "../image";
 import { IkasProductVariant as IProductVariant } from "@ikas/storefront-models";
@@ -14,8 +11,6 @@ import {
   listProductBackInStockRemind,
   saveProductBackInStockRemind,
 } from "@ikas/storefront-api";
-import _groupBy from "lodash/groupBy";
-import { IkasProductVariantUnit } from "./unit";
 
 export class IkasProductVariant implements IProductVariant {
   id: string;
@@ -30,7 +25,6 @@ export class IkasProductVariant implements IProductVariant {
   sellIfOutOfStock: boolean;
   images: IkasProductImage[] | null;
   campaigns?: IkasProductCampaign[];
-  unit: IkasProductVariantUnit | null;
   private _backInStockReminderSaved = false;
 
   constructor(data: Partial<IProductVariant> = {}) {
@@ -53,7 +47,6 @@ export class IkasProductVariant implements IProductVariant {
     this.stock = data.stock || 0;
     this.isActive = data.isActive !== undefined ? data.isActive : true;
     this.campaigns = data.campaigns || [];
-    this.unit = data.unit ? new IkasProductVariantUnit(data.unit) : null;
     this.sellIfOutOfStock = data.sellIfOutOfStock || false;
 
     makeAutoObservable(this);
@@ -80,24 +73,6 @@ 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 },

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

@@ -1,63 +1,47 @@
 import { IkasProductPriceFunctions } from "@ikas/storefront-model-functions";
 import { IkasProductPrice as IProductPrice } from "@ikas/storefront-models";
 import { makeAutoObservable } from "mobx";
-import { formatCurrency } from "../../../../../utils/currency";
+import { getCurrencySymbol, formatMoney } from "../../../../../utils/currency";
 
 export class IkasProductPrice implements IProductPrice {
   buyPrice: number | null = null;
   currency: string | null = null;
-  currencySymbol: string | null = null;
   discountPrice: number | null = null;
   priceListId: string | null = null;
   sellPrice: number;
-  unitPrice: number | null = null;
 
   constructor(data?: IProductPrice) {
     this.buyPrice = data?.buyPrice ?? null;
     this.currency = data?.currency ?? null;
-    this.currencySymbol = data?.currencySymbol ?? "";
     this.discountPrice = data?.discountPrice ?? null;
     this.priceListId = data?.priceListId ?? null;
     this.sellPrice = data?.sellPrice ?? 0;
-    this.unitPrice = data?.unitPrice ?? null;
 
     makeAutoObservable(this);
   }
 
+  get currencySymbol() {
+    return getCurrencySymbol(this.currency || "");
+  }
+
   get finalPrice() {
     return IkasProductPriceFunctions.getFinalPrice(this);
   }
 
   get formattedFinalPrice() {
-    return formatCurrency(
-      this.finalPrice,
-      this.currency || "",
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.finalPrice, this.currencySymbol);
   }
 
   get formattedBuyPrice() {
-    return formatCurrency(
-      this.buyPrice || 0,
-      this.currency || "",
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.buyPrice || 0, this.currencySymbol);
   }
 
   get formattedDiscountPrice() {
-    return formatCurrency(
-      this.discountPrice || 0,
-      this.currency || "",
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.discountPrice || 0, this.currencySymbol);
   }
 
   get formattedSellPrice() {
-    return formatCurrency(
-      this.sellPrice || 0,
-      this.currency || "",
-      this.currencySymbol || ""
-    );
+    return formatMoney(this.sellPrice || 0, this.currencySymbol);
   }
 
   get hasDiscount() {

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

@@ -3,12 +3,10 @@ import { IkasProductVariantType as IProductVariantType } from "@ikas/storefront-
 import { makeAutoObservable } from "mobx";
 
 export class IkasProductVariantType implements IProductVariantType {
-  order: number;
   variantType: IkasVariantType;
   variantValueIds: string[];
 
   constructor(data: Partial<IkasProductVariantType>) {
-    this.order = data.order || 0;
     this.variantType = data.variantType
       ? new IkasVariantType(data.variantType)
       : new IkasVariantType();

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

@@ -8,7 +8,6 @@ import {
   IkasRaffleAppliedProduct as IRaffleAppliedProduct,
   IkasRaffleVerificationType,
   IkasRaffleMetadataTargetType,
-  IkasRaffleParticipantStatus,
 } from "@ikas/storefront-models";
 import { IkasRaffleFunctions } from "@ikas/storefront-model-functions";
 
@@ -34,12 +33,13 @@ export class IkasRaffle implements IRaffle {
   dateRange: IkasRaffleDateRangeField | null;
   metadata: IkasRaffleMetaData | null;
   name: string;
+  participantCount?: number | null;
   requiredCustomerAccount: boolean;
   status: boolean;
   variants: IkasRaffleAppliedProduct[] | null;
-  verificationType: IkasRaffleVerificationType;
-
   products: IkasProduct[];
+  verificationType: IkasRaffleVerificationType;
+  isCustomerWinner: boolean | null;
 
   constructor(data: Partial<IkasRaffle> = {}) {
     this.id = data.id || Date.now() + "";
@@ -47,10 +47,12 @@ export class IkasRaffle implements IRaffle {
     this.updatedAt = data.updatedAt || Date.now();
     this.deleted = data.deleted || null;
     this.name = data.name || "";
+    this.participantCount = data.participantCount || 0;
     this.requiredCustomerAccount = data.requiredCustomerAccount || false;
     this.status = data.status || false;
     this.verificationType =
       data.verificationType || IkasRaffleVerificationType.EMAIL;
+    this.isCustomerWinner = data.isCustomerWinner || null;
 
     this.dateRange = data.dateRange
       ? new IkasRaffleDateRangeField(data.dateRange)
@@ -111,10 +113,8 @@ export class IkasRaffleParticipant implements IRaffleParticipant {
   email: string;
   applicationDate: number;
   phone: string | null = null;
-  isDeliveredCargo: boolean | null;
+  isWinner: boolean | null = null;
 
-  raffle: IkasRaffle | null;
-  status: IkasRaffleParticipantStatus | null;
   extraData: Record<string, any> | null = null;
   appliedProduct: IkasRaffleAppliedProduct;
 
@@ -131,10 +131,8 @@ export class IkasRaffleParticipant implements IRaffleParticipant {
     this.email = data.email || "";
     this.applicationDate = data.applicationDate || 0;
     this.phone = data.phone || null;
-    this.isDeliveredCargo = data.isDeliveredCargo || false;
+    this.isWinner = data.isWinner || null;
 
-    this.raffle = data.raffle ? new IkasRaffle(data.raffle) : null;
-    this.status = data.status || null;
     this.extraData = data.extraData || {};
     this.appliedProduct = new IkasRaffleAppliedProduct(
       data.appliedProduct || {}

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

@@ -1,6 +1,6 @@
 import { IkasBaseModel } from "../base";
 import { IkasState as IState } from "@ikas/storefront-models";
-import { makeObservable, observable } from "mobx";
+import { makeAutoObservable } from "mobx";
 
 export class IkasState extends IkasBaseModel implements IState {
   countryId: string;
@@ -13,10 +13,6 @@ export class IkasState extends IkasBaseModel implements IState {
     this.name = data.name;
     this.stateCode = data.stateCode;
 
-    makeObservable(this, {
-      countryId: observable,
-      name: observable,
-      stateCode: observable,
-    });
+    makeAutoObservable(this);
   }
 }

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

@@ -20,7 +20,6 @@ export class IkasStorefront implements IStorefront {
   analytics4Id: string | null;
   universalAnalyticsId: string | null;
   tiktokPixelId: string | null;
-  token: string | null;
 
   localizations: IkasStorefrontLocalization[];
   routings: IkasStorefrontRouting[];
@@ -41,7 +40,6 @@ export class IkasStorefront implements IStorefront {
     this.analytics4Id = data.analytics4Id || null;
     this.universalAnalyticsId = data.universalAnalyticsId || null;
     this.tiktokPixelId = data.tiktokPixelId || null;
-    this.token = data.token || null;
 
     // Sub Models
     this.localizations = data.localizations

package/src/models/data/storefront/routing/index.tsx

@@ -10,8 +10,6 @@ export class IkasStorefrontRouting implements IStorefrontRouting {
   path: string | null;
   priceListId: string | null;
   dynamicCurrencySettings: IkasStorefrontDynamicCurrencySettings | null;
-  currencyCode: string | null;
-  currencySymbol: string | null;
 
   constructor(data: IStorefrontRouting) {
     this.id = data.id;
@@ -21,8 +19,6 @@ export class IkasStorefrontRouting implements IStorefrontRouting {
     this.path = data.path;
     this.priceListId = data.priceListId;
     this.dynamicCurrencySettings = data.dynamicCurrencySettings;
-    this.currencyCode = data.currencyCode;
-    this.currencySymbol = data.currencySymbol;
 
     makeAutoObservable(this);
   }

package/src/models/ui/product-list/index.ts

@@ -56,45 +56,31 @@ export class IkasProductList {
   private _fetchRequestTime = 0;
   private router?: NextRouter | null = null;
 
-  constructor(
-    data: IkasProductListParams | IkasProductList,
-    router?: NextRouter
-  ) {
-    const _params = data as IkasProductListParams;
-    const _list = data as IkasProductList;
-
+  constructor(data: IkasProductListParams, router?: NextRouter) {
     this.data = data.data ? data.data.map((d) => new IkasProduct(d)) : [];
     this._type =
-      _params.type ||
-      _list._type ||
-      _params.productListPropValue.productListType ||
-      _list._productListPropValue.productListType ||
+      data.type ||
+      data.productListPropValue.productListType ||
       IkasProductListType.ALL;
     this._pageType = data.pageType;
     this._sort =
       data.sort ||
       data.productListPropValue.initialSort ||
       IkasProductListSortType.LAST_ADDED;
-    this._limit =
-      data.limit ||
-      _params.productListPropValue.initialLimit ||
-      _list._productListPropValue.initialLimit ||
-      20;
+
+    this._limit = data.limit || data.productListPropValue.initialLimit || 20;
     this._page = data.page || 1;
     this._minPage = data.minPage || null;
     this._count = data.count || 0;
     this._searchKeyword = data.searchKeyword || "";
-    this._productListPropValue =
-      _params.productListPropValue || _list._productListPropValue;
+    this._productListPropValue = data.productListPropValue;
 
-    this._filterBrandId = _params.filterBrandId || _list._filterBrandId || null;
-    this._filterCategoryId =
-      _params.filterCategoryId || _list._filterCategoryId || null;
+    this._filterBrandId = data.filterBrandId || null;
+    this._filterCategoryId = data.filterCategoryId || null;
 
-    this._relatedProductData =
-      _params.relatedProductData || _list._relatedProductData || null;
+    this._relatedProductData = data.relatedProductData || null;
 
-    this._recommendFor = _params.recommendFor || _list._recommendFor;
+    this._recommendFor = data.recommendFor;
 
     this.filters = data.filters
       ? data.filters.map((f) => new IkasProductFilter(f, this))
@@ -102,8 +88,7 @@ export class IkasProductList {
     this._filterCategories = data.filterCategories
       ? data.filterCategories.map((c) => new IkasFilterCategory(c))
       : null;
-    this.pageSpecificData =
-      _params.pageSpecificData || _list.pageSpecificData || null;
+    this.pageSpecificData = data.pageSpecificData || null;
 
     this.router = router;
 
@@ -236,6 +221,12 @@ export class IkasProductList {
 
   get filterQueryParams() {
     const queryParams: Record<string, any> = {};
+    const _getQueryParams = this.getQueryParams();
+    if (_getQueryParams) {
+      _getQueryParams.forEach((value, key) => {
+        queryParams[key] = value;
+      });
+    }
 
     this.filters?.forEach((f) => {
       if (f.keyList.length) queryParams[f.key] = f.keyList;

package/src/models/ui/raffle-list/index.ts

@@ -75,7 +75,7 @@ export class IkasRaffleList {
   }
 
   private async getRaffleList(page: number, limit: number) {
-    const response = await RaffleStore.listStorefrontRaffle({
+    const response = await RaffleStore.listRaffle({
       start: this._start ? { eq: this._start } : undefined,
       end: this._end ? { eq: this._end } : undefined,
       includeDeleted: this._includeDeleted || false,

package/src/models/ui/validator/form/raffle-form.ts

@@ -1,6 +1,5 @@
 import { saveRaffleParticipant } from "@ikas/storefront-api";
 import { action, computed, makeObservable, observable } from "mobx";
-import { GraphQLError } from "graphql";
 
 import { Validator } from "..";
 import { IkasBaseStore } from "../../../../store";
@@ -238,11 +237,7 @@ export class RaffleForm {
   }
 
   async submit() {
-    const response: {
-      isFormError: boolean;
-      isSuccess: boolean;
-      errors?: readonly GraphQLError[];
-    } = { isFormError: false, isSuccess: false };
+    const response = { isFormError: false, isSuccess: false };
     const hasFormError = await this.validateAll();
     if (hasFormError) {
       response.isFormError = true;
@@ -251,7 +246,7 @@ export class RaffleForm {
 
     try {
       const selectedVariant = this.raffle.products[0].selectedVariant;
-      const saveRaffleParticipantResponse = await saveRaffleParticipant({
+      const isRaffleFormSuccess = await saveRaffleParticipant({
         input: {
           appliedProduct: {
             productId: selectedVariant.productId,
@@ -269,20 +264,12 @@ export class RaffleForm {
         },
       });
 
-      if (saveRaffleParticipantResponse?.graphQLErrors) {
-        response.errors = saveRaffleParticipantResponse.graphQLErrors;
-        response.isSuccess = false;
-      }
-
-      if (saveRaffleParticipantResponse.data) {
+      if (isRaffleFormSuccess) {
         response.isSuccess = true;
       }
 
       return response;
     } catch (error) {
-      if (error) {
-        response.errors = error;
-      }
       return response;
     }
   }

package/src/models/ui/validator/rules/index.ts

@@ -183,16 +183,6 @@ export class EmailRule<T> extends ValidationRule<T> {
   }
 }
 
-/**
- * 1) start with plus(+) or digit
- * 2) any digit or one char white space
- * 3) end with digit
- *
- * For example:
- * ✅ Valid +90535 555 5555
- * ✅ valid 905355555555
- * 🚫 Unvalid +90535 5  55 5555
- */
 export class PhoneRule<T> extends ValidationRule<T> {
   get errorMessage() {
     if (!this.message) return "";
@@ -203,8 +193,10 @@ export class PhoneRule<T> extends ValidationRule<T> {
   async run(): Promise<boolean> {
     if (!this.value) return true;
 
-    const result = this.value.match(/^[\+\d](\d+\s)*\d+$/g);
-    return !!result;
+    const result = this.value.match(/\d/g);
+    return (
+      (!!result && result.length <= 11) || !!/^\+(\d{12})$/gm.test(this.value)
+    );
   }
 }
 
@@ -254,8 +246,15 @@ export class IdentityNumberRule<T> extends ValidationRule<T> {
       TCSum = 0;
 
     const incorrect = [
-      11111111110, 22222222220, 33333333330, 44444444440, 55555555550,
-      66666666660, 7777777770, 88888888880, 99999999990,
+      11111111110,
+      22222222220,
+      33333333330,
+      44444444440,
+      55555555550,
+      66666666660,
+      7777777770,
+      88888888880,
+      99999999990,
     ];
 
     if (tcknString.length !== 11) return false;