1:1 version in EditEventModal

Author: glickgNU

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

@@ -243,6 +243,7 @@ export default class CalendarService {
    * @param shopIds An array of shops associated with the event.
    * @param machineryIds An array of machinery associated with the event.
    * @param workPackageIds An array of work packages associated with the event.
+   * @param scheduleSlots An array of schedule slots associated with the event.
    * @param questionDocumentLink The link to the question document.
    * @param location Location of the event.
    * @param zoomLink Zoom Link if the event is online.

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

@@ -4,7 +4,7 @@ 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 { AlertColor } from '@mui/material';
+import ErrorPage from '../../ErrorPage';
 import LoadingIndicator from '../../../components/LoadingIndicator';
 
 export interface EditEventModalProps {
@@ -20,13 +20,8 @@ const EditEventModal: React.FC<EditEventModalProps> = ({ open, onClose, event, e
   const { mutateAsync: uploadDocuments } = useUploadManyDocuments();
   const { mutateAsync: editScheduleSlot } = useEditScheduleSlot(event.eventId, event.scheduleSlotId);
 
-  if (isError) {
-    editEventModalError(error, toast);
-  }
-
-  if (isLoading) {
-    return <LoadingIndicator />;
-  }
+  if (isError) return <ErrorPage message={error?.message} />;
+  if (isLoading) return <LoadingIndicator />;
 
   const initialValues = convertEventToFormValues(event);
 
@@ -69,7 +64,12 @@ const EditEventModal: React.FC<EditEventModalProps> = ({ open, onClose, event, e
 
       toast.success('Event updated successfully!');
     } catch (e: unknown) {
-      editEventModalError(e, toast);
+      if (e instanceof Error) {
+        toast.error(e.message, 5000);
+      } else {
+        toast.error('Failed to update event', 5000);
+      }
+      throw e;
     }
   };
 
@@ -87,20 +87,3 @@ const EditEventModal: React.FC<EditEventModalProps> = ({ open, onClose, event, e
 };
 
 export default EditEventModal;
-function editEventModalError(
-  e: unknown,
-  toast: {
-    fire: (message: string, options: { type: AlertColor; autoHideDuration?: number }) => void;
-    info(message: string, autoHideDuration?: number): void;
-    success(message: string, autoHideDuration?: number): void;
-    warning(message: string, autoHideDuration?: number): void;
-    error(message: string, autoHideDuration?: number): void;
-  }
-) {
-  if (e instanceof Error) {
-    toast.error(e.message, 5000);
-  } else {
-    toast.error('Failed to update event', 5000);
-  }
-  throw e;
-}