@digigov/form 0.6.6 → 0.6.7

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log - @digigov/form
 
-This log was last generated on Tue, 24 May 2022 09:13:18 GMT and should not be manually modified.
+This log was last generated on Wed, 08 Jun 2022 12:26:07 GMT and should not be manually modified.
+
+## 0.6.7
+Wed, 08 Jun 2022 12:26:07 GMT
+
+### Patches
+
+- create phone_number validation rule which accepts country and type of phone
+- Add missing dependency in handleSubmit
 
 ## 0.6.6
 Tue, 24 May 2022 09:13:18 GMT

package/es/index.js

@@ -50,7 +50,7 @@ export var FormBase = /*#__PURE__*/React.forwardRef(function FormBase(_ref, ref)
         form.setError(key, errors[key]);
       }
     }
-  }, []);
+  }, [onSubmit]);
   var ctx = {
     fieldsMap: fieldsMap,
     fieldsetsMap: fieldsetsMap,

package/es/validators.js

@@ -51,6 +51,58 @@ export function validateAFM(afm) {
   var valid = calc % 10 === d9;
   return valid;
 }
+export function validatePhoneNumber(phoneNumber) {
+  var countries = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['gr'];
+  var typeOfPhoneNumber = arguments.length > 2 ? arguments[2] : undefined;
+  var phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
+
+  if (!countries || countries.length === 0) {
+    return true;
+  }
+
+  return countries.some(function (country) {
+    try {
+      var phone = phoneUtil.parse(phoneNumber, country.toUpperCase());
+
+      if (phoneUtil.isValidNumber(phone)) {
+        if (typeOfPhoneNumber) {
+          if (matchTypeOfPhoneNumber(phone, typeOfPhoneNumber, phoneUtil)) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          return true;
+        }
+      }
+
+      return false;
+    } catch (error) {
+      console.error(error);
+      return false;
+    }
+  });
+}
+var phoneNumberTypes = {
+  0: 'landline',
+  1: 'mobile',
+  2: 'landline_or_mobile'
+};
+export function matchTypeOfPhoneNumber(phone, type, phoneUtil) {
+  try {
+    var phoneNumberType = phoneUtil.getNumberType(phone);
+    var numberType = phoneNumberTypes[phoneNumberType];
+
+    if (numberType === 'landline_or_mobile' || numberType === type) {
+      return true;
+    } else {
+      return false;
+    }
+  } catch (error) {
+    console.error(error);
+    return false;
+  }
+}
 
 function validateMobile(value) {
   var phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
@@ -90,7 +142,7 @@ var POSTALCODE_VALIDATOR = function POSTALCODE_VALIDATOR(field) {
     name: 'postal-code-validator',
     message: 'form.error.postalCode',
     test: function test(value) {
-      if (!value || value.length === 0) {
+      if (!value) {
         return true;
       }
 
@@ -110,6 +162,35 @@ var MOBILE_PHONE_VALIDATOR = {
     return true;
   }
 };
+
+var PHONE_NUMBER_VALIDATOR = function PHONE_NUMBER_VALIDATOR(field) {
+  var _field$extra2, _field$extra3;
+
+  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra2 = field.extra) === null || _field$extra2 === void 0 ? void 0 : _field$extra2.countries;
+  var typeOfPhone = field === null || field === void 0 ? void 0 : (_field$extra3 = field.extra) === null || _field$extra3 === void 0 ? void 0 : _field$extra3.phoneType;
+  return {
+    name: 'phone-number-validator',
+    message: function message() {
+      if (typeOfPhone === 'mobile') {
+        return 'form.error.mobile_phone';
+      }
+
+      if (typeOfPhone === 'landline') {
+        return 'form.error.landline';
+      } else {
+        return 'form.error.phone_number';
+      }
+    },
+    test: function test(value) {
+      if (!value) {
+        return true;
+      }
+
+      return validatePhoneNumber(value, countryCode, typeOfPhone);
+    }
+  };
+};
+
 var AFM_VALIDATOR = {
   name: 'afm-validator',
   message: 'form.error.afm',
@@ -297,14 +378,14 @@ export function validateIban(value, countryCode) {
 }
 
 var IBAN_VALIDATOR = function IBAN_VALIDATOR(field) {
-  var _field$extra2;
+  var _field$extra4;
 
-  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra2 = field.extra) === null || _field$extra2 === void 0 ? void 0 : _field$extra2.country;
+  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra4 = field.extra) === null || _field$extra4 === void 0 ? void 0 : _field$extra4.country;
   return {
     name: 'iban-validator',
     message: 'form.error.iban',
     test: function test(value) {
-      if (!value || value.length === 0) {
+      if (!value) {
         return true;
       }
 
@@ -454,6 +535,9 @@ var getYUPTypeMap = function getYUPTypeMap() {
     mobile_phone: function mobile_phone() {
       return yup.string().test(MOBILE_PHONE_VALIDATOR);
     },
+    phone_number: function phone_number(field) {
+      return yup.string().test(PHONE_NUMBER_VALIDATOR(field));
+    },
     'choice:multiple': function choiceMultiple() {
       return yup.array().of(yup.string()).nullable();
     },

package/es/validators.spec.js

@@ -1,4 +1,4 @@
-import { validateUUID4, validateIban, validatePostalCode } from '@digigov/form/validators';
+import { validateUUID4, validateIban, validatePostalCode, validatePhoneNumber } from '@digigov/form/validators';
 it('validates wrong uuid4 for empty value', function () {
   expect(validateUUID4('')).toBe(false);
 });
@@ -41,6 +41,45 @@ it('validates wrong postal code with wrong country code', function () {
 it('validates wrong postal code with greek country code', function () {
   expect(validatePostalCode('123', ['GR'])).toBe(false);
 });
-it('validates  postal code with greek country code', function () {
+it('validates postal code with greek country code', function () {
   expect(validatePostalCode('11143', ['GR'])).toBe(true);
+});
+it('validates phone number type landline with greek country code', function () {
+  expect(validatePhoneNumber('2102934896', ['GR'], 'landline')).toBe(true);
+});
+it('validates phone number type landline with ch country code', function () {
+  expect(validatePhoneNumber('2102934896', ['CH'], 'landline')).toBe(false);
+});
+it('validates phone number type landline with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'landline')).toBe(true);
+});
+it('validatesphone number type landline with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('41446681800', ['GR', 'CH'], 'landline')).toBe(true);
+});
+it('validates phone number type landline with ch  and  gr countries code but phone number is mobile', function () {
+  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'mobile')).toBe(false);
+});
+it('validates phone number type mobile with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('6934100982', ['GR', 'CH'], 'mobile')).toBe(true);
+});
+it('validates  phone number type mobile with gr country code', function () {
+  expect(validatePhoneNumber('6934100982', ['GR'], 'mobile')).toBe(true);
+});
+it('validates  phone number type mobile with ch country code', function () {
+  expect(validatePhoneNumber('6934100982', ['CH'], 'mobile')).toBe(false);
+});
+it('validates  phone number with no type and ch country code', function () {
+  expect(validatePhoneNumber('6934100982', ['CH'], null)).toBe(false);
+});
+it('validates  phone number with no type and gr country code', function () {
+  expect(validatePhoneNumber('6934100982', ['gr'], null)).toBe(true);
+});
+it('validates  phone number with no type and ch country code', function () {
+  expect(validatePhoneNumber('41446681800', ['CH'], null)).toBe(true);
+});
+it('validates  phone number with no type and gr country code', function () {
+  expect(validatePhoneNumber('41446681800', ['gr'], null)).toBe(false);
+});
+it('validates  phone number with no type and gr and ch countries code', function () {
+  expect(validatePhoneNumber('41446681800', ['gr', 'ch'], null)).toBe(true);
 });

package/esm/index.js

@@ -1,4 +1,4 @@
-/** @license Digigov v0.6.6
+/** @license Digigov v0.6.7
  *
  * This source code is licensed under the BSD-2-Clause license found in the
  * LICENSE file in the root directory of this source tree.
@@ -55,7 +55,7 @@ export var FormBase = /*#__PURE__*/React.forwardRef(function FormBase(_ref, ref)
         form.setError(key, errors[key]);
       }
     }
-  }, []);
+  }, [onSubmit]);
   var ctx = {
     fieldsMap: fieldsMap,
     fieldsetsMap: fieldsetsMap,

package/esm/validators.js

@@ -51,6 +51,58 @@ export function validateAFM(afm) {
   var valid = calc % 10 === d9;
   return valid;
 }
+export function validatePhoneNumber(phoneNumber) {
+  var countries = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['gr'];
+  var typeOfPhoneNumber = arguments.length > 2 ? arguments[2] : undefined;
+  var phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
+
+  if (!countries || countries.length === 0) {
+    return true;
+  }
+
+  return countries.some(function (country) {
+    try {
+      var phone = phoneUtil.parse(phoneNumber, country.toUpperCase());
+
+      if (phoneUtil.isValidNumber(phone)) {
+        if (typeOfPhoneNumber) {
+          if (matchTypeOfPhoneNumber(phone, typeOfPhoneNumber, phoneUtil)) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          return true;
+        }
+      }
+
+      return false;
+    } catch (error) {
+      console.error(error);
+      return false;
+    }
+  });
+}
+var phoneNumberTypes = {
+  0: 'landline',
+  1: 'mobile',
+  2: 'landline_or_mobile'
+};
+export function matchTypeOfPhoneNumber(phone, type, phoneUtil) {
+  try {
+    var phoneNumberType = phoneUtil.getNumberType(phone);
+    var numberType = phoneNumberTypes[phoneNumberType];
+
+    if (numberType === 'landline_or_mobile' || numberType === type) {
+      return true;
+    } else {
+      return false;
+    }
+  } catch (error) {
+    console.error(error);
+    return false;
+  }
+}
 
 function validateMobile(value) {
   var phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
@@ -90,7 +142,7 @@ var POSTALCODE_VALIDATOR = function POSTALCODE_VALIDATOR(field) {
     name: 'postal-code-validator',
     message: 'form.error.postalCode',
     test: function test(value) {
-      if (!value || value.length === 0) {
+      if (!value) {
         return true;
       }
 
@@ -110,6 +162,35 @@ var MOBILE_PHONE_VALIDATOR = {
     return true;
   }
 };
+
+var PHONE_NUMBER_VALIDATOR = function PHONE_NUMBER_VALIDATOR(field) {
+  var _field$extra2, _field$extra3;
+
+  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra2 = field.extra) === null || _field$extra2 === void 0 ? void 0 : _field$extra2.countries;
+  var typeOfPhone = field === null || field === void 0 ? void 0 : (_field$extra3 = field.extra) === null || _field$extra3 === void 0 ? void 0 : _field$extra3.phoneType;
+  return {
+    name: 'phone-number-validator',
+    message: function message() {
+      if (typeOfPhone === 'mobile') {
+        return 'form.error.mobile_phone';
+      }
+
+      if (typeOfPhone === 'landline') {
+        return 'form.error.landline';
+      } else {
+        return 'form.error.phone_number';
+      }
+    },
+    test: function test(value) {
+      if (!value) {
+        return true;
+      }
+
+      return validatePhoneNumber(value, countryCode, typeOfPhone);
+    }
+  };
+};
+
 var AFM_VALIDATOR = {
   name: 'afm-validator',
   message: 'form.error.afm',
@@ -297,14 +378,14 @@ export function validateIban(value, countryCode) {
 }
 
 var IBAN_VALIDATOR = function IBAN_VALIDATOR(field) {
-  var _field$extra2;
+  var _field$extra4;
 
-  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra2 = field.extra) === null || _field$extra2 === void 0 ? void 0 : _field$extra2.country;
+  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra4 = field.extra) === null || _field$extra4 === void 0 ? void 0 : _field$extra4.country;
   return {
     name: 'iban-validator',
     message: 'form.error.iban',
     test: function test(value) {
-      if (!value || value.length === 0) {
+      if (!value) {
         return true;
       }
 
@@ -454,6 +535,9 @@ var getYUPTypeMap = function getYUPTypeMap() {
     mobile_phone: function mobile_phone() {
       return yup.string().test(MOBILE_PHONE_VALIDATOR);
     },
+    phone_number: function phone_number(field) {
+      return yup.string().test(PHONE_NUMBER_VALIDATOR(field));
+    },
     'choice:multiple': function choiceMultiple() {
       return yup.array().of(yup.string()).nullable();
     },

package/esm/validators.spec.js

@@ -1,4 +1,4 @@
-import { validateUUID4, validateIban, validatePostalCode } from '@digigov/form/validators';
+import { validateUUID4, validateIban, validatePostalCode, validatePhoneNumber } from '@digigov/form/validators';
 it('validates wrong uuid4 for empty value', function () {
   expect(validateUUID4('')).toBe(false);
 });
@@ -41,6 +41,45 @@ it('validates wrong postal code with wrong country code', function () {
 it('validates wrong postal code with greek country code', function () {
   expect(validatePostalCode('123', ['GR'])).toBe(false);
 });
-it('validates  postal code with greek country code', function () {
+it('validates postal code with greek country code', function () {
   expect(validatePostalCode('11143', ['GR'])).toBe(true);
+});
+it('validates phone number type landline with greek country code', function () {
+  expect(validatePhoneNumber('2102934896', ['GR'], 'landline')).toBe(true);
+});
+it('validates phone number type landline with ch country code', function () {
+  expect(validatePhoneNumber('2102934896', ['CH'], 'landline')).toBe(false);
+});
+it('validates phone number type landline with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'landline')).toBe(true);
+});
+it('validatesphone number type landline with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('41446681800', ['GR', 'CH'], 'landline')).toBe(true);
+});
+it('validates phone number type landline with ch  and  gr countries code but phone number is mobile', function () {
+  expect(validatePhoneNumber('2102934896', ['GR', 'CH'], 'mobile')).toBe(false);
+});
+it('validates phone number type mobile with ch  and  gr countries code', function () {
+  expect(validatePhoneNumber('6934100982', ['GR', 'CH'], 'mobile')).toBe(true);
+});
+it('validates  phone number type mobile with gr country code', function () {
+  expect(validatePhoneNumber('6934100982', ['GR'], 'mobile')).toBe(true);
+});
+it('validates  phone number type mobile with ch country code', function () {
+  expect(validatePhoneNumber('6934100982', ['CH'], 'mobile')).toBe(false);
+});
+it('validates  phone number with no type and ch country code', function () {
+  expect(validatePhoneNumber('6934100982', ['CH'], null)).toBe(false);
+});
+it('validates  phone number with no type and gr country code', function () {
+  expect(validatePhoneNumber('6934100982', ['gr'], null)).toBe(true);
+});
+it('validates  phone number with no type and ch country code', function () {
+  expect(validatePhoneNumber('41446681800', ['CH'], null)).toBe(true);
+});
+it('validates  phone number with no type and gr country code', function () {
+  expect(validatePhoneNumber('41446681800', ['gr'], null)).toBe(false);
+});
+it('validates  phone number with no type and gr and ch countries code', function () {
+  expect(validatePhoneNumber('41446681800', ['gr', 'ch'], null)).toBe(true);
 });

package/index.js

@@ -102,7 +102,7 @@ var FormBase = /*#__PURE__*/_react["default"].forwardRef(function FormBase(_ref,
         form.setError(key, errors[key]);
       }
     }
-  }, []);
+  }, [onSubmit]);
   var ctx = {
     fieldsMap: fieldsMap,
     fieldsetsMap: fieldsetsMap,

package/libs/form/src/index.d.ts

@@ -19,7 +19,7 @@ export interface FieldCondition {
 }
 export interface FieldSpec {
     key: string;
-    type?: 'int' | 'string' | 'boolean' | 'choice:multiple' | 'choice:single' | 'mobile_phone' | 'afm' | 'iban' | 'postal_code';
+    type?: 'int' | 'string' | 'boolean' | 'choice:multiple' | 'choice:single' | 'mobile_phone' | 'afm' | 'iban' | 'postal_code' | 'phone_number';
     component?: any;
     condition?: Record<string, FieldCondition>;
     controlled?: boolean;

package/libs/form/src/validators.d.ts

@@ -4,6 +4,9 @@ import { MutableRefObject } from 'react';
 export declare type ValidatorSchema = yup.BaseTestOptions;
 export declare function validatePostalCode(number: string, countries: Array<string>): boolean;
 export declare function validateAFM(afm: string): boolean;
+export declare type PhoneNumberType = 'landline' | 'mobile' | null;
+export declare function validatePhoneNumber(phoneNumber: string, countries: string[] | undefined, typeOfPhoneNumber: PhoneNumberType): boolean;
+export declare function matchTypeOfPhoneNumber(phone: any, type: string, phoneUtil: any): boolean;
 export declare function validateUUID4(uuid4: string): boolean;
 export declare function validateIban(value: string, countryCode: string): boolean;
 export interface MutableRefObjectProps {

package/libs/ui/src/core/index.d.ts

@@ -18,6 +18,5 @@ export * from '@digigov/ui/core/Table';
 export * from '@digigov/ui/core/Tabs';
 export * from '@digigov/ui/core/VisuallyHidden';
 export { default as WarningText } from '@digigov/ui/core/WarningText';
-export * from '@digigov/ui/core/PaginationLabel';
 export * from '@digigov/ui/core/SvgIcon';
 export * from '@digigov/ui/core/FileUpload';

package/libs/ui/src/locales/el.d.ts

@@ -14,6 +14,8 @@ declare const _default: {
             afm: string;
             file_size: string;
             mobile_phone: string;
+            phone_number: string;
+            landline: string;
             uuid4: string;
             iban: string;
             postalCode: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/form",
-  "version": "0.6.6",
+  "version": "0.6.7",
   "description": "@digigov form builder",
   "author": "GRNET Developers <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
@@ -17,7 +17,7 @@
     "dayjs": "1.10.4"
   },
   "peerDependencies": {
-    "@digigov/ui": "0.20.2",
+    "@digigov/ui": "0.21.0",
     "@material-ui/core": "4.11.3",
     "@material-ui/icons": "4.11.2",
     "clsx": "1.1.1",

package/validators.js

@@ -7,9 +7,11 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.matchTypeOfPhoneNumber = matchTypeOfPhoneNumber;
 exports.useValidationSchema = useValidationSchema;
 exports.validateAFM = validateAFM;
 exports.validateIban = validateIban;
+exports.validatePhoneNumber = validatePhoneNumber;
 exports.validatePostalCode = validatePostalCode;
 exports.validateUUID4 = validateUUID4;
 
@@ -80,6 +82,61 @@ function validateAFM(afm) {
   return valid;
 }
 
+function validatePhoneNumber(phoneNumber) {
+  var countries = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['gr'];
+  var typeOfPhoneNumber = arguments.length > 2 ? arguments[2] : undefined;
+  var phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
+
+  if (!countries || countries.length === 0) {
+    return true;
+  }
+
+  return countries.some(function (country) {
+    try {
+      var phone = phoneUtil.parse(phoneNumber, country.toUpperCase());
+
+      if (phoneUtil.isValidNumber(phone)) {
+        if (typeOfPhoneNumber) {
+          if (matchTypeOfPhoneNumber(phone, typeOfPhoneNumber, phoneUtil)) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          return true;
+        }
+      }
+
+      return false;
+    } catch (error) {
+      console.error(error);
+      return false;
+    }
+  });
+}
+
+var phoneNumberTypes = {
+  0: 'landline',
+  1: 'mobile',
+  2: 'landline_or_mobile'
+};
+
+function matchTypeOfPhoneNumber(phone, type, phoneUtil) {
+  try {
+    var phoneNumberType = phoneUtil.getNumberType(phone);
+    var numberType = phoneNumberTypes[phoneNumberType];
+
+    if (numberType === 'landline_or_mobile' || numberType === type) {
+      return true;
+    } else {
+      return false;
+    }
+  } catch (error) {
+    console.error(error);
+    return false;
+  }
+}
+
 function validateMobile(value) {
   var phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
   var origValue = value; // probably catch all the cases with a regex instead of gphonenumber
@@ -118,7 +175,7 @@ var POSTALCODE_VALIDATOR = function POSTALCODE_VALIDATOR(field) {
     name: 'postal-code-validator',
     message: 'form.error.postalCode',
     test: function test(value) {
-      if (!value || value.length === 0) {
+      if (!value) {
         return true;
       }
 
@@ -138,6 +195,35 @@ var MOBILE_PHONE_VALIDATOR = {
     return true;
   }
 };
+
+var PHONE_NUMBER_VALIDATOR = function PHONE_NUMBER_VALIDATOR(field) {
+  var _field$extra2, _field$extra3;
+
+  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra2 = field.extra) === null || _field$extra2 === void 0 ? void 0 : _field$extra2.countries;
+  var typeOfPhone = field === null || field === void 0 ? void 0 : (_field$extra3 = field.extra) === null || _field$extra3 === void 0 ? void 0 : _field$extra3.phoneType;
+  return {
+    name: 'phone-number-validator',
+    message: function message() {
+      if (typeOfPhone === 'mobile') {
+        return 'form.error.mobile_phone';
+      }
+
+      if (typeOfPhone === 'landline') {
+        return 'form.error.landline';
+      } else {
+        return 'form.error.phone_number';
+      }
+    },
+    test: function test(value) {
+      if (!value) {
+        return true;
+      }
+
+      return validatePhoneNumber(value, countryCode, typeOfPhone);
+    }
+  };
+};
+
 var AFM_VALIDATOR = {
   name: 'afm-validator',
   message: 'form.error.afm',
@@ -328,14 +414,14 @@ function validateIban(value, countryCode) {
 }
 
 var IBAN_VALIDATOR = function IBAN_VALIDATOR(field) {
-  var _field$extra2;
+  var _field$extra4;
 
-  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra2 = field.extra) === null || _field$extra2 === void 0 ? void 0 : _field$extra2.country;
+  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra4 = field.extra) === null || _field$extra4 === void 0 ? void 0 : _field$extra4.country;
   return {
     name: 'iban-validator',
     message: 'form.error.iban',
     test: function test(value) {
-      if (!value || value.length === 0) {
+      if (!value) {
         return true;
       }
 
@@ -485,6 +571,9 @@ var getYUPTypeMap = function getYUPTypeMap() {
     mobile_phone: function mobile_phone() {
       return yup.string().test(MOBILE_PHONE_VALIDATOR);
     },
+    phone_number: function phone_number(field) {
+      return yup.string().test(PHONE_NUMBER_VALIDATOR(field));
+    },
     'choice:multiple': function choiceMultiple() {
       return yup.array().of(yup.string()).nullable();
     },

package/validators.spec.js

@@ -44,6 +44,45 @@ it('validates wrong postal code with wrong country code', function () {
 it('validates wrong postal code with greek country code', function () {
   expect((0, _validators.validatePostalCode)('123', ['GR'])).toBe(false);
 });
-it('validates  postal code with greek country code', function () {
+it('validates postal code with greek country code', function () {
   expect((0, _validators.validatePostalCode)('11143', ['GR'])).toBe(true);
+});
+it('validates phone number type landline with greek country code', function () {
+  expect((0, _validators.validatePhoneNumber)('2102934896', ['GR'], 'landline')).toBe(true);
+});
+it('validates phone number type landline with ch country code', function () {
+  expect((0, _validators.validatePhoneNumber)('2102934896', ['CH'], 'landline')).toBe(false);
+});
+it('validates phone number type landline with ch  and  gr countries code', function () {
+  expect((0, _validators.validatePhoneNumber)('2102934896', ['GR', 'CH'], 'landline')).toBe(true);
+});
+it('validatesphone number type landline with ch  and  gr countries code', function () {
+  expect((0, _validators.validatePhoneNumber)('41446681800', ['GR', 'CH'], 'landline')).toBe(true);
+});
+it('validates phone number type landline with ch  and  gr countries code but phone number is mobile', function () {
+  expect((0, _validators.validatePhoneNumber)('2102934896', ['GR', 'CH'], 'mobile')).toBe(false);
+});
+it('validates phone number type mobile with ch  and  gr countries code', function () {
+  expect((0, _validators.validatePhoneNumber)('6934100982', ['GR', 'CH'], 'mobile')).toBe(true);
+});
+it('validates  phone number type mobile with gr country code', function () {
+  expect((0, _validators.validatePhoneNumber)('6934100982', ['GR'], 'mobile')).toBe(true);
+});
+it('validates  phone number type mobile with ch country code', function () {
+  expect((0, _validators.validatePhoneNumber)('6934100982', ['CH'], 'mobile')).toBe(false);
+});
+it('validates  phone number with no type and ch country code', function () {
+  expect((0, _validators.validatePhoneNumber)('6934100982', ['CH'], null)).toBe(false);
+});
+it('validates  phone number with no type and gr country code', function () {
+  expect((0, _validators.validatePhoneNumber)('6934100982', ['gr'], null)).toBe(true);
+});
+it('validates  phone number with no type and ch country code', function () {
+  expect((0, _validators.validatePhoneNumber)('41446681800', ['CH'], null)).toBe(true);
+});
+it('validates  phone number with no type and gr country code', function () {
+  expect((0, _validators.validatePhoneNumber)('41446681800', ['gr'], null)).toBe(false);
+});
+it('validates  phone number with no type and gr and ch countries code', function () {
+  expect((0, _validators.validatePhoneNumber)('41446681800', ['gr', 'ch'], null)).toBe(true);
 });