devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into master-corporate

Browse Source
This commit is contained in:
Joao Ramos
2024-07-24 09:50:53 +01:00
parent 916fa66446 10a3243756
commit daa27e41b3
10 changed files with 729 additions and 912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pages/(admin)/Lists/UserList.tsx
View File

@@ -131,7 +131,6 @@ export default function UserList({
filteredUsers,
sortFunction
);
console.log(sortedUsers);
setDisplayUsers([...sortedUsers]);
}
@@ -234,7 +233,7 @@ export default function UserList({
const actionColumn = ({ row }: { row: { original: User } }) => {
return (
<div className="flex gap-4">
{PERMISSIONS.updateUser[row.original.type].includes(user.type) && (
{PERMISSIONS.updateUser[row.original.type]?.includes(user.type) && (
<Popover className="relative">
<Popover.Button>
<div data-tip="Change Type" className="cursor-pointer tooltip">
@@ -298,7 +297,7 @@ export default function UserList({
</Popover>
)}
{!row.original.isVerified &&
PERMISSIONS.updateUser[row.original.type].includes(user.type) && (
PERMISSIONS.updateUser[row.original.type]?.includes(user.type) && (
<div
data-tip="Verify User"
className="cursor-pointer tooltip"
@@ -307,7 +306,7 @@ export default function UserList({
<BsCheck className="hover:text-mti-purple-light transition ease-in-out duration-300" />
</div>
)}
{PERMISSIONS.updateUser[row.original.type].includes(user.type) && (
{PERMISSIONS.updateUser[row.original.type]?.includes(user.type) && (
<div
data-tip={
row.original.status === "disabled"
@@ -324,7 +323,7 @@ export default function UserList({
)}
</div>
)}
{PERMISSIONS.deleteUser[row.original.type].includes(user.type) && (
{PERMISSIONS.deleteUser[row.original.type]?.includes(user.type) && (
<div
data-tip="Delete"
className="cursor-pointer tooltip"
@@ -351,13 +350,13 @@ export default function UserList({
cell: ({ row, getValue }) => (
<div
className={clsx(
PERMISSIONS.updateExpiryDate[row.original.type].includes(
PERMISSIONS.updateExpiryDate[row.original.type]?.includes(
user.type
) &&
"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer"
)}
onClick={() =>
PERMISSIONS.updateExpiryDate[row.original.type].includes(user.type)
PERMISSIONS.updateExpiryDate[row.original.type]?.includes(user.type)
? setSelectedUser(row.original)
: null
}
@@ -467,13 +466,13 @@ export default function UserList({
cell: ({ row, getValue }) => (
<div
className={clsx(
PERMISSIONS.updateExpiryDate[row.original.type].includes(
PERMISSIONS.updateExpiryDate[row.original.type]?.includes(
user.type
) &&
"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer"
)}
onClick={() =>
PERMISSIONS.updateExpiryDate[row.original.type].includes(user.type)
PERMISSIONS.updateExpiryDate[row.original.type]?.includes(user.type)
? setSelectedUser(row.original)
: null
}
@@ -498,13 +497,13 @@ export default function UserList({
cell: ({ row, getValue }) => (
<div
className={clsx(
PERMISSIONS.updateExpiryDate[row.original.type].includes(
PERMISSIONS.updateExpiryDate[row.original.type]?.includes(
user.type
) &&
"underline text-mti-purple-light hover:text-mti-purple-dark transition ease-in-out duration-300 cursor-pointer"
)}
onClick={() =>
PERMISSIONS.updateExpiryDate[row.original.type].includes(user.type)
PERMISSIONS.updateExpiryDate[row.original.type]?.includes(user.type)
? setSelectedUser(row.original)
: null
}