Merge pull request #4277 from Northeastern-Electric-Racing/#4269-Event-Updating-Slack-Message

#4269 event updating slack message

Author: wavehassman

src/backend/src/controllers/calendar.controllers.ts

@@ -283,7 +283,7 @@ export default class CalendarController {
         mention
       } = req.body;
 
-      const parsedScheduleSlots = scheduleSlots.map((slot: any) => ({
+      const parsedScheduleSlots = scheduleSlots.map((slot: { allDay: boolean; startTime?: string; endTime?: string }) => ({
         startTime: slot.startTime ? new Date(slot.startTime) : undefined,
         endTime: slot.endTime ? new Date(slot.endTime) : undefined,
         allDay: slot.allDay

src/backend/src/services/calendar.services.ts

@@ -1527,20 +1527,20 @@ export default class CalendarService {
         data: { availability: updatedAvailability }
       });
     }
-
     const { eventTypeId } = updatedEvent;
     const foundEventType = await prisma.event_Type.findUnique({
       where: { eventTypeId }
     });
-
+    const edittedEvent = eventTransformer(updatedEvent);
     if (foundEventType?.sendSlackNotifications) {
       await sendEventScheduledSlackNotif(
         updatedEvent.notificationSlackThreads,
         eventTransformer(updatedEvent),
         event.status === Event_Status.SCHEDULED
       );
     }
-    return eventTransformer(updatedEvent);
+
+    return edittedEvent;
   }
 
   /**

src/frontend/src/pages/CalendarPage/Components/EditEventModal.tsx

@@ -4,6 +4,8 @@ import type { EventInstance, EventType, EventDocumentUploadArgs } from 'shared';
 import { convertEventToFormValues } from '../../../utils/calendar.utils';
 import { useEditEvent, useEditScheduleSlot, useUploadManyDocuments } from '../../../hooks/calendar.hooks';
 import { useToast } from '../../../hooks/toasts.hooks';
+import ErrorPage from '../../ErrorPage';
+import LoadingIndicator from '../../../components/LoadingIndicator';
 
 export interface EditEventModalProps {
   open: boolean;
@@ -14,9 +16,23 @@ export interface EditEventModalProps {
 
 const EditEventModal: React.FC<EditEventModalProps> = ({ open, onClose, event, eventTypes }) => {
   const toast = useToast();
-  const { mutateAsync: editEvent } = useEditEvent(event.eventId);
-  const { mutateAsync: editScheduleSlot } = useEditScheduleSlot(event.eventId, event.scheduleSlotId);
+  const {
+    isLoading: editEventIsLoading,
+    isError: editEventIsError,
+    error: editEventError,
+    mutateAsync: editEvent
+  } = useEditEvent(event.eventId);
   const { mutateAsync: uploadDocuments } = useUploadManyDocuments();
+  const {
+    isLoading: editScheduleSlotIsLoading,
+    isError: editScheduleSlotIsError,
+    error: editScheduleSlotError,
+    mutateAsync: editScheduleSlot
+  } = useEditScheduleSlot(event.eventId, event.scheduleSlotId);
+
+  if (editEventIsError) return <ErrorPage message={editEventError?.message} />;
+  if (editScheduleSlotIsError) return <ErrorPage message={editScheduleSlotError?.message} />;
+  if (editEventIsLoading || editScheduleSlotIsLoading) return <LoadingIndicator />;
 
   const initialValues = convertEventToFormValues(event);
 
@@ -34,8 +50,6 @@ const EditEventModal: React.FC<EditEventModalProps> = ({ open, onClose, event, e
         }))
       };
 
-      const editedEvent = await editEvent(editArgs);
-
       // If there are schedule slot changes, update the schedule slot separately
       if (editScheduleSlotArgs) {
         await editScheduleSlot({
@@ -46,6 +60,8 @@ const EditEventModal: React.FC<EditEventModalProps> = ({ open, onClose, event, e
         });
       }
 
+      const editedEvent = await editEvent(editArgs);
+
       // Handle document uploads
       const filesToUpload = documentFiles
         .map((doc: EventDocumentUploadArgs) => doc.file)