fx-rating-error (#492)

this commit refines the functions of validating this commit utilizes zod library for validating ttl rating trainees (#494) Fetch invitation statistics (#463)
atlp-rwanda · Sep 26, 2024 · aa3c399 · aa3c399
1 parent 10b59d2
commit aa3c399
Show file tree

Hide file tree

Showing 6 changed files with 535 additions and 191 deletions.
diff --git a/src/Mutations/invitationMutation.tsx b/src/Mutations/invitationMutation.tsx
@@ -1,22 +1,23 @@
 import { gql } from '@apollo/client';
 
 export const SEND_INVITATION = gql`
-  mutation SendInvitation($invitees: [InviteeInput!]!, $orgToken: String!) {
-    sendInvitation(invitees: $invitees, orgToken: $orgToken) {
+  mutation SendInvitation($invitees: [InviteeInput!]!,$orgName:String!,$orgToken: String!) {
+    sendInvitation(invitees: $invitees,orgName:$orgName, orgToken: $orgToken) {
       status
       invitees {
         email
         role
       }
+      orgName
       orgToken
       createdAt
     }
   }
 `;
 
 export const UPLOAD_INVITATION_FILE = gql`
-  mutation uploadInvitationFile($file: Upload!, $orgToken: String!) {
-    uploadInvitationFile(file: $file, orgToken: $orgToken) {
+  mutation uploadInvitationFile($file: Upload!,$orgName:String!, $orgToken: String!) {
+    uploadInvitationFile(file: $file,orgName:$orgName,orgToken: $orgToken) {
       filename
       data {
         email
@@ -36,3 +37,35 @@ export const DELETE_INVITATION = gql`
     }
   }
 `;
+
+export const UPDATE_INVITATION = gql`
+  mutation UpdateInvitation(
+    $invitationId: ID!
+    $orgToken: String!
+    $newEmail: String
+    $newRole: String
+  ) {
+    updateInvitation(
+      invitationId: $invitationId
+      orgToken: $orgToken
+      newEmail: $newEmail
+      newRole: $newRole
+    ) {
+      id
+      invitees {
+        email
+        role
+      }
+      inviterId
+      orgToken
+    }
+  }
+`;
+export const CANCEL_INVITATION = gql`
+  mutation CancelInvitation($id: ID!, $orgToken: String!) {
+    cancelInvitation(id: $id, orgToken: $orgToken) {
+      status
+      createdAt
+    }
+  }
+`;
diff --git a/src/Mutations/invitationStats.tsx b/src/Mutations/invitationStats.tsx
@@ -15,9 +15,11 @@ export const GET_INVITATIONS_STATISTICS_QUERY = gql`
     ) {
       totalInvitations
       pendingInvitationsCount
+      cancelledInvitationsCount
       getPendingInvitationsPercentsCount
       getAcceptedInvitationsPercentsCount
+      getCancelledInvitationsPercentsCount
       acceptedInvitationsCount
     }
   }
-`;
+`;
diff --git a/src/components/InvitationTable.tsx b/src/components/InvitationTable.tsx
@@ -62,9 +62,7 @@ function DataTableStats({ data, columns, error, loading }: TableData) {
   };
 
   return (
-    <div
-      className=""
-    >
+    <div className="">
       <div className="flex items-center justify-between pb-6 " />
       <div style={{ overflowX: 'auto' }}>
         <table className="min-w-full leading-normal" {...getTableProps()}>
@@ -177,5 +175,4 @@ function DataTableStats({ data, columns, error, loading }: TableData) {
   );
 }
 
-
 export default DataTableStats;
diff --git a/src/components/invitationModal.tsx b/src/components/invitationModal.tsx
@@ -27,6 +27,7 @@ function InviteForm({ onClose }: InviteFormProps) {
   const [email, setEmail] = useState<string>('');
   const [role, setRole] = useState<string>('Role');
   const [orgToken, setOrgToken] = useState<string>('');
+  const [orgName,setOrgName] = useState<string>('');
   const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
   const [emailError, setEmailError] = useState<string>('');
   const [sendInvitation, { loading, error }] = useMutation(SEND_INVITATION);
@@ -37,6 +38,7 @@ function InviteForm({ onClose }: InviteFormProps) {
   );
 
   const organisationToken = localStorage.getItem('orgToken');
+  const organisationName = localStorage.getItem('orgName');
 
   const handleFileChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const selectedFile = e.target.files?.[0] || null;
@@ -52,7 +54,7 @@ function InviteForm({ onClose }: InviteFormProps) {
     }
 
     try {
-      const { data } = await uploadFile({ variables: { file, orgToken } });
+      const { data } = await uploadFile({ variables: { file,orgName,orgToken } });
       if (data && data.uploadInvitationFile) {
         const { message, sentEmails } = data.uploadInvitationFile;
         if (sentEmails === 0) {
@@ -79,7 +81,10 @@ function InviteForm({ onClose }: InviteFormProps) {
     if (organisationToken) {
       setOrgToken(organisationToken);
     }
-  }, [organisationToken]);
+    if(organisationName){
+      setOrgName(organisationName)
+    }
+  }, [organisationToken,organisationName]);
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
@@ -95,12 +100,14 @@ function InviteForm({ onClose }: InviteFormProps) {
       await sendInvitation({
         variables: {
           invitees: [{ email, role }],
+          orgName,
           orgToken,
         },
       });
       toast.success('Invitation sent successfully!');
       setEmail('');
       setRole('Role');
+      setOrgName('');
       setOrgToken('');
       onClose();
     } catch (e: any) {