Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
- Refactored the `Times` table to `Time` with a database migration
- Extracted `loadGraphData.ts` and `util.ts` (both TypeScript) out of `js/components/graph/Graph.js`, and moved `js/util/util.ts` to `js/components/graph/requirementParser.ts`
- Changed SVG parsing to leave the `fill` column empty when inserting hybrid nodes into the database
- Refactored `js/components/grid/course_panel.js.jsx` into separate typescript react components

## [0.8.1] - 2026-08-10

Expand Down
2 changes: 2 additions & 0 deletions js/components/common/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ export interface MeetingItem {
cap: number
enrol: number
wait: number
code: string
extra?: number
}
timeData: TimeData[]
}
Expand Down
4 changes: 2 additions & 2 deletions js/components/common/utils.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import type { ProgramData, ProgramNotModified } from "./types"
import type { ProgramData, ProgramNotModified, RawCourseData } from "./types"
/**
* Retrieves a course from file.
* @param courseName The course code. This + '.txt' is the name of the file.
* @returns Promise object representing the JSON object containing course information
* or null if not found.
*/
export function getCourse(courseName: string): Promise<unknown> {
export function getCourse(courseName: string): Promise<RawCourseData> {
"use strict"

return fetch("course?name=" + courseName).then(response => {
Expand Down
3 changes: 1 addition & 2 deletions js/components/grid/__tests__/CoursePanel.test.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { render, screen, cleanup, waitFor } from "@testing-library/react"
import userEvent from "@testing-library/user-event"
import { CoursePanel } from "../course_panel.js.jsx"
import { CoursePanel } from "../course_panel"
import fetchMock from "fetch-mock"

describe("CoursePanel", () => {
const coursePanelProps = {
selectedCourses: [],
selectedLectures: [],
removeCourse: jest.fn(),
clearCourses: jest.fn(),
hoverLecture: jest.fn(),
Expand Down
190 changes: 190 additions & 0 deletions js/components/grid/course.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
import { type JSX, useState, useEffect, useCallback } from "react"
import { getCourse } from "../common/utils"
import type { SelectedLecture } from "./types"
import type { MeetingItem, TimeData } from "../common/types"
import { SectionList } from "./section_list"

export interface CourseProps {
courseCode: string
removeCourse: (courseCode: string) => void
hoverLecture: (lecture: SelectedLecture) => void
unhoverLecture: () => void
selectLecture: (lecture: SelectedLecture) => void
displayInfo: (courseId: string) => void
}

interface ParsedLecture {
courseCode: string
lectureCode: string
session: string
times: TimeData[]
}

interface ParsedCourse {
courseCode: string
F: ParsedLecture[]
S: ParsedLecture[]
Y: ParsedLecture[]
}

/**
* A selected course with a delete button, and info button, which displays information
* about the course when clicked.
* Also retrieves the course information. It holds list of F, S and Y lecture, tutorial
* and practical sections for the course.
*/
export function Course({
courseCode,
removeCourse,
hoverLecture,
unhoverLecture,
selectLecture,
displayInfo,
}: CourseProps): JSX.Element {
const [selected, setSelected] = useState(false)
const [courseInfo, setCourseInfo] = useState<ParsedCourse>({
courseCode: "",
F: [],
S: [],
Y: [],
})

const filterLectureList = useCallback(
(lectures: ParsedLecture[], session: string): ParsedLecture[] => {
return lectures
.filter(lec => lec.session === session)
.sort((firstLec, secondLec) =>
firstLec.lectureCode > secondLec.lectureCode ? 1 : -1
)
},
[]
)

const toggleSelect = useCallback(() => {
setSelected(s => !s)
}, [])

const removeCourseCallback = useCallback(() => {
removeCourse(courseCode)
}, [removeCourse, courseCode])

const parseLectures = useCallback((lectures: MeetingItem[]): ParsedLecture[] => {
const parsedLectures: ParsedLecture[] = []

// Loop through the lecture sections to get each section's session code and lecture times
lectures.forEach(lectureInfo => {
// Check to make sure its not an online section (online sections have course codes beginning with 9) or
// restricted section. Restricted sections have enrollment restricted for a particular group of students,
// but happens at the same time and place as a regular lecture/tutorial section.
if (
lectureInfo.meetData.section.charAt(3) !== "2" &&
lectureInfo.meetData.section.charAt(3) !== "9"
) {
const lecture: ParsedLecture = {
courseCode:
lectureInfo.meetData.code +
" (" +
lectureInfo.meetData.section.substring(0, 1) +
")",
lectureCode:
lectureInfo.meetData.section.substring(0, 1) +
lectureInfo.meetData.section.substring(3),
session: lectureInfo.meetData.session,
times: lectureInfo.timeData,
}
parsedLectures.push(lecture)
}
})
return parsedLectures
}, [])

useEffect(() => {
getCourse(courseCode)
.then(data => {
const course: ParsedCourse = {
courseCode: "",
F: [],
S: [],
Y: [],
}

course.courseCode = data.name ? data.name : ""

const parsedLectures = parseLectures(data.allMeetingTimes)
// Split the lecture sections into Fall, Spring and Years
course.F = filterLectureList(parsedLectures, "F")
course.S = filterLectureList(parsedLectures, "S")
course.Y = filterLectureList(parsedLectures, "Y")
setCourseInfo(course)
})
.catch(_ => {
console.error(`Course with code ${courseCode} not found`)
setCourseInfo({
courseCode: "",
F: [],
S: [],
Y: [],
})
})
}, [])

return (
<li
key={courseCode}
id={courseCode + "-li"}
className={"ui-accordion ui-widget ui-helper-reset"}
>
<div
className="ui-accordion-header ui-helper-reset ui-state-default ui-accordion-icons ui-accordion-header-active ui-state-active ui-corner-top"
id={"ui-accordion-" + courseCode + "-li-header-0"}
>
<div className="icon-div">
<img
src="/static/res/ico/delete.png"
className="close-icon"
onClick={removeCourseCallback}
/>
<img
src="/static/res/ico/about.png"
className="close-icon"
onClick={() => displayInfo(courseCode)}
/>
</div>
<h3 onClick={toggleSelect} data-satisfied="true">
{courseCode}
</h3>
</div>
{selected && (
<div
className="sections ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content-active"
id={"ui-accordion-" + courseCode + "-li-panel-0"}
>
<SectionList
courseCode={courseCode}
session="Y"
lectures={courseInfo.Y}
hoverLecture={hoverLecture}
unhoverLecture={unhoverLecture}
selectLecture={selectLecture}
/>
<SectionList
courseCode={courseCode}
session="F"
lectures={courseInfo.F}
hoverLecture={hoverLecture}
unhoverLecture={unhoverLecture}
selectLecture={selectLecture}
/>
<SectionList
courseCode={courseCode}
session="S"
lectures={courseInfo.S}
hoverLecture={hoverLecture}
unhoverLecture={unhoverLecture}
selectLecture={selectLecture}
/>
</div>
)}
</li>
)
}
36 changes: 36 additions & 0 deletions js/components/grid/course_entry.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { type JSX, useCallback } from "react"

export interface CourseEntryProps {
course: string
selectCourse: (courseCode: string) => void
removeCourse: (courseCode: string) => void
selectedCourses: string[]
}

/**
* Describes a course based on its course code, and whether or not it has been selected
* (If the course is selected, it is a "starred-course").
*/
export function CourseEntry({
course,
selectCourse,
removeCourse,
selectedCourses,
}: CourseEntryProps): JSX.Element {
// Check whether the course is already in the selectCourses list.
// Remove the course if it is, or add the course if it is not.
const select = useCallback(() => {
if (selectedCourses.indexOf(course) != -1) {
removeCourse(course)
} else {
selectCourse(course)
}
}, [course, selectedCourses, selectCourse, removeCourse])

const classes = selectedCourses.indexOf(course) != -1 ? "starred-course" : ""
return (
<li id={course + "-search"} className={classes} onClick={select}>
{course}
</li>
)
}
67 changes: 67 additions & 0 deletions js/components/grid/course_list.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
import { type JSX, useState, useEffect } from "react"
import { CourseEntry } from "./course_entry"

export interface CourseListProps {
courseFilter: string
selectedCourses: string[]
selectCourse: (courseCode: string) => void
removeCourse: (courseCode: string) => void
}

/**
* A list of courses in column flow
* Composed of many CourseEntry
*/
export function CourseList({
courseFilter,
selectedCourses,
selectCourse,
removeCourse,
}: CourseListProps): JSX.Element {
const [courses, setCourses] = useState<string[]>([])

useEffect(() => {
// AJAX requests allow the programmer to:
// 1. update a webpage without refreshing
// 2. Request data from a server AFTER the webpage is loaded
// 3. Send data to the server - in the background

// This makes an AJAX call to retrieve courses from the database
fetch(
"/courses" // url to which the AJAX request is sent to
)
.then(response => response.text())
.then(data => {
// searches through all of the courses in "data",
// and stores each individual course code name
// into 'courses' list
const courses = data.split("\n").map(course => course.substring(0, 8))
setCourses(courses)
})
}, [])

let searchList: React.ReactElement[] = []
// If there are courses to be filtered
if (courseFilter !== "") {
// From the "courses" list, filter out elements based off of the prop "courseFilter" passed to
// CourseList by SearchPanel
searchList = courses
.filter(course => course.indexOf(courseFilter) > -1)
.map(course => (
<CourseEntry
course={course}
key={course}
selectCourse={selectCourse}
removeCourse={removeCourse}
selectedCourses={selectedCourses}
/>
))
}

// Return all the unfiltered courses in the "courses" list in a list
return (
<div id="search-list">
<ul>{searchList}</ul>
</div>
)
}
Loading
Loading