merge with dev

Author: chpy04

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/backend/src/services/work-packages.services.ts

@@ -183,7 +183,6 @@ export default class WorkPackagesService {
       },
       include: {
         workPackages: {
-          where: { wbsElement: { dateDeleted: null } },
           include: {
             wbsElement: true
           }
@@ -240,7 +239,7 @@ export default class WorkPackagesService {
         project: { connect: { projectId } },
         startDate: date,
         duration,
-        orderInProject: project.workPackages.length + 1,
+        orderInProject: project.workPackages.filter((wp) => !wp.wbsElement.dateDeleted).length + 1,
         blockedBy: { connect: blockedByElements.map((ele) => ({ wbsElementId: ele.wbsElementId })) }
       },
       ...getWorkPackageQueryArgs(organization.organizationId)

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

@@ -72,18 +72,23 @@ const FinalizeDesignReviewDetailsModal = ({
   };
 
   const onSubmit = async (data: { docTemplateLink: string; zoomLink?: string; location?: string }) => {
-    finalizeDesignReview({ ...data, meetingType });
+    finalizeDesignReview({ ...data, zoomLink: data.zoomLink ? data.zoomLink : undefined, meetingType });
     setOpen(false);
   };
 
   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/CalendarPage/DesignReviewDetailPage/UserAvailabilitesView.tsx

@@ -60,7 +60,7 @@ const UserAvailabilites: React.FC<UserAvailabilitiesProps> = ({
         }}
       >
         <Box sx={{ display: 'flex', justifyContent: 'center' }}>
-          <Typography style={{ marginRight: '10px' }}>0/0</Typography>
+          <Typography style={{ marginRight: '10px' }}>0/{totalUsers}</Typography>
           {Array.from({ length: 6 }, (_, i) => (
             <Box
               sx={{

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/LoginPage/LoginPage.tsx

@@ -31,7 +31,11 @@ const LoginPage: React.FC<LoginPageProps> = ({ devSetUser, devFormSubmit, prodSu
       <CardContent>
         <Typography variant="h5">FinishLine by NER</Typography>
         <Typography variant="body1" sx={{ mb: 1 }}>
-          Login Required. Students must use their Husky Google account.
+          Students must use their Husky Google account to login.
+          <br />
+          <br />
+          This means if your email is 'last.first@northeastern.edu', login to Google with the email
+          'last.first@husky.neu.edu'
         </Typography>
         {import.meta.env.MODE === 'development' ? loginDev : googleLogin}
       </CardContent>

src/frontend/src/pages/SettingsPage/UserScheduleSettings/Availability/EditAvailability.tsx

@@ -24,10 +24,27 @@ const EditAvailability: React.FC<EditAvailabilityProps> = ({
   initialDate,
   canChangeDateRange = true
 }) => {
-  console.log(editedAvailabilities);
-  const [currentlyDisplayedAvailabilities, setCurrentlyDisplayedAvailabilities] = useState(
-    Array.from(editedAvailabilities.values())
-  );
+  const [currentlyDisplayedAvailabilities, setCurrentlyDisplayedAvailabilities] = useState(() => {
+    const availabilities = Array.from(editedAvailabilities.values());
+    if (availabilities.length === 0) {
+      const defaultAvailabilities: Availability[] = [];
+      for (let i = 0; i < 7; i++) {
+        const date = addDaysToDate(initialDate, i);
+        defaultAvailabilities.push({
+          dateSet: date,
+          availability: []
+        });
+      }
+
+      defaultAvailabilities.forEach((availability) => {
+        editedAvailabilities.set(availability.dateSet.getTime(), availability);
+      });
+      setEditedAvailabilities(editedAvailabilities);
+
+      return defaultAvailabilities;
+    }
+    return availabilities;
+  });
 
   const [isDragging, setIsDragging] = useState(false);
 
@@ -106,7 +123,7 @@ const EditAvailability: React.FC<EditAvailabilityProps> = ({
     <Grid container>
       <Grid container justifyContent="space-between" mb={1}>
         <Typography display={'flex'} justifyContent={'flex-start'} mt={1} variant="subtitle1">
-          Available times in red
+          Available times in green
         </Typography>
         <NERButton variant="outlined" sx={{ display: 'flex', justifyContent: 'flex-end' }} onClick={invertAvailabilities}>
           Invert Availability

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">

src/frontend/src/utils/design-review.utils.ts

@@ -50,7 +50,7 @@ export enum REVIEW_TIMES {
 
 export const HOURS: number[] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11];
 
-export const HeatmapColors = ['#D9D9D9', '#E0C0C1', '#E89A9B', '#E4797A', '#EF4345', '#D70C0F'];
+export const HeatmapColors = ['#D9D9D9', '#C1E0C1', '#9BE89B', '#7AE47A', '#45EF45', '#0FD70F'];
 
 export const NUMBER_OF_TIME_SLOTS = enumToArray(REVIEW_TIMES).length * enumToArray(DAY_NAMES).length;