submit modification

booking-app/app/api/bookings/route.ts

@@ -9,26 +9,27 @@ import {
   declineUrl,
   getBookingToolDeployUrl,
 } from "@/components/src/server/ui";
+import { deleteEvent, insertEvent } from "@/components/src/server/calendars";
 import {
   firstApproverEmails,
   serverApproveInstantBooking,
+  serverBookingContents,
   serverDeleteDataByCalendarEventId,
   serverUpdateDataByCalendarEventId,
 } from "@/components/src/server/admin";
-import { deleteEvent, insertEvent } from "@/components/src/server/calendars";
+import {
+  serverFormatDate,
+  toFirebaseTimestampFromString,
+} from "@/components/src/client/utils/serverDate";
+import {
+  serverGetNextSequentialId,
+  serverSaveDataToFirestore,
+} from "@/lib/firebase/server/adminDb";
 
 import { DateSelectArg } from "fullcalendar";
 import { TableNames } from "@/components/src/policy";
 import { Timestamp } from "firebase-admin/firestore";
 import { sendHTMLEmail } from "@/app/lib/sendHTMLEmail";
-import {
-  serverGetNextSequentialId,
-  serverSaveDataToFirestore,
-} from "@/lib/firebase/server/adminDb";
-import {
-  serverFormatDate,
-  toFirebaseTimestampFromString,
-} from "@/components/src/client/utils/serverDate";
 
 async function createBookingCalendarEvent(
   selectedRooms: RoomSetting[],
@@ -188,6 +189,7 @@ export async function PUT(request: NextRequest) {
   const {
     email,
     selectedRooms,
+    allRooms,
     bookingCalendarInfo,
     data,
     isAutoApproval,
@@ -200,13 +202,20 @@ export async function PUT(request: NextRequest) {
       { status: 500 },
     );
   }
+
+  const existingContents = await serverBookingContents(calendarEventId);
+  const oldRoomIds = existingContents.roomId.split(",").map(x => x.trim());
+  const oldRooms = allRooms.filter((room: RoomSetting) =>
+    oldRoomIds.includes(room.roomId + ""),
+  );
+
   const selectedRoomIds = selectedRooms
     .map((r: { roomId: number }) => r.roomId)
     .join(", ");
 
   // delete existing cal events
   await Promise.all(
-    selectedRooms.map(async room => {
+    oldRooms.map(async room => {
       await deleteEvent(room.calendarId, calendarEventId, room.roomId);
     }),
   );

booking-app/components/src/client/routes/admin/components/BookingActions.tsx

@@ -163,6 +163,7 @@ export default function BookingActions({
     [Actions.MODIFICATION]: {
       action: async () => {
         loadExistingBookingData(calendarEventId);
+        reloadExistingCalendarEvents();
         router.push("/modification/" + calendarEventId);
       },
       optimisticNextStatus: status,

booking-app/components/src/client/routes/booking/components/BookingFormMediaServices.tsx

@@ -39,6 +39,11 @@ export default function BookingFormMediaServices(props: Props) {
   const { selectedRooms } = useContext(BookingContext);
   const roomIds = selectedRooms.map((room) => room.roomId);
 
+  const limitedContexts = [
+    FormContextLevel.WALK_IN,
+    FormContextLevel.MODIFICATION,
+  ];
+
   const checkboxes = useMemo(() => {
     const options: MediaServices[] = [];
     const checkRoomMediaServices = (list: number[]) =>
@@ -74,7 +79,7 @@ export default function BookingFormMediaServices(props: Props) {
                 if (!e.target.checked) {
                   // de-select boxes if switch says "no media services"
                   field.onChange("");
-                } else if (formContext === FormContextLevel.WALK_IN) {
+                } else if (limitedContexts.includes(formContext)) {
                   field.onChange(MediaServices.CHECKOUT_EQUIPMENT);
                 }
 
@@ -88,7 +93,7 @@ export default function BookingFormMediaServices(props: Props) {
     ></Controller>
   );
 
-  if (formContext === FormContextLevel.WALK_IN) {
+  if (limitedContexts.includes(formContext)) {
     return (
       <div style={{ marginBottom: 8 }}>
         <Label htmlFor={id}>Media Services</Label>