@ikas/storefront 4.0.0-alpha.38 → 4.0.0-alpha.4

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;