Add logic for displaying Y session courses in the course modal by Purplegaze · Pull Request #1740 · Courseography/courseography

Purplegaze · 2026-06-24T07:58:33Z

Proposed Changes

Draft PR to add logic for displaying Y course timetable info. Tests are not yet updated.

Sorry for the clutter with the "Files changed" section of this PR right now caused by the merge from master being left over. I tried to split the changes off of this branch to prevent it, but somehow that caused issues that severed the whole database connection, so I'm just gonna leave it like this and wait until #1739 gets merged.

The only changes to review here are in react_modal.js.jsx.

...

Screenshots of your changes (if applicable)

Type of Change

(Write an X or a brief description next to the type or types that best describe your changes.)

Type	Applies?
🚨 Breaking change (fix or feature that would cause existing functionality to change)
✨ New feature (non-breaking change that adds functionality)
🐛 Bug fix (non-breaking change that fixes an issue)
🎨 User interface change (change to user interface; provide screenshots)
♻️ Refactoring (internal change to codebase, without changing functionality)
🚦 Test update (change that only adds or modifies tests)
📦 Dependency update (change that updates a dependency)
🔧 Internal (change that only affects developers or continuous integration)

Checklist

(Complete each of the following items for your pull request. Indicate that you have completed an item by changing the [ ] into a [x] in the raw text, or by clicking on the checkbox in the rendered description on GitHub.)

Before opening your pull request:

I have performed a self-review of my changes.
- Check that all changed files included in this pull request are intentional changes.
- Check that all changes are relevant to the purpose of this pull request, as described above.
I have added tests for my changes, if applicable.
- This is required for all bug fixes and new features.
I have updated the project documentation, if applicable.
- This is required for new features.
If this is my first contribution, I have added myself to the list of contributors.
I have updated the project Changelog (this is required for all changes).

After opening your pull request:

I have verified that the CircleCI checks have passed.
I have requested a review from a project maintainer.

Questions and Comments

See below.

… into y-session-fix

…y#1707)

