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
21 changes: 2 additions & 19 deletions src/components/generator/Calendar/CalendarComponent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
getDaysOfWeek,
getTimeBlockEvents,
} from "@/lib/generator/createCalendarEvents";
import { buildCourseDetails } from "@/lib/generator/buildCourseDetails";
import { getCourseData } from "@/lib/generator/courseData";
import { CourseDetailsContext } from "@/lib/contexts/generator/CourseDetailsContext";
import { CourseColorsContext } from "@/lib/contexts/generator/CourseColorsContext";
Expand Down Expand Up @@ -179,25 +180,7 @@ export default function CalendarComponent({
currentColors,
);

const courseDetails = Array.from(
new Map(
newEvents
.filter((event) => !event.extendedProps.isBlocked)
.map((event) => {
let titleArray = event.title.trim().split(" ");
const detail = {
name: titleArray[0],
courseName: event.extendedProps.courseName || "",
instructor: event.description,
section: titleArray.pop(),
startDate: event.startRecur,
endDate: event.endRecur,
};

return [detail.name, detail];
}),
).values(),
);
const courseDetails = buildCourseDetails(newEvents);

setCourseDetails(courseDetails);
setEvents(newEvents);
Expand Down
21 changes: 2 additions & 19 deletions src/components/generator/Calendar/hooks/useCalendarEvents.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
createCalendarEvents,
getDaysOfWeek,
} from "@/lib/generator/createCalendarEvents";
import { buildCourseDetails } from "@/lib/generator/buildCourseDetails";
import { getCourseData } from "@/lib/generator/courseData";
import { checkForWeekendClasses } from "../utils/calendarUtils.jsx";

Expand Down Expand Up @@ -71,25 +72,7 @@ export const useCalendarEvents = ({
currentColors,
);

const courseDetails = Array.from(
new Map(
newEvents
.filter((event) => !event.extendedProps.isBlocked)
.map((event) => {
let titleArray = event.title.trim().split(" ");
const detail = {
name: titleArray[0],
courseName: event.extendedProps.courseName || "",
instructor: event.description,
section: titleArray.pop(),
startDate: event.startRecur,
endDate: event.endRecur,
};

return [detail.name, detail];
}),
).values(),
);
const courseDetails = buildCourseDetails(newEvents);

setCourseDetails(courseDetails);
setEvents(newEvents);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export default function CourseListComponent({
<div className="flex items-start justify-between">
<span>Course Instructor</span>
<span className="text-foreground">
{courseDetail ? courseDetail.instructor : "N/A"}
{courseDetail?.instructor || "N/A"}
</span>
</div>
<div className="flex items-start justify-between">
Expand Down
41 changes: 41 additions & 0 deletions src/lib/generator/buildCourseDetails.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
const getCourseDetailFromEvent = (event) => {
const titleParts = event.title.trim().split(" ");

return {
name: titleParts[0],
courseName: event.extendedProps.courseName || "",
instructor: event.description?.trim() || "",
section: titleParts.pop(),
startDate: event.startRecur,
endDate: event.endRecur,
};
};

const mergeCourseDetail = (existingDetail, nextDetail) => ({
...existingDetail,
...nextDetail,
courseName: existingDetail.courseName || nextDetail.courseName,
instructor: existingDetail.instructor || nextDetail.instructor,
startDate: existingDetail.startDate || nextDetail.startDate,
endDate: existingDetail.endDate || nextDetail.endDate,
});

export const buildCourseDetails = (events) =>
Array.from(
events
.filter((event) => !event.extendedProps.isBlocked)
.reduce((detailsByName, event) => {
const nextDetail = getCourseDetailFromEvent(event);
const existingDetail = detailsByName.get(nextDetail.name);

detailsByName.set(
nextDetail.name,
existingDetail
? mergeCourseDetail(existingDetail, nextDetail)
: nextDetail,
);

return detailsByName;
}, new Map())
.values(),
);
Loading