Merge branch 'develop' into multitenancy

Author: chpy04

src/backend/src/services/notifications.services.ts

@@ -3,11 +3,13 @@ import {
   TaskWithAssignees,
   endOfDayTomorrow,
   startOfDayTomorrow,
+  startOfTodayEST,
+  startOfTomorrowEST,
   usersToSlackPings,
   EventWithAttendees
 } from '../utils/notifications.utils.js';
 import { sendMessage } from '../integrations/slack.js';
-import { daysBetween, startOfDay, wbsPipe, formatTimeForSlack } from 'shared';
+import { daysBetween, wbsPipe, formatTimeForSlack } from 'shared';
 import { buildDueString, sendThreadResponse } from '../utils/slack.utils.js';
 import WorkPackagesService from './work-packages.services.js';
 import { addWeeksToDate } from 'shared';
@@ -30,7 +32,7 @@ export default class NotificationsService {
   static async sendTaskDeadlineSlackNotifications() {
     const endOfDay = endOfDayTomorrow();
 
-    if (endOfDay.getDay() === 0 || endOfDay.getDay() === 2 || endOfDay.getDay() === 4) return;
+    if (endOfDay.getUTCDay() === 0 || endOfDay.getUTCDay() === 2 || endOfDay.getUTCDay() === 4) return;
 
     const tasks = await prisma.task.findMany({
       where: {
@@ -81,7 +83,8 @@ export default class NotificationsService {
       const messageBlock = tasks
         .map((task) => {
           // prisma call earlier allows the forced unwrap (deadline is guaranteed to be a non-null value)
-          const daysUntilDeadline = daysBetween(task.deadline!, new Date());
+          const todayMidnightUTC = new Date(new Date().setUTCHours(0, 0, 0, 0));
+          const daysUntilDeadline = daysBetween(task.deadline!, todayMidnightUTC);
 
           return `${usersToSlackPings(task.assignees ?? [])} <https://finishlinebyner.com/projects/${wbsPipe(
             task.wbsElement
@@ -121,8 +124,8 @@ export default class NotificationsService {
    * Sends Slack notifications for all events scheduled for today whose event type has sendSlackNotifications enabled
    */
   static async sendEventSlackNotifications() {
-    const endOfToday = startOfDayTomorrow();
-    const startOfToday = startOfDay(new Date());
+    const endOfToday = startOfTomorrowEST();
+    const startOfToday = startOfTodayEST();
 
     const events = await prisma.event.findMany({
       where: {
@@ -231,7 +234,7 @@ export default class NotificationsService {
    * Sends the sponsor task slack notifications for all tasks with a notify date of today
    */
   static async sendSponsorTaskNotifications() {
-    const startOfToday = startOfDay(new Date());
+    const startOfToday = new Date(new Date().setUTCHours(0, 0, 0, 0));
     const endOfToday = startOfDayTomorrow();
 
     const sponsorTasks = await prisma.sponsor_Task.findMany({

src/backend/src/utils/notifications.utils.ts

@@ -31,7 +31,10 @@ export const userToSlackPing = (user: UserWithSettings) => {
  * @returns the beginning of the day tomorrow (at 12am)
  */
 export const startOfDayTomorrow = () => {
-  return new Date(new Date().setHours(24, 0, 0, 0));
+  const tomorrow = new Date();
+  tomorrow.setUTCDate(tomorrow.getUTCDate() + 1);
+  tomorrow.setUTCHours(0, 0, 0, 0);
+  return tomorrow;
 };
 
 /**
@@ -41,6 +44,36 @@ export const startOfDayTomorrow = () => {
 export const endOfDayTomorrow = () => {
   const startOfDay = startOfDayTomorrow();
   const endOfDay = new Date(startOfDay);
-  endOfDay.setDate(startOfDay.getDate() + 1);
+  endOfDay.setUTCDate(startOfDay.getUTCDate() + 1);
   return endOfDay;
 };
+
+const EST_OFFSET_MS = 5 * 60 * 60 * 1000;
+
+/**
+ * Given a UTC Date, returns the start of that calendar day in EST (UTC-5), expressed as a UTC Date.
+ * EST is always treated as UTC-5 (no DST adjustment).
+ * @returns midnight EST of the given date as a UTC Date
+ */
+export const startOfDateEST = (date: Date): Date => {
+  const dateInEST = new Date(date.getTime() - EST_OFFSET_MS);
+  return new Date(Date.UTC(dateInEST.getUTCFullYear(), dateInEST.getUTCMonth(), dateInEST.getUTCDate(), 5, 0, 0, 0));
+};
+
+/**
+ * Gets the start of today in EST (UTC-5), expressed as a UTC Date.
+ * EST is always treated as UTC-5 (no DST adjustment).
+ * @returns midnight EST today as a UTC Date
+ */
+export const startOfTodayEST = (): Date => startOfDateEST(new Date());
+
+/**
+ * Gets the start of tomorrow in EST (UTC-5), expressed as a UTC Date.
+ * EST is always treated as UTC-5 (no DST adjustment).
+ * @returns midnight EST tomorrow as a UTC Date
+ */
+export const startOfTomorrowEST = (): Date => {
+  const start = startOfTodayEST();
+  start.setUTCDate(start.getUTCDate() + 1);
+  return start;
+};

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/v2/TaskColumn.tsx

@@ -13,16 +13,22 @@ export const TaskColumn = ({
   status,
   tasks,
   project,
+  equalizedHeight,
+  isDragging,
   onEditTask,
   onDeleteTask,
-  onAddTask
+  onAddTask,
+  onHeightChange
 }: {
-  status: Task['status'];
+  status: TaskStatus;
   tasks: TaskWithIndex[];
   project: Project;
+  equalizedHeight: number;
+  isDragging: boolean;
   onEditTask: (task: Task) => void;
   onDeleteTask: (taskId: string) => void;
   onAddTask: (task: Task) => void;
+  onHeightChange: (status: TaskStatus, height: number) => void;
 }) => {
   const { mutateAsync: createTask } = useCreateTask();
   const [showCreateTaskModal, setShowCreateTaskModal] = useState(false);
@@ -62,27 +68,51 @@ export const TaskColumn = ({
       <Box
         sx={{
           flex: 1,
+          display: 'flex',
+          flexDirection: 'column',
           paddingTop: '8px',
           paddingBottom: '16px',
           backgroundColor: theme.palette.background.paper,
           marginLeft: '5px',
-          borderRadius: '5px'
+          borderRadius: '5px',
+          minHeight: isDragging ? `${equalizedHeight}px` : undefined
         }}
       >
         <Typography align="center" variant="h5">
           {statusNames[status]}
         </Typography>
+        <NERButton
+          sx={{
+            marginTop: '5px',
+            backgroundColor: theme.palette.secondary.contrastText,
+            width: 'calc(100% - 10px)',
+            marginX: '5px'
+          }}
+          onClick={() => setShowCreateTaskModal(true)}
+        >
+          + Add A Task
+        </NERButton>
         <Droppable droppableId={status}>
           {(droppableProvided, snapshot) => (
             <Box
-              ref={droppableProvided.innerRef}
+              ref={(droppableBox: HTMLElement | null) => {
+                droppableProvided.innerRef(droppableBox); // give dnd lib access to dom node
+                if (!droppableBox) return;
+
+                const observer = new ResizeObserver(() => {
+                  onHeightChange(status, droppableBox.scrollHeight);
+                });
+                observer.observe(droppableBox);
+                return () => observer.disconnect();
+              }}
               {...droppableProvided.droppableProps}
               className={snapshot.isDraggingOver ? ' isDraggingOver' : ''}
               sx={{
                 display: 'flex',
                 flexDirection: 'column',
                 borderRadius: 5,
                 padding: '5px',
+                flex: 1,
                 '&.isDraggingOver': {
                   bgcolor: '#dadadf'
                 }
@@ -102,17 +132,6 @@ export const TaskColumn = ({
             </Box>
           )}
         </Droppable>
-        <NERButton
-          sx={{
-            marginTop: '5px',
-            backgroundColor: theme.palette.secondary.contrastText,
-            width: 'calc(100% - 10px)',
-            marginX: '5px'
-          }}
-          onClick={() => setShowCreateTaskModal(true)}
-        >
-          + Add A Task
-        </NERButton>
       </Box>
     </>
   );

src/frontend/src/pages/ProjectDetailPage/ProjectViewContainer/TaskList/v2/TaskListContent.tsx

@@ -1,7 +1,7 @@
-import { DragDropContext, OnDragEndResponder } from '@hello-pangea/dnd';
+import { DragDropContext, OnDragEndResponder, OnDragStartResponder } from '@hello-pangea/dnd';
 import { Box } from '@mui/material';
-import { useState } from 'react';
-import { Project, Task, TaskWithIndex } from 'shared';
+import { useCallback, useState } from 'react';
+import { Project, Task, TaskStatus, TaskWithIndex } from 'shared';
 import { getTasksByStatus, statuses, TasksByStatus } from '.';
 import { useSetTaskStatus } from '../../../../../hooks/tasks.hooks';
 import { useToast } from '../../../../../hooks/toasts.hooks';
@@ -19,6 +19,14 @@ export const TaskListContent = ({ project }: TaskListProps) => {
 
   const toast = useToast();
 
+  const [isDragging, setIsDragging] = useState(false);
+  const [columnHeights, setColumnHeights] = useState<Partial<Record<TaskStatus, number>>>({});
+  const equalizedHeight = Math.max(...(Object.values(columnHeights) as number[]));
+
+  const onHeightChange = useCallback((status: TaskStatus, height: number) => {
+    setColumnHeights((prev) => ({ ...prev, [status]: height }));
+  }, []);
+
   const onDeleteTask = (taskId: string) => {
     setTasksByStatus((prev) => {
       const newTasksByStatus = { ...prev };
@@ -54,7 +62,12 @@ export const TaskListContent = ({ project }: TaskListProps) => {
     }));
   };
 
+  const onDragStart: OnDragStartResponder = () => {
+    setIsDragging(true);
+  };
+
   const onDragEnd: OnDragEndResponder = async (result) => {
+    setIsDragging(false);
     const { destination, source } = result;
 
     if (!destination) {
@@ -110,17 +123,20 @@ export const TaskListContent = ({ project }: TaskListProps) => {
   };
 
   return (
-    <DragDropContext onDragEnd={onDragEnd}>
+    <DragDropContext onDragStart={onDragStart} onDragEnd={onDragEnd}>
       <Box display="flex">
         {statuses.map((status) => (
           <TaskColumn
             onAddTask={onAddTask}
             onDeleteTask={onDeleteTask}
             onEditTask={onEditTask}
+            onHeightChange={onHeightChange}
             status={status}
             tasks={tasksByStatus[status]}
             key={status}
             project={project}
+            equalizedHeight={equalizedHeight}
+            isDragging={isDragging}
           />
         ))}
       </Box>