Feature/calendar improvements #3862

JoshuaGoldberg · 2026-01-05T21:43:35Z

Changes

The Final PR for the calendar improvements team, revamping the entire calendar page and its functionality.

Notes

Took a while but it's here now

Screenshots

Add some here soon

To Do

Bug fixes

Checklist

It can be helpful to check the Checks and Files changed tabs.
Please review the contributor guide and reach out to your Tech Lead if anything is unclear.
Please request reviewers and ping on slack only after you've gone through this whole checklist.

Closes #3400

…rtheastern-Electric-Racing/FinishLine into 3775-Delete-Calendar-Modal

…e-Calendar-Modal #3775 added delete calendar modal

…theastern-Electric-Racing/FinishLine into #3636-editcreate-event-modal

#3835 final miscellaneous changes

…lability #3818 availability changes

Copilot

Pull request overview

This PR represents a comprehensive overhaul of the calendar system, transitioning from a design-review-centric model to a more flexible event-based architecture. The changes introduce new event management capabilities, availability tracking, conflict resolution, and administrative configuration tools for scheduling.

Key Changes:

Replaced the design review calendar system with a new event-based calendar supporting multiple event types, recurring events, and resource booking (shops/machinery)
Added comprehensive event management features including approval workflows, availability tracking, and conflict detection
Introduced administrative configuration pages for managing calendars, event types, shops, and machinery

Reviewed changes

Copilot reviewed 96 out of 120 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
EventCard.tsx	Updated to use Event model instead of DesignReview
ProjectGanttChartPage.tsx	Changed references from designReviews to events
GanttChartColorLegend.tsx	Updated to use EventStatus instead of DesignReviewStatus
NewCalendarPage.tsx	New main calendar page with event filtering and conflict management
EventsTable.tsx	New table component for displaying user events and review bookings
EventModal.tsx	New comprehensive modal for creating/editing events with recurring schedules
CalendarTab.tsx	New tab navigation component for calendar views
CalendarDayCard.tsx	Updated day card to display events instead of design reviews
SchedulingConflictsWarning.tsx	New component for displaying scheduling conflicts
AdminToolsPage.tsx	Added new Schedule configuration tab
design-reviews.hooks.ts	Commented out design review hooks (migration to events)

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-05T21:48:56Z

src/frontend/src/pages/HomePage/components/EventCard.tsx

