Merge branch 'develop' into multitenancy

Author: walker-sean

src/backend/src/services/change-requests.services.ts

@@ -146,7 +146,7 @@ export default class ChangeRequestsService {
             dateReviewed: null
           },
           {
-            NOT: { scopeChangeRequest: null }
+            NOT: [{ scopeChangeRequest: null }, { submitterId: user.userId }]
           }
         ],
         organizationId: organization.organizationId,

src/frontend/src/pages/CalendarPage/DesignReviewDetailPage/FinalizeDesignReviewDetailsModal.tsx

@@ -77,13 +77,18 @@ const FinalizeDesignReviewDetailsModal = ({
   };
 
   useEffect(() => {
-    if (userScheduleSettings && !designReview.zoomLink) {
+    if (userScheduleSettings && designReview.isOnline && !designReview.zoomLink) {
       reset({
         docTemplateLink: designReview.docTemplateLink ?? '',
         zoomLink: userScheduleSettings.personalZoomLink ?? '',
         location: designReview.location ?? undefined
       });
     }
+    if (designReview.zoomLink === '' && !designReview.isOnline) {
+      reset({
+        zoomLink: undefined
+      });
+    }
   }, [userScheduleSettings, designReview, reset]);
 
   return (

src/frontend/src/pages/ChangeRequestDetailPage/DiffSection/DiffSection.tsx

@@ -4,6 +4,8 @@ import { StandardChangeRequest } from 'shared';
 import ProjectDiffSection from './ProjectDiffSection';
 import WorkPackageDiffSection from './WorkPackageDiffSection';
 import LoadingIndicator from '../../../components/LoadingIndicator';
+import DiffSectionEdit from './DiffSectionEdit';
+import { getChangesForWorkPackage } from '../../../utils/diff-page.utils';
 interface DiffSectionProps {
   changeRequest: StandardChangeRequest;
 }
@@ -18,7 +20,11 @@ const DiffSection: React.FC<DiffSectionProps> = ({ changeRequest }) => {
         projectProposedChanges ? (
           <ProjectDiffSection projectProposedChanges={projectProposedChanges} wbsNum={wbsNum} />
         ) : workPackageProposedChanges ? (
-          <WorkPackageDiffSection workPackageProposedChanges={workPackageProposedChanges} wbsNum={wbsNum} />
+          wbsNum.workPackageNumber === 0 ? (
+            <DiffSectionEdit collections={[getChangesForWorkPackage(undefined, workPackageProposedChanges)]} />
+          ) : (
+            <WorkPackageDiffSection workPackageProposedChanges={workPackageProposedChanges} wbsNum={wbsNum} />
+          )
         ) : (
           <></>
         )

src/frontend/src/pages/TeamsPage/TeamSpecificPage.tsx

@@ -153,7 +153,7 @@ const TeamSpecificPage: React.FC = () => {
           {TeamActionsDropdown}
         </Stack>
       }
-      title={`${data.teamName} - ${data.teamType}`}
+      title={`${data.teamName} ${data.teamType ? `- ${data.teamType?.name}` : ''}`}
       chips={
         data.dateArchived ? (
           <Box display="flex" gap="20px">