Merge branch 'develop' into multitenancy

chpy04 · chpy04 · commit cb4127385338 · 2026-03-18T09:14:18.000-04:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build stage - compile TypeScript
-FROM node:20 AS builder
+FROM node:25 AS builder
 WORKDIR /app
 
 COPY package.json tsconfig.build.json ./
@@ -11,11 +11,11 @@ RUN cd src/backend && npx prisma generate
 RUN yarn build:shared
 RUN yarn build:backend
 
-FROM node:20-slim
+FROM platformatic/node-caged:25-slim
 WORKDIR /app
 
 # Install OpenSSL for Prisma (slim image needs this)
-RUN apt-get update -y && apt-get install -y openssl && rm -rf /var/lib/apt/lists/*
+RUN apt-get update -y && apt-get install -y openssl && rm -rf /var/lib/apt/lists/* && npm install -g yarn
 
 COPY package.json ./
 
diff --git a/devContainerization/Dockerfile.backend.dev b/devContainerization/Dockerfile.backend.dev
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:25
 
 COPY package.json tsconfig.build.json ./
 COPY ./src/backend/package.json ./src/backend/tsconfig.json src/backend/
diff --git a/devContainerization/Dockerfile.frontend.dev b/devContainerization/Dockerfile.frontend.dev
@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:25-alpine
 
 COPY package.json tsconfig.build.json ./
 COPY ./src/frontend/package.json ./src/frontend/tsconfig.json src/frontend/
@@ -11,4 +11,4 @@ COPY ./src/frontend src/frontend
 COPY ./src/shared src/shared
 
 EXPOSE 3000
-CMD [ "yarn", "workspace", "frontend", "vite", "--force", "--host" ]
+CMD [ "yarn", "workspace", "frontend", "vite", "--force", "--host" ]
diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "@babel/preset-typescript": "^7.18.6",
     "@types/canvas-confetti": "^1.9.0",
     "@types/jest": "^29.5.14",
-    "@types/node": "20.0.0",
+    "@types/node": "^25.0.0",
     "@typescript-eslint/eslint-plugin": "8.20.0",
     "@typescript-eslint/parser": "8.20.0",
     "concurrently": "^9.1.0",
diff --git a/src/backend/Dockerfile b/src/backend/Dockerfile
@@ -1,5 +1,6 @@
 # TO BE RUN FROM DOCKER COMPOSE. DO NOT RUN MANUALLY AS CONTEXT IS NOT SET CORRECTLY
-FROM node:20
+FROM platformatic/node-caged:25-slim
+RUN npm install -g yarn
 
 WORKDIR /base
 
diff --git a/src/backend/package.json b/src/backend/package.json
@@ -39,7 +39,7 @@
   "devDependencies": {
     "@types/express-jwt": "^6.0.4",
     "@types/jsonwebtoken": "^8.5.9",
-    "@types/node": "^20.0.0",
+    "@types/node": "^25.0.0",
     "@types/supertest": "^2.0.12",
     "nodemon": "^2.0.16",
     "supertest": "^6.2.4",
diff --git a/src/backend/src/services/notifications.services.ts b/src/backend/src/services/notifications.services.ts
@@ -118,7 +118,7 @@ export default class NotificationsService {
   }
 
   /**
-   * Sends the design review slack notifications for all design reviews scheduled for today
+   * Sends Slack notifications for all events scheduled for today whose event type has sendSlackNotifications enabled
    */
   static async sendEventSlackNotifications() {
     const endOfToday = startOfDayTomorrow();
@@ -142,6 +142,8 @@ export default class NotificationsService {
         optionalMembers: { include: { userSettings: true } },
         userCreated: { include: { userSettings: true } },
         scheduledTimes: true,
+        teams: true,
+        eventType: true,
         workPackages: {
           include: {
             wbsElement: true,
@@ -156,12 +158,18 @@ export default class NotificationsService {
       }
     });
 
-    const desginReviewEventTeamMap = new Map<string, EventWithAttendees[]>();
+    const eventTeamMap = new Map<string, EventWithAttendees[]>();
 
     events.forEach((event) => {
-      // Get all unique teams from all work packages associated with this event
+      // Collect unique team Slack IDs: first from teams directly on the event, then from work packages
       const teamSlackIds = new Set<string>();
 
+      event.teams.forEach((team) => {
+        if (team.slackId) {
+          teamSlackIds.add(team.slackId);
+        }
+      });
+
       event.workPackages.forEach((workPackage) => {
         workPackage.project.teams.forEach((team) => {
           if (team.slackId) {
@@ -171,7 +179,7 @@ export default class NotificationsService {
       });
 
       teamSlackIds.forEach((teamSlackId) => {
-        const currentEvents = desginReviewEventTeamMap.get(teamSlackId);
+        const currentEvents = eventTeamMap.get(teamSlackId);
         const eventWithAttendees = {
           ...event,
           attendees: event.requiredMembers.concat(event.optionalMembers).concat(event.userCreated),
@@ -181,20 +189,20 @@ export default class NotificationsService {
         if (currentEvents) {
           currentEvents.push(eventWithAttendees);
         } else {
-          desginReviewEventTeamMap.set(teamSlackId, [eventWithAttendees]);
+          eventTeamMap.set(teamSlackId, [eventWithAttendees]);
         }
       });
     });
 
-    // Send the notifications to each team for their respective design reviews
-    const promises = Array.from(desginReviewEventTeamMap).map(async ([slackId, events]) => {
+    // Send the notifications to each team for their respective events
+    const promises = Array.from(eventTeamMap).map(async ([slackId, events]) => {
       const messageBlock = events
         .map((event) => {
           const zoomLink = event.zoomLink ? `<${event.zoomLink}|Zoom Link>\n` : '';
           const questionDocLink = event.questionDocumentLink ? `<${event.questionDocumentLink}|Question Doc Link>\n` : '';
 
-          // Get work package names for this event
           const workPackageNames = event.workPackages.map((wp) => wp.wbsElement.name).join(', ');
+          const workPackagesPart = workPackageNames ? ` (${workPackageNames})` : '';
 
           // Get the earliest scheduled start time for display
           const [earliestSlot] = event.scheduledTimes
@@ -203,17 +211,17 @@ export default class NotificationsService {
           const timeDisplay = earliestSlot ? formatTimeForSlack(new Date(earliestSlot.startTime!)) : 'TBD';
 
           return (
-            `${usersToSlackPings(event.attendees ?? [])} ${event.title} (${workPackageNames}) ` +
+            `${usersToSlackPings(event.attendees ?? [])} *${event.eventType.name}*: ${event.title}${workPackagesPart} ` +
             `will be having an event today at ${timeDisplay} ET! ` +
             zoomLink +
             questionDocLink
           );
         })
         .join('\n\n');
 
-      // messageBlock will be empty if there are design reviews with no attendees
+      // messageBlock will be empty if there are events with no attendees
       if (messageBlock !== '')
-        await sendMessage(slackId, ':calendar: :clock9: Upcoming Design Reviews! :clock9: :calendar: \n\n\n' + messageBlock);
+        await sendMessage(slackId, ':calendar: :clock9: Upcoming Events! :clock9: :calendar: \n\n\n' + messageBlock);
     });
 
     await Promise.all(promises);
diff --git a/src/backend/src/utils/notifications.utils.ts b/src/backend/src/utils/notifications.utils.ts
@@ -1,4 +1,4 @@
-import { Task as Prisma_Task, WBS_Element, Event, Work_Package } from '@prisma/client';
+import { Task as Prisma_Task, WBS_Element, Event, Work_Package, Team, Event_Type } from '@prisma/client';
 import { UserWithSettings } from './auth.utils.js';
 import { ScheduleSlot } from 'shared';
 
@@ -10,6 +10,8 @@ export type TaskWithAssignees = Prisma_Task & {
 export type EventWithAttendees = Event & {
   attendees: UserWithSettings[];
   scheduledTimes: ScheduleSlot[];
+  teams: Team[];
+  eventType: Event_Type;
   workPackages: (Work_Package & {
     wbsElement: WBS_Element;
   })[];
diff --git a/src/docs-site/README.md b/src/docs-site/README.md
@@ -246,7 +246,7 @@ If your changes aren't appearing:
 
 Common issues:
 
-- **Node version**: Ensure you're running Node.js 18 or higher
+- **Node version**: Ensure you're running Node.js 18 or higher (although you should be running node 25 for the main site development)
 - **Dependencies**: From the root directory, try `rm -rf docs-site/node_modules && yarn install`
 - **Port conflict**: Docs run on port 3002. If it's in use, Docusaurus will try another port or you can stop the conflicting process
 
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -58,7 +58,7 @@
     "@testing-library/react": "^16.2.0",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.6.0",
-    "@types/node": "20.0.0",
+    "@types/node": "^25.0.0",
     "@types/react": "^19.0.7",
     "@types/react-dom": "^19.0.3",
     "@types/react-helmet": "^6.1.6",
diff --git a/src/frontend/src/apis/finance.api.ts b/src/frontend/src/apis/finance.api.ts
@@ -327,7 +327,7 @@ export const downloadBlobsToPdf = async (blobData: Blob[], filename: string) =>
         break;
       }
       default: {
-        console.log(blob.type + 'type not supported and will not be added to the PDF, name: ' + blob.name);
+        console.log(blob.type + ' type not supported and will not be added to the PDF');
         // throw new Error(blob.type + ' type not supported');
       }
     }
diff --git a/src/frontend/src/pages/AdminToolsPage/EditGuestView/EditLogo.tsx b/src/frontend/src/pages/AdminToolsPage/EditGuestView/EditLogo.tsx
@@ -67,7 +67,7 @@ const EditLogo = () => {
         <EditLogoForm
           onSubmit={onSubmit}
           onHide={handleClose}
-          orgLogo={imageData ? new File([imageData], imageData.name, { type: imageData.type }) : undefined}
+          orgLogo={imageData ? new File([imageData], 'logo', { type: imageData.type }) : undefined}
         />
       ) : (
         <>
diff --git a/src/frontend/src/pages/AdminToolsPage/ScheduleConfig/EventType/EventTypeFormModal.tsx b/src/frontend/src/pages/AdminToolsPage/ScheduleConfig/EventType/EventTypeFormModal.tsx
@@ -1,11 +1,11 @@
-import { Box, FormHelperText, Typography, Checkbox, FormControl, Select, MenuItem } from '@mui/material';
+import { Box, FormHelperText, Typography, Checkbox, FormControl, Select, MenuItem, Tooltip } from '@mui/material';
 import NERFormModal from '../../../../components/NERFormModal';
 import ReactHookTextField from '../../../../components/ReactHookTextField';
 import { useToast } from '../../../../hooks/toasts.hooks';
 import { useForm, Controller } from 'react-hook-form';
 import * as yup from 'yup';
 import { yupResolver } from '@hookform/resolvers/yup';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { EventType } from 'shared';
 import useFormPersist from 'react-hook-form-persist';
 import { FormStorageKey } from '../../../../utils/form';
@@ -116,6 +116,16 @@ export const EventTypeFormModal: React.FC<EventTypeFormModalProps> = ({ open, on
     setValue
   });
 
+  const watchTeams = watch('teams');
+  const watchWorkPackage = watch('workPackage');
+  const notificationsDisabled = !watchTeams && !watchWorkPackage;
+
+  useEffect(() => {
+    if (notificationsDisabled) {
+      setValue('sendSlackNotifications', false);
+    }
+  }, [notificationsDisabled, setValue]);
+
   const onFormSubmit = async (data: EventTypeFormValues) => {
     try {
       await onSubmit(data);
@@ -829,12 +839,22 @@ export const EventTypeFormModal: React.FC<EventTypeFormModalProps> = ({ open, on
             control={control}
             name="sendSlackNotifications"
             render={({ field: { onChange, value } }) => (
-              <Checkbox checked={value} onChange={onChange} sx={{ color: 'white', '&.Mui-checked': { color: 'white' } }} />
+              <Checkbox
+                checked={value}
+                onChange={onChange}
+                disabled={notificationsDisabled}
+                sx={{ color: 'white', '&.Mui-checked': { color: 'white' } }}
+              />
             )}
           />
-          <NotificationsIcon sx={{ color: 'white', mr: 1 }} />
+          <Tooltip
+            title={notificationsDisabled ? 'Slack notifications cannot be sent without teams or work packages enabled' : ''}
+            placement="right"
+          >
+            <NotificationsIcon sx={{ color: notificationsDisabled ? 'rgba(255,255,255,0.3)' : 'white', mr: 1 }} />
+          </Tooltip>
           <Box sx={{ flex: 1 }}>
-            <Typography variant="body2" sx={{ color: 'white' }}>
+            <Typography variant="body2" sx={{ color: notificationsDisabled ? 'rgba(255,255,255,0.3)' : 'white' }}>
               Send Slack Notifications
             </Typography>
           </Box>
diff --git a/src/frontend/src/pages/CalendarPage/Components/EventModal.tsx b/src/frontend/src/pages/CalendarPage/Components/EventModal.tsx
@@ -54,6 +54,8 @@ import HelpOutlineIcon from '@mui/icons-material/HelpOutline';
 import Tooltip from '@mui/material/Tooltip';
 import { convertDayToInt, convertIntToDay } from '../../../utils/calendar.utils';
 import EditSeriesConfirmationModal from './EditSeriesConfirmationModal';
+import NotificationsIcon from '@mui/icons-material/Notifications';
+import WarningAmberIcon from '@mui/icons-material/WarningAmber';
 
 export interface EventFormValues {
   title: string;
@@ -237,6 +239,9 @@ const EventModal: React.FC<BaseEventModalProps> = ({
   const [pendingPayload, setPendingPayload] = useState<EventPayload | null>(null);
   const [pendingFormData, setPendingFormData] = useState<EventFormValues | null>(null);
 
+  // used in edit mode for ability to send notifs when wp changes
+  const [workPackageIds, setWorkPackageIds] = useState<string[]>(initialValues?.workPackageIds ?? []);
+
   // Fetch preview of other schedule slots that would be affected when editing with "edit all in series"
   const isEditMode = !!initialValues;
   const scheduleSlotId = initialValues?.selectedScheduleSlotId;
@@ -1151,6 +1156,43 @@ const EventModal: React.FC<BaseEventModalProps> = ({
               )}
             </Box>
           )}
+          {/* Notification Section */}
+          {selectedEventType && (
+            <Box sx={{ display: 'flex', alignItems: 'center', gap: 2 }}>
+              <NotificationsIcon sx={{ color: 'text.secondary' }} />
+              <Tooltip
+                arrow
+                placement="right"
+                title={
+                  !selectedEventType.sendSlackNotifications
+                    ? 'Slack notifications are disabled for this event type.'
+                    : selectedTeams.length || workPackageIds.length
+                      ? 'Slack notifications will be sent for this event.'
+                      : ''
+                }
+              >
+                <Box sx={{ display: 'flex', alignItems: 'center', gap: 1, cursor: 'default' }}>
+                  <Typography variant="body2" color={'text.disabled'} fontWeight={500}>
+                    {selectedEventType.sendSlackNotifications ? 'On' : 'Off'}
+                  </Typography>
+                  {selectedEventType.sendSlackNotifications && !selectedTeams.length && !workPackageIds.length && (
+                    <Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5 }}>
+                      <WarningAmberIcon sx={{ color: 'error.main', fontSize: 18 }} />
+                      <Typography variant="body2" color="error.main">
+                        Add{' '}
+                        {selectedEventType.teams && selectedEventType.workPackage
+                          ? 'a team or work package'
+                          : selectedEventType.teams
+                            ? 'a team'
+                            : 'a work package'}{' '}
+                        to send notifications
+                      </Typography>
+                    </Box>
+                  )}
+                </Box>
+              </Tooltip>
+            </Box>
+          )}
           {/* Required Members Section */}
           {selectedEventType?.requiredMembers && (
             <Box sx={{ display: 'flex', alignItems: 'flex-start', gap: 2 }}>
@@ -1417,7 +1459,9 @@ const EventModal: React.FC<BaseEventModalProps> = ({
                     value={workPackageOptions.find((wp) => value?.[0] === wp.id) || null}
                     onChange={(_, newValue) => {
                       if (newValue?.id !== 'loading') {
-                        onChange(newValue ? [newValue.id] : []);
+                        const ids = newValue ? [newValue.id] : [];
+                        onChange(ids);
+                        setWorkPackageIds(ids);
                       }
                     }}
                     getOptionLabel={(option) => option.label}
diff --git a/src/frontend/src/pages/CalendarPage/EventClickPopup.tsx b/src/frontend/src/pages/CalendarPage/EventClickPopup.tsx
@@ -39,7 +39,7 @@ import EditEventModal from './Components/EditEventModal';
 import DeleteSeriesConfirmationModal from './Components/DeleteSeriesConfirmationModal';
 import { useToast } from '../../hooks/toasts.hooks';
 import NERDeleteModal from '../../components/NERDeleteModal';
-
+import NotificationsIcon from '@mui/icons-material/Notifications';
 import { getPendingReason } from '../../utils/calendar.utils';
 
 export const getStatusIcon = (status: string, isLarge?: boolean) => {
@@ -436,6 +436,9 @@ export const EventClickContent: React.FC<EventClickContentProps> = ({
             <Typography variant="body2" sx={{ flex: 1 }}>
               <b>Status:</b> {event.status}
             </Typography>
+            {specificEventType?.sendSlackNotifications && (event.teams.length > 0 || event.workPackages.length > 0) && (
+              <NotificationsIcon sx={{ color: 'white', fontSize: 18, mt: '3px', flexShrink: 0 }} />
+            )}
           </Stack>
         )}
 
diff --git a/src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/ProjectViewContainer.tsx b/src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/ProjectViewContainer.tsx
@@ -4,7 +4,7 @@
  */
 
 import { Link, useHistory } from 'react-router-dom';
-import { Project, isGuest, isAdmin, isLeadership } from 'shared';
+import { Project, isGuest, isAdmin, isLeadership, RoleEnum } from 'shared';
 import { projectWbsPipe, wbsPipe } from '../../../utils/pipes';
 import ProjectDetails from './ProjectDetails';
 import { routes } from '../../../utils/routes';
@@ -207,7 +207,7 @@ const ProjectViewContainer: React.FC<ProjectViewContainerProps> = ({ project, en
       {tab === 0 ? (
         <ProjectDetails project={project} />
       ) : tab === 1 ? (
-        <TaskList project={project} />
+        <TaskList project={project} isGuest={user.role === RoleEnum.GUEST} />
       ) : tab === 2 ? (
         <BOMTab project={project} />
       ) : tab === 3 ? (
diff --git a/src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/GuestTasksList.tsx b/src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/GuestTasksList.tsx
diff --git a/src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/v2/TaskList.tsx b/src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/v2/TaskList.tsx
diff --git a/src/shared/package.json b/src/shared/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM node:20`
	`1`	`+FROM node:25`
`2`	`2`
`3`	`3`	`COPY package.json tsconfig.build.json ./`
`4`	`4`	`COPY ./src/backend/package.json ./src/backend/tsconfig.json src/backend/`