@@ -45,14 +45,14 @@ const DisplayStatus: React.FC<DesignReviewProps> = ({ designReview, user }) => {
          size="small"
          sx={{ color: 'white', padding: 1 }}
          onClick={() => {
-            history.push(`${routes.SETTINGS_PREFERENCES}?drId=${designReview.designReviewId}`);
+            history.push(`${routes.SETTINGS_PREFERENCES}?eventId=${event.eventId}`);
          }}
          component={RouterLink}
        >
          Confirm Availibility


Corrected spelling of 'Availibility' to 'Availability'.

Suggested change

Confirm Availibility

Confirm Availability

Copilot · 2026-01-05T21:48:56Z

src/frontend/src/pages/CalendarPage/FilterModal.tsx

+          sx={{ color: 'white', '&.Mui-checked': { color: 'white' } }}
+        />
+        <Typography variant="body2" sx={{ fontSize: 14, color: 'white' }}>
+          Show Events I For Teams I Am On


The text "Show Events I For Teams I Am On" has a grammatical error. It should be "Show Events For Teams I Am On".

Suggested change

Show Events I For Teams I Am On

Show Events For Teams I Am On

chpy04

backend review

chpy04 · 2026-01-08T22:18:39Z

src/backend/src/controllers/design-reviews.controllers.ts

@@ -1,3 +1,4 @@
+/*


Now that we are actually merging code we can get rid of all the DR code

chpy04 · 2026-01-08T22:18:56Z

src/backend/src/prisma-query-args/design-reviews.query-args.ts

@@ -1,3 +1,4 @@
+/*


chpy04 · 2026-01-08T22:25:15Z

src/backend/src/prisma-query-args/event.query-args.ts

+    }
+  });
+
+export const getEventWithMembersQueryArgs = (organizationId: string) =>


Should use getEventQueryArgs to abstract duplicate code

chpy04 · 2026-01-08T22:28:03Z

src/backend/src/prisma/seed.ts

  const nextDay = new Date();
  nextDay.setDate(nextDay.getDate() + 1);

+  /*


chpy04 · 2026-01-08T22:30:11Z

src/backend/src/routes/calendar.routes.ts

+  isDate(body('scheduleSlot.*.endTime')).optional(),
+  intMinZero(body('scheduleSlot.*.recurrenceNumber')),
+  isDate(body('scheduleSlot.*.initialDateScheduled')),
+  body('scheduleSlot.*.allDay').isBoolean(),


We should have a seperate validator dedicated to the scheduleSlot because its all one field

chpy04 · 2026-01-15T01:36:40Z

src/backend/src/utils/calendar.utils.ts

+export function buildScheduledTimesOverlap(start?: Date, end?: Date): Prisma.Schedule_SlotListRelationFilter | undefined {
+  if (!start && !end) return undefined;
+
+  const AND: Prisma.Schedule_SlotWhereInput[] = [];


bad variable name

chpy04 · 2026-01-15T01:45:08Z

src/backend/src/utils/calendar.utils.ts

+    ...getEventQueryArgs(organization.organizationId)
+  });
+
+  // Check each schedule slot against existing events


should be able to use algorithm to speed this up I think

chpy04 · 2026-01-15T01:46:08Z

src/backend/src/utils/design-reviews.utils.ts

@@ -1,12 +1,6 @@
-import { DesignReview } from 'shared';
+/*


chpy04 · 2026-01-15T01:47:07Z

src/backend/src/utils/errors.utils.ts

+  | 'Reimbursement Request Comment'
+  | 'Calendar'
+  | 'Event Type'
+  | 'Event';


need to delete DR from this list

chpy04 · 2026-01-15T01:48:42Z

src/backend/src/utils/google-integration.utils.ts

+          calendarEventIds.push(calendarEvent.data.id);
+        }
+      }
+    }


need to test this

chpy04

frontend

chpy04 · 2026-01-15T17:10:28Z

src/frontend/src/apis/design-reviews.api.ts

@@ -1,62 +1,69 @@
 /*
 * This file is part of NER's FinishLine and licensed under GNU AGPLv3.


chpy04 · 2026-01-15T17:11:47Z

src/frontend/src/apis/transformers/calendar.transformer.ts

@@ -0,0 +1,53 @@
+import { Shop, Event, EventPreview, EventWithMembers } from 'shared';


missing misc user / date transformers

chpy04 · 2026-01-15T17:12:00Z

src/frontend/src/apis/transformers/design-reviews.tranformers.ts

@@ -1,3 +1,4 @@
+/*


chpy04 · 2026-01-15T17:13:44Z

src/frontend/src/app/AppAuthenticated.tsx

            <Route path={routes.CREDITS} component={Credits} />
            <Route path={routes.FINANCE} component={Finance} />
-            <Route path={routes.CALENDAR} component={Calendar} />
+            <Route path={routes.NEW_CALENDAR} component={NewCalendar} />


should be just calendar

chpy04 · 2026-01-15T17:23:18Z

src/frontend/src/hooks/calendar.hooks.ts

+      onSuccess: () => {
+        queryClient.invalidateQueries(EVENT_KEY);
+        queryClient.invalidateQueries(['users', user.userId, 'schedule-settings']);
+        queryClient.invalidateQueries(['users', user.userId, 'schedule-settings']);


duplicate lines

chpy04 · 2026-01-15T19:04:56Z

src/frontend/src/pages/CalendarPage/EventClickPopup.tsx

+  ) => Promise<void>;
+}
+
+export const EventClickPopup: React.FC<EventClickPopupProps> = ({


seperate file

chpy04 · 2026-01-15T19:07:11Z

src/frontend/src/pages/CalendarPage/EventsTable.tsx

+      setNow(new Date());
+    }, 1000);
+    return () => clearInterval(timer);
+  }, []);


this will trigger on re-render which is very hard to guarentee will only happen once so I feel like there is a better way to do this

chpy04 · 2026-01-15T19:24:32Z

src/frontend/src/tests/test-support/test-data/design-reviews.stub.ts

@@ -3,9 +3,8 @@
 * See the LICENSE file in the repository root folder for details.
 */

-import { DesignReview, DesignReviewStatus, TeamType } from 'shared';


leftover stubs

chpy04 · 2026-01-15T19:27:10Z

src/frontend/src/utils/urls.ts

@@ -655,15 +691,15 @@ export const apiUrls = {
  bomCreateUnit,
  bomUnitById,
  bomDeleteUnit,
-
+  /*


chpy04 · 2026-01-15T19:28:50Z

src/shared/src/types/design-review-types.ts

@@ -1,3 +1,4 @@
+/*


…eam filter

JoshuaGoldberg and others added 30 commits December 3, 2025 12:35

anti linting preventative measures

96622a4

#3636 Fix merge

774e4c6

better button look

7d927d4

still need to lint anyways

cab4b20

test...?

fcdb661

#3636 Changed event name to eventtype and updated calendar to function

e16de76

#3636 added more toggable fields

c50afc2

#3636 styling thing

acbadc1

#3636 minor change to allow only one calendar selection for types

08618af

#3636 for some reason tests failed? attempting to recommit

a884a92

#3636 merge fix

62ed592

test again

1c19895

defaults

1c7ad8b

defaults 2

596a436

Merge branch 'feature/calendar-improvements' of https://github.com/No…

1dec6a5

…rtheastern-Electric-Racing/FinishLine into 3775-Delete-Calendar-Modal

#3775 prettier fixed

635559e

Merge pull request #3780 from Northeastern-Electric-Racing/3775-Delet…

db83e6a

…e-Calendar-Modal #3775 added delete calendar modal

Merge branch '#3636-editcreate-event-modal' of https://github.com/Nor…

b1e5189

…theastern-Electric-Racing/FinishLine into #3636-editcreate-event-modal

#3706 Finish requested changes

78e4f79

Merge branch 'feature/calendar-improvements' into #3706-your-events-page

8590b44

#3706 Fix conflict

61d0a8a

File Combine

5f4b08b

#3636 attempt to fix up some of the merge slack conflicts

0defbf1

#3706 Prettier check

3823938

Merge branch 'develop' into feature/calendar-improvements

b7fc018

#3636 fixed requested changes

7f26353

#3636 minor refactor of imports

268108d

delete modal UI added

afe6d9b

#3636 Final fix of everything with event types

d3dcfa4

#3636 fix calendar merge conflict

3bcdae7

wavehassman and others added 7 commits January 3, 2026 19:49

Merge pull request #3851 from Northeastern-Electric-Racing/small-edits

683a865

#3835 final miscellaneous changes

Merge branch 'feature/calendar-improvements' into #3818-availability

6255c82

#3818 requested changes + changing edit modal logic

c2e7a7e

#3818 files

b02f445

#3818 typescript fixes

080f551

#3818 copied over wrong version of file

94d7b52

Merge pull request #3849 from Northeastern-Electric-Racing/#3818-avai…

3916417

…lability #3818 availability changes

JoshuaGoldberg requested a review from chpy04 January 5, 2026 21:43

chpy04 requested a review from Copilot January 5, 2026 21:48

Copilot AI reviewed Jan 5, 2026

View reviewed changes

chpy04 added 12 commits January 12, 2026 19:22

#3767 onboarding impreovements

27cb8aa

#3767 migrated away from description blocks

dacc8cc

#3767 minor fixes

79e155e

#3767 more consistent enum usage

faef604

#3767 toooltip to tell users they have to complete subtasks

290e744

#3767 displayOrder -> displayIndex

10aa571

#3767 misc changes

21399f1

#3767 prettier

e037e02

#3860 don't include assemblies in materials

a63bd32

#3860 add back missing date deleted field

8732a85

changed from enum to const for compilation hot fix

06c05a5

Change to string literals as temporaryt solution

39f0636

chpy04 requested changes Jan 15, 2026

View reviewed changes

chpy04 added 6 commits January 16, 2026 08:58

merge with develop

6bf56ec

Move migration back, show work package events on that work packages t…

8f82952

…eam filter

all work package previews endpoint and lazy load create form data

7dffbc1

team previews without users for faster dropdowns

471ac8d

refactor schedule slots to not store recurrances

07f22a7

event modal correct abstraction

912fcf8

	Show Events I For Teams I Am On
	Show Events For Teams I Am On

		@@ -1,62 +1,69 @@
		/*
		* This file is part of NER's FinishLine and licensed under GNU AGPLv3.

		@@ -0,0 +1,53 @@
		import { Shop, Event, EventPreview, EventWithMembers } from 'shared';

Feature/calendar improvements #3862

Are you sure you want to change the base?

Feature/calendar improvements #3862

Uh oh!

Conversation

JoshuaGoldberg commented Jan 5, 2026

Changes

Notes

Screenshots

To Do

Checklist

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Key Changes:

Reviewed changes

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 5, 2026

Choose a reason for hiding this comment

Uh oh!

chpy04 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chpy04 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants