add link to booking tool in approval emails

ITPNYU · May 2, 2024 · 670bc2a · 670bc2a
1 parent f8e124e
commit 670bc2a
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 17 deletions.
diff --git a/media_commons_booking_app/src/client/routes/booking/approval_email.html b/media_commons_booking_app/src/client/routes/booking/approval_email.html
@@ -178,6 +178,9 @@ <h2>Room Reservation Request</h2>
 
       <a href="<?= approvalUrl ?>" target="_blank" class="button">Approve</a>
       <a href="<?= rejectedUrl ?>" target="_blank" class="button-red">Reject</a>
+      <a href="<?= bookingToolUrl ?>" target="_blank" class="button"
+        >Open Booking Tool</a
+      >
     </div>
   </body>
 </html>
diff --git a/media_commons_booking_app/src/client/routes/booking/hooks/useSubmitBooking.tsx b/media_commons_booking_app/src/client/routes/booking/hooks/useSubmitBooking.tsx
@@ -149,20 +149,24 @@ export default function useSubmitBooking(): [
     } else {
       const getApprovalUrl = serverFunctions.approvalUrl(calendarEventId);
       const getRejectedUrl = serverFunctions.rejectUrl(calendarEventId);
-      Promise.all([getApprovalUrl, getRejectedUrl]).then((values) => {
-        const userEventInputs: BookingFormDetails = {
-          calendarEventId,
-          roomId: selectedRoomIds,
-          email,
-          startDate: bookingCalendarInfo?.startStr,
-          endDate: bookingCalendarInfo?.endStr,
-          approvalUrl: values[0],
-          rejectedUrl: values[1],
-          headerMessage: 'This is a request email for first approval.',
-          ...data,
-        };
-        sendApprovalEmail(firstApprovers, userEventInputs);
-      });
+      const getBookingToolUrl = serverFunctions.scriptURL();
+      Promise.all([getApprovalUrl, getRejectedUrl, getBookingToolUrl]).then(
+        (values) => {
+          const userEventInputs: BookingFormDetails = {
+            calendarEventId,
+            roomId: selectedRoomIds,
+            email,
+            startDate: bookingCalendarInfo?.startStr,
+            endDate: bookingCalendarInfo?.endStr,
+            approvalUrl: values[0],
+            rejectedUrl: values[1],
+            bookingToolUrl: values[2],
+            headerMessage: 'This is a request email for first approval.',
+            ...data,
+          };
+          sendApprovalEmail(firstApprovers, userEventInputs);
+        }
+      );
     }
 
     alert('Your request has been sent.');

diff --git a/media_commons_booking_app/src/server/admin.ts b/media_commons_booking_app/src/server/admin.ts
@@ -4,7 +4,7 @@ import {
   getSecondApproverEmail,
 } from '../policy';
 import { BookingFormDetails, BookingStatusLabel } from '../types';
-import { approvalUrl, rejectUrl } from './ui';
+import { approvalUrl, rejectUrl, scriptURL } from './ui';
 import {
   fetchById,
   fetchIndexByUniqueValue,
@@ -20,6 +20,7 @@ export const bookingContents = (id: string): BookingFormDetails => {
   const bookingObj = fetchById(TableNames.BOOKING, id);
   bookingObj.approvalUrl = approvalUrl(id);
   bookingObj.rejectedUrl = rejectUrl(id);
+  bookingObj.bookingToolUrl = scriptURL();
   return bookingObj;
 };
 

diff --git a/media_commons_booking_app/src/server/emails.ts b/media_commons_booking_app/src/server/emails.ts
@@ -1,4 +1,9 @@
-import { Booking, BookingStatusLabel, DevBranch } from '../types';
+import {
+  Booking,
+  BookingFormDetails,
+  BookingStatusLabel,
+  DevBranch,
+} from '../types';
 
 export const sendTextEmail = (
   targetEmail: string,
@@ -26,7 +31,7 @@ const getEmailBranchTag = () => {
 
 export const sendHTMLEmail = (
   templateName: string,
-  contents: Booking,
+  contents: BookingFormDetails,
   targetEmail: string,
   status: BookingStatusLabel,
   eventTitle: string,

diff --git a/media_commons_booking_app/src/types.ts b/media_commons_booking_app/src/types.ts
@@ -19,6 +19,7 @@ export type Booking = Inputs & {
 
 export type BookingFormDetails = Booking & {
   approvalUrl: string;
+  bookingToolUrl: string;
   rejectUrl: string;
   headerMessage?: string;
 };