diff --git a/src/Pages/Login.tsx b/src/Pages/Login.tsx index 745e48c..306a46f 100644 --- a/src/Pages/Login.tsx +++ b/src/Pages/Login.tsx @@ -34,7 +34,7 @@ const Login = () => { if (!context) { throw new Error("App must be used within a GlobalStateProvider"); } - const { setIsAuthenticate, setUserAccess, userAccess } = context; + const { setIsAuthenticate, setUserAccess } = context; const { register, handleSubmit, @@ -71,8 +71,8 @@ const Login = () => { const allowedTitles = isAdmin ? ['*'] : role_permission?.get_resource_action_link - ?.filter(link => link.is_active) - .map(link => link.app_resource.app_resource_title) ?? []; + ?.filter((link: unknown) => (link as any).is_active) + .map((link: unknown) => (link as any).app_resource.app_resource_title) ?? []; setIsAuthenticate(true); setUserAccess(allowedTitles); diff --git a/src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx b/src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx index 97bb256..d954cb7 100644 --- a/src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx +++ b/src/Pages/ManageUsers/RegisterUsers/RegisterUsers.tsx @@ -24,6 +24,7 @@ import { delay } from "../../../components/Utils"; const tableHeadRow = [ "Sr. No", "First Name", + "Last Name", "Mobile Number", "Gender", "DOB", @@ -154,6 +155,7 @@ const RegisterUsers = () => { const managepost = filteredData?.flatMap((agency: UserData, index: number) => ({ "Sr. No": (currentPage - 1) * (data?.data.per_page ?? 0) + index + 1, "First Name": agency.first_name, + "Last Name": agency.last_name, "Mobile Number": agency.phone_number, "Gender": agency.gender, "DOB": agency.date_of_birth ? new Date(agency.date_of_birth).toLocaleDateString('en-GB').replace(/\//g, '-') : 'N/A',