Merge branch 'multitenancy' into develop

Author: Peyton-McKee

src/frontend/src/components/NERModal.tsx

@@ -14,6 +14,7 @@ export interface NERModalProps {
   onSubmit?: () => void;
   onHide: () => void;
   children?: ReactNode;
+  titleChildren?: ReactNode;
   cancelText?: CancelText;
   submitText?: SubmitText;
   disabled?: boolean;
@@ -38,7 +39,8 @@ const NERModal = ({
   hideFormButtons = false,
   hideBackDrop = false,
   icon,
-  paperProps
+  paperProps,
+  titleChildren
 }: NERModalProps) => {
   return (
     <Dialog
@@ -51,7 +53,7 @@ const NERModal = ({
           : { borderRadius: '10px', maxWidth: '700px' }
       }}
     >
-      <DialogTitle sx={{ backgroundColor: background, minHeight: '64px' }}>
+      <DialogTitle sx={{ backgroundColor: background, minHeight: '64px', position: 'relative' }}>
         {icon ? (
           <Box display="flex" justifyContent="left" alignItems="center">
             <Icon
@@ -73,6 +75,7 @@ const NERModal = ({
         ) : (
           title
         )}
+        {titleChildren}
       </DialogTitle>
 
       {showCloseButton && (

src/frontend/src/pages/CalendarPage/DesignReviewSummaryModal.tsx

@@ -72,9 +72,7 @@ const DRCSummaryModal: React.FC<DRCSummaryModalProps> = ({ open, onHide, designR
       icon={getTeamTypeIcon(designReview.teamType.teamTypeId, true)}
       hideBackDrop
       showCloseButton
-    >
-      <Box minWidth="550px">
-        <DeleteModal />
+      titleChildren={
         <Box position="absolute" right="52px" top="12px">
           {isDesignReviewCreator && (
             <>
@@ -98,6 +96,10 @@ const DRCSummaryModal: React.FC<DRCSummaryModalProps> = ({ open, onHide, designR
             <CheckCircle />
           </IconButton>
         </Box>
+      }
+    >
+      <Box minWidth="550px">
+        <DeleteModal />
 
         <Box>
           <Box display={'flex'} alignItems={'center'}>