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

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

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

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

@@ -183,6 +183,16 @@ 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 "";
@@ -193,10 +203,8 @@ export class PhoneRule<T> extends ValidationRule<T> {
   async run(): Promise<boolean> {
     if (!this.value) return true;
 
-    const result = this.value.match(/\d/g);
-    return (
-      (!!result && result.length <= 11) || !!/^\+(\d{12})$/gm.test(this.value)
-    );
+    const result = this.value.match(/^[\+\d](\d+\s)*\d+$/g);
+    return !!result;
   }
 }
 
@@ -246,15 +254,8 @@ 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;