From 326d305a69c3d9881f931ef0d10f372475c5f339 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Thu, 22 Aug 2024 16:15:25 +0100
Subject: [PATCH] ENCOA-97: Now it allows the user to write the name of the
 country in english

---
 src/pages/(admin)/BatchCodeGenerator.tsx | 1 +
 src/pages/(admin)/BatchCreateUser.tsx    | 8 +++++++-
 src/utils/permissions.ts                 | 2 --
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/(admin)/BatchCodeGenerator.tsx b/src/pages/(admin)/BatchCodeGenerator.tsx
index dd73e70c..04ca8c96 100644
--- a/src/pages/(admin)/BatchCodeGenerator.tsx
+++ b/src/pages/(admin)/BatchCodeGenerator.tsx
@@ -19,6 +19,7 @@ import {BsFileEarmarkEaselFill, BsQuestionCircleFill} from "react-icons/bs";
 import {checkAccess, getTypesOfUser} from "@/utils/permissions";
 import {PermissionType} from "@/interfaces/permissions";
 import usePermissions from "@/hooks/usePermissions";
+
 const EMAIL_REGEX = new RegExp(/^[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*@[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*$/);
 
 const USER_TYPE_PERMISSIONS: {
diff --git a/src/pages/(admin)/BatchCreateUser.tsx b/src/pages/(admin)/BatchCreateUser.tsx
index fe013429..bfab6457 100644
--- a/src/pages/(admin)/BatchCreateUser.tsx
+++ b/src/pages/(admin)/BatchCreateUser.tsx
@@ -16,6 +16,8 @@ import Checkbox from "@/components/Low/Checkbox";
 import ReactDatePicker from "react-datepicker";
 import clsx from "clsx";
 import usePermissions from "@/hooks/usePermissions";
+import countryCodes from "country-codes-list";
+
 const EMAIL_REGEX = new RegExp(/^[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*@[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*$/);
 
 type Type = Exclude<UserType, "admin" | "developer" | "agent" | "mastercorporate">;
@@ -103,6 +105,10 @@ export default function BatchCreateUser({user}: {user: User}) {
 						rows
 							.map((row) => {
 								const [firstName, lastName, country, passport_id, email, phone, group] = row as string[];
+								const countryItem =
+									countryCodes.findOne("countryCode" as any, country.toUpperCase()) ||
+									countryCodes.all().find((x) => x.countryNameEn.toLowerCase() === country.toLowerCase());
+
 								return EMAIL_REGEX.test(email.toString().trim())
 									? {
 											email: email.toString().trim().toLowerCase(),
@@ -111,7 +117,7 @@ export default function BatchCreateUser({user}: {user: User}) {
 											passport_id: passport_id?.toString().trim() || undefined,
 											groupName: group,
 											demographicInformation: {
-												country: country,
+												country: countryItem?.countryCode,
 												passport_id: passport_id?.toString().trim() || undefined,
 												phone,
 											},
diff --git a/src/utils/permissions.ts b/src/utils/permissions.ts
index 0831393d..da3d2d59 100644
--- a/src/utils/permissions.ts
+++ b/src/utils/permissions.ts
@@ -9,12 +9,10 @@ export function checkAccess(user: User, types: Type[], permissions?: PermissionT
 
 	// if(user.type === '') {
 	if (!user.type) {
-		console.warn("User type is empty");
 		return false;
 	}
 
 	if (types.length === 0) {
-		console.warn("No types provided");
 		return false;
 	}