#537 Improving table loading state PR

jest.config.js

@@ -3,6 +3,9 @@
 export default {
   preset: 'ts-jest',
   testEnvironment: 'jsdom',
+  testEnvironmentOptions: {
+    customExportConditions: [] // don't load "browser" field
+  },
   verbose: true,
   collectCoverage: true,
   coverageReporters: ['lcov', 'text'],

package.json

@@ -34,12 +34,12 @@
     "@babel/preset-react": "^7.22.5",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@fullcalendar/core": "^5.11.5",
-    "@fullcalendar/daygrid": "^5.11.5",
-    "@fullcalendar/interaction": "^5.11.5",
-    "@fullcalendar/list": "^5.11.5",
-    "@fullcalendar/react": "^5.11.5",
-    "@fullcalendar/timegrid": "^5.11.5",
+    "@fullcalendar/core": "^6.1.15",
+    "@fullcalendar/daygrid": "^6.1.15",
+    "@fullcalendar/interaction": "^6.1.15",
+    "@fullcalendar/list": "^6.1.15",
+    "@fullcalendar/react": "^6.1.15",
+    "@fullcalendar/timegrid": "^6.1.15",
     "@headlessui/react": "^1.7.15",
     "@heroicons/react": "^1.0.6",
     "@iconify/react": "^3.2.2",

src/Mutations/User.tsx

@@ -53,8 +53,10 @@ export const GET_ALL_TTL_USERS = gql`
     getAllTTLUsers(orgToken: $orgToken) {
       profile {
         name
+        id
       }
       email
+      role
       team {
         name
         cohort {

src/Mutations/event.tsx

@@ -3,34 +3,96 @@ import { gql } from '@apollo/client';
 export const GET_EVENTS = gql`
   query GetEvents($authToken: String) {
     getEvents(authToken: $authToken) {
+      id
+      user
       end
       hostName
       start
       timeToEnd
       timeToStart
       title
+      invitees {
+        email
+      }
     }
   }
 `;
 
+export const GET_EVENT = gql`
+  query GetEvent($eventId: String!, $authToken: String!) {
+    getEvent(eventId: $eventId,authToken: $authToken) {
+      id
+      user
+      end
+      hostName
+      start
+      timeToEnd
+      timeToStart
+      title
+      invitees {
+        email
+      }
+    }
+  }
+`
+
 export const ADD_EVENT = gql`
   mutation CreateEvent(
     $title: String!
     $end: String!
     $timeToStart: String!
-    $timeToFinish: String!
+    $timeToEnd: String!
     $hostName: String!
     $start: String!
-    $authToken: String
+    $authToken: String!
+    $orgToken: String!
+    $invitees: [String]!
   ) {
     createEvent(
       title: $title
       end: $end
       timeToStart: $timeToStart
-      timeToEnd: $timeToFinish
+      timeToEnd: $timeToEnd
+      hostName: $hostName
+      start: $start
+      authToken: $authToken
+      orgToken: $orgToken
+      invitees: $invitees
+    ) {
+      end
+      hostName
+      start
+      timeToEnd
+      title
+      timeToStart
+    }
+  }
+`;
+
+export const EDIT_EVENT = gql`
+mutation EditEvent(
+    $eventId: String!
+    $title: String!
+    $end: String!
+    $timeToStart: String!
+    $timeToEnd: String!
+    $hostName: String!
+    $start: String!
+    $authToken: String!
+    $orgToken: String!
+    $invitees: [String]!
+  ) {
+    editEvent(
+      eventId: $eventId
+      title: $title
+      end: $end
+      timeToStart: $timeToStart
+      timeToEnd: $timeToEnd
       hostName: $hostName
       start: $start
       authToken: $authToken
+      orgToken: $orgToken
+      invitees: $invitees
     ) {
       end
       hostName
@@ -41,3 +103,45 @@ export const ADD_EVENT = gql`
     }
   }
 `;
+
+export const CANCEL_EVENT = gql`
+  mutation CancelEvent(
+    $eventId: String!
+    $authToken: String!
+  ) {
+    cancelEvent(
+      eventId: $eventId
+      authToken: $authToken
+    ) {
+      end
+      hostName
+      start
+      timeToEnd
+      title
+      timeToStart
+    }
+  }
+`
+
+export const RESPOND_TO_EVENT_INVITATION = gql`
+  mutation RespondToEventInvitation(
+    $eventToken: String!
+    $authToken: String!
+  ) {
+    respondToEventInvitation(
+      eventToken: $eventToken,
+      authToken: $authToken
+    ) {
+      end
+      hostName
+      start
+      timeToEnd
+      title
+      timeToStart
+      invitees {
+        email,
+        status
+      }
+    }
+  }
+`

src/Mutations/manageStudentMutations.tsx

@@ -12,6 +12,20 @@ export const GET_USERS_QUERY = gql`
   }
 `;
 
+export const GET_ALL_USERS_QUERY = gql`
+  query GetUsers($orgToken: String) {
+    getAllUsers(orgToken: $orgToken) {
+      id
+      email
+      role
+      profile{
+        firstName
+        lastName
+      }
+    }
+  }
+`;
+
 export const DROP_TRAINEE = gql`
   mutation DropTrainee(
     $traineeId: String!
@@ -21,7 +35,12 @@ export const DROP_TRAINEE = gql`
     dropTrainee(traineeId: $traineeId, reason: $reason, date: $date)
   }
 `;
-
+// Define the mutation
+export const UNDROP_TRAINEE = gql`
+  mutation UndropTrainee($traineeId: String!) {
+    undropTrainee(traineeId: $traineeId)
+  }
+`;
 export const GET_TRAINEES_QUERY = gql`
   query GetTrainees($orgToken: String) {
     getTrainees(orgToken: $orgToken) {
@@ -36,6 +55,7 @@ export const GET_TRAINEES_QUERY = gql`
         id
         user {
           id
+          role
           status {
             status
             date