diff --git a/src/pages/AdminTraineeDashboard.tsx b/src/pages/AdminTraineeDashboard.tsx index 9a4e45130..d4921128c 100644 --- a/src/pages/AdminTraineeDashboard.tsx +++ b/src/pages/AdminTraineeDashboard.tsx @@ -1602,20 +1602,6 @@ function AdminTraineeDashboard() { > {t('add')} +{' '} - - {user?.role === 'coordinator' || undefined ? ( - '' - ) : ( - - )}
diff --git a/src/pages/invitation.tsx b/src/pages/invitation.tsx index 6cccaa683..c9727533b 100644 --- a/src/pages/invitation.tsx +++ b/src/pages/invitation.tsx @@ -76,6 +76,7 @@ function Invitation() { const [buttonLoading, setButtonLoading] = useState(false); const [selectedRole, setSelectedRole] = useState(''); const [selectedStatus, setSelectedStatus] = useState(''); + const [selectedSort,setSelectedSort] = useState(''); const [email, setEmail] = useState(''); const [role, setRole] = useState(''); const [selectedInvitationId, setSelectedInvitationId] = useState(''); @@ -86,7 +87,6 @@ function Invitation() { const[filterDisabled,setFilterDisabled]=useState(true) const modalRef = useRef(null); const organizationToken = localStorage.getItem('orgToken'); - const parseRange = (range: string) => { switch (range) { case 'Last 7 days': @@ -205,7 +205,6 @@ function Invitation() { }, fetchPolicy: 'network-only', }); - const [ filterInvitations, { data: filterData, loading: filterLoad, error: filterError }, @@ -288,14 +287,12 @@ function Invitation() { const handleRoleChange=(e:React.ChangeEvent)=>{ const role=e.target.value - setSelectedRole(role) - + setSelectedRole(role); } const handleStatusChange=(e:React.ChangeEvent)=>{ const status=e.target.value setSelectedStatus(status) - } const handleFilter = () => { @@ -612,7 +609,6 @@ const handleStatusChange=(e:React.ChangeEvent)=>{ }, 500); }, }); - const [CancelInvitation] = useMutation(CANCEL_INVITATION, { variables: { id: cancelInvitation, @@ -636,7 +632,7 @@ const handleStatusChange=(e:React.ChangeEvent)=>{ }, }); return ( -
+
{/* Header and Invite Button */}
@@ -809,80 +805,76 @@ const handleStatusChange=(e:React.ChangeEvent)=>{

{/* Search form */} -
-
- setSearchQuery(e.target.value)} - placeholder="Search by email, role or status of the invitation." - className="border border-gray-300 rounded-md pl-10 pr-4 py-2 w-full dark:text:text-black hover:border-[#7258ce] h-10 " - /> - -
- -
-
-
-
-

- Or filter by{' '} - - ROLE: - -

- - - - - {' '} - or STATUS: - - - - - - +
+
+
+ { + setSearchQuery(e.target.value) + }} + placeholder="Search by email, role or status of the invitation." + className="border border-gray-300 outline-none bg-transparent rounded-md pl-10 pr-4 py-1 w-full dark:text-white hover:border-[#7258ce] dark:text:text-white sm:text-normal text-md dark:bg-[#04122F]" + /> + +
+
+ +
+
+ +
+
+ + + + + + + +
+
{/* Table view */} {content}