Bumps [tmp](https://github.com/raszi/node-tmp) from 0.2.5 to 0.2.7. - [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md) - [Commits](raszi/node-tmp@v0.2.5...v0.2.7) --- updated-dependencies: - dependency-name: tmp dependency-version: 0.2.7 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ourseography#1716)

Replaced SvgJSON with ([Text], [Shape], [Path]) instead.

Bumps the jest group with 2 updates: [jest](https://github.com/jestjs/jest/tree/HEAD/packages/jest) and [jest-environment-jsdom](https://github.com/jestjs/jest/tree/HEAD/packages/jest-environment-jsdom). Updates `jest` from 30.3.0 to 30.4.2 - [Release notes](https://github.com/jestjs/jest/releases) - [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jestjs/jest/commits/v30.4.2/packages/jest) Updates `jest-environment-jsdom` from 30.3.0 to 30.4.1 - [Release notes](https://github.com/jestjs/jest/releases) - [Changelog](https://github.com/jestjs/jest/blob/main/CHANGELOG.md) - [Commits](https://github.com/jestjs/jest/commits/v30.4.1/packages/jest-environment-jsdom) --- updated-dependencies: - dependency-name: jest dependency-version: 30.4.2 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: jest - dependency-name: jest-environment-jsdom dependency-version: 30.4.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: jest ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ourseography#1723) Bumps the babel group with 5 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) | `7.29.2` | `7.29.7` | | [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) | `7.29.0` | `7.29.7` | | [@babel/eslint-parser](https://github.com/babel/babel/tree/HEAD/eslint/babel-eslint-parser) | `7.28.6` | `7.29.7` | | [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) | `7.29.3` | `7.29.7` | | [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) | `7.28.5` | `7.29.7` | Updates `@babel/runtime` from 7.29.2 to 7.29.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.29.7/packages/babel-runtime) Updates `@babel/core` from 7.29.0 to 7.29.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.29.7/packages/babel-core) Updates `@babel/eslint-parser` from 7.28.6 to 7.29.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.29.7/eslint/babel-eslint-parser) Updates `@babel/preset-env` from 7.29.3 to 7.29.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.29.7/packages/babel-preset-env) Updates `@babel/preset-react` from 7.28.5 to 7.29.7 - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.29.7/packages/babel-preset-react) --- updated-dependencies: - dependency-name: "@babel/core" dependency-version: 7.29.7 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: babel - dependency-name: "@babel/eslint-parser" dependency-version: 7.29.7 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: babel - dependency-name: "@babel/preset-env" dependency-version: 7.29.7 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: babel - dependency-name: "@babel/preset-react" dependency-version: 7.29.7 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: babel - dependency-name: "@babel/runtime" dependency-version: 7.29.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: babel ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…acy policy (Courseography#1727)

…ourseography#1700) Bumps the react group with 2 updates in the / directory: [react](https://github.com/facebook/react/tree/HEAD/packages/react) and [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom). Updates `react` from 19.2.4 to 19.2.7 - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v19.2.7/packages/react) Updates `react-dom` from 19.2.4 to 19.2.7 - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/main/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v19.2.7/packages/react-dom) --- updated-dependencies: - dependency-name: react dependency-version: 19.2.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: react - dependency-name: react-dom dependency-version: 19.2.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: react ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…Courseography#1697) Bumps the ag-grid group with 2 updates in the / directory: [ag-grid-community](https://github.com/ag-grid/ag-grid) and [ag-grid-react](https://github.com/ag-grid/ag-grid). Updates `ag-grid-community` from 35.2.0 to 35.3.1 - [Release notes](https://github.com/ag-grid/ag-grid/releases) - [Commits](ag-grid/ag-grid@release-35.2.0...release-35.3.1) Updates `ag-grid-react` from 35.2.0 to 35.3.1 - [Release notes](https://github.com/ag-grid/ag-grid/releases) - [Commits](ag-grid/ag-grid@release-35.2.0...release-35.3.1) --- updated-dependencies: - dependency-name: ag-grid-community dependency-version: 35.2.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: ag-grid - dependency-name: ag-grid-react dependency-version: 35.2.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: ag-grid ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [shell-quote](https://github.com/ljharb/shell-quote) from 1.8.3 to 1.8.4. - [Changelog](https://github.com/ljharb/shell-quote/blob/main/CHANGELOG.md) - [Commits](ljharb/shell-quote@v1.8.3...v1.8.4) --- updated-dependencies: - dependency-name: shell-quote dependency-version: 1.8.4 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…/courseography into y-session-compilation test

…1733) Bumps [launch-editor](https://github.com/vitejs/launch-editor) from 2.11.1 to 2.14.1. - [Commits](vitejs/launch-editor@v2.11.1...v2.14.1) --- updated-dependencies: - dependency-name: launch-editor dependency-version: 2.14.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…graphy#1734) Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 5.2.4 to 5.2.5. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/main/CHANGELOG.md) - [Commits](webpack/webpack-dev-server@v5.2.4...v5.2.5) --- updated-dependencies: - dependency-name: webpack-dev-server dependency-version: 5.2.5 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [form-data](https://github.com/form-data/form-data) from 4.0.4 to 4.0.6. - [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md) - [Commits](form-data/form-data@v4.0.4...v4.0.6) --- updated-dependencies: - dependency-name: form-data dependency-version: 4.0.6 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [tar](https://github.com/isaacs/node-tar) from 7.5.11 to 7.5.16. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](isaacs/node-tar@v7.5.11...v7.5.16) --- updated-dependencies: - dependency-name: tar dependency-version: 7.5.16 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

… into y-session-parse

Purplegaze · 2026-06-24T08:12:20Z

Sorry for the current clutter in the files changed section -- please see only react_modal.js.jsx.

Currently, I've made Y courses display with each term's time and location in separate columns, and I've left the single-session displays unchanged. This is similar to how the data appears on TTB.

Some data had to be shortened to make it fit in the same width. So currently for Y courses, " available" gets removed from the availability column and weekdays get shortened.

In order to implement this, I added new Fall/Winter Time/Location columns into the map returned by getTable, and modified the AgGrid rendering to hide the time/location columns corresponding to the other type of course, as well as adjust the widths of the other columns if session = Y.

However, I feel like this implementation is pretty clunky. Do you think I should try to completely separate the tables between single-session and year-long courses into two separate components?

…courseography into y-session-parse2

david-yz-liu

@Purplegaze nice work and sorry for the delay in reviewing this. I left a few comments, but overall I think you're on the right track; I like the approach of showing the time/location information for full-year courses as separate columns.

david-yz-liu · 2026-06-28T01:46:05Z


    return sortedSessions.map(lecture => {
      const occurrences = { times: [], locations: [] }
+      const yearOccurrences = {fallTimes: [], fallLocations: [], winterTimes: [], winterLocations: []}


Don't use two different variables (occurrences and yearOccurrences). Stick with one object with keys times1, locations1, times2, locations2. Use just times1 and locations1 for fall and winter courses, and both locations for year-long courses.

This will let you simplify the logic below (times1/locations1 are updated in all cases except when session === "Y" && occurences.timeSession.endsWith("1")

david-yz-liu · 2026-06-28T01:46:56Z

          " of " +
          lecture.meetData.cap +
-          " available",
+          (session === "Y" ? "" : " available"), // Account for shortened column width for Y courses


Don't shorten this column text. We can play with the width of the modal to make it wider

david-yz-liu · 2026-06-28T01:52:11Z

+                  { field: "availability", width: session === "Y" ? 130 : 180 },
+                  { field: "waitList", width: session === "Y" ? 120 : 130 },
+
+                  /* Single-session occurrence columns */


Similar to my above comment, use one set of columns (times1, locations1, times2, locations2), showing only the first two for fall/winter sessions.

You can make the column header names conditional on whether a fall/winter or full-year session is being displayed by using the headerName field.

david-yz-liu · 2026-06-28T01:54:02Z

Oh and @Purplegaze please do not make additional modifications to variable names in this PR; doing so will obscure the logical changes that are currently shown.

Purplegaze and others added 30 commits May 19, 2026 14:48

initial changes to Tables + migration script

cf949fe

Merge branch 'master' of https://github.com/Courseography/courseography…

dc460de

… into y-session-fix

changelog

f8ea373

Added tests for JSON parsing of Time' data type (Courseography#1706)

aa12db7

Add tests for Database.Tables FromJSON Meeting instance (Courseograph…

e21e084

…y#1707)

Refactored graph helper functions from Svg.Database to Models.Graph (C…

bc71bea

…ourseography#1716)

Updated documentation in Util.Blaze (Courseography#1719)

61112ab

Refactored Building and Time functions into Models (Courseography#1718)

4921e7c

Removed SvgJSON data type (Courseography#1720)

70767e4

Replaced SvgJSON with ([Text], [Shape], [Path]) instead.

Renamed Course data type to CourseData (Courseography#1721)

432042e

Updated CS graph and config for 2026-27 (Courseography#1726)

14b37a4

Added privacy-preserving analytics using GoatCounter and updated priv…

95edff2

…acy policy (Courseography#1727)

chore: Run yarn dedupe (Courseography#1729)

8358a26

Update backend wiring

fd7c78c

Update frontend wiring

4129868

fix course controller tests

97b1fa0

add mini changelog

ba03e3e

Merge branch 'y-course-refactor' into y-session-compilation

87f08d6

Release version 0.8.0 (Courseography#1730)

3f3894e

fix shadowing in Models/Meeting

5807048

Merge branch 'y-session-compilation' of https://github.com/Purplegaze…

9fb3f60

…/courseography into y-session-compilation test

fix getimages shadowing

69b0aab

skip test instead of commenting it out

56e925d

rename fields

94819cd

Purplegaze and others added 14 commits June 12, 2026 21:06

fix tests 2

c445897

rename in frontend

ded4583

Renamed Courses datatype and table to Course (Courseography#1732)

31a48ae

Changed background colour of application (Courseography#1737)

5b8463c

Merge branch 'master' of https://github.com/Courseography/courseography…

81d6fb0

… into y-session-parse

resolve buildTimes

4fbfb9d

resolve TablesTests

d06db08

Merge branch 'y-course-refactor' into y-session-parse

886a85e

fix duplicate changelog lines

65528f6

add Y session display logic (no tests yet)

881bfec

Purplegaze requested a review from david-yz-liu June 24, 2026 08:13

Merge branch 'y-course-refactor' of https://github.com/Courseography/…

09375f9

…courseography into y-session-parse2

david-yz-liu reviewed Jun 28, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add logic for displaying Y session courses in the course modal#1740

Add logic for displaying Y session courses in the course modal#1740
Purplegaze wants to merge 45 commits into
Courseography:y-course-refactorfrom
Purplegaze:y-session-parse2

Purplegaze commented Jun 24, 2026 •

edited

Loading

Uh oh!

Purplegaze commented Jun 24, 2026

Uh oh!

david-yz-liu left a comment

Uh oh!

david-yz-liu Jun 28, 2026

Uh oh!

david-yz-liu Jun 28, 2026

Uh oh!

david-yz-liu Jun 28, 2026

Uh oh!

david-yz-liu commented Jun 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

Purplegaze commented Jun 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed Changes

Type of Change

Checklist

Questions and Comments

Uh oh!

Purplegaze commented Jun 24, 2026

Uh oh!

david-yz-liu left a comment

Choose a reason for hiding this comment

Uh oh!

david-yz-liu Jun 28, 2026

Choose a reason for hiding this comment

Uh oh!

david-yz-liu Jun 28, 2026

Choose a reason for hiding this comment

Uh oh!

david-yz-liu Jun 28, 2026

Choose a reason for hiding this comment

Uh oh!

david-yz-liu commented Jun 28, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Purplegaze commented Jun 24, 2026 •

edited

Loading