schedules working

src/background/background.ts

@@ -9,6 +9,7 @@ import { sessionStore } from '../shared/storage/sessionStore';
 import browserActionHandler from './handler/browserActionHandler';
 import hotReloadingHandler from './handler/hotReloadingHandler';
 import tabManagementHandler from './handler/tabManagementHandler';
+import userScheduleHandler from './handler/userScheduleHandler';
 
 onServiceWorkerAlive();
 
@@ -34,6 +35,7 @@ const messageListener = new MessageListener<BACKGROUND_MESSAGES>({
     ...browserActionHandler,
     ...hotReloadingHandler,
     ...tabManagementHandler,
+    ...userScheduleHandler,
 });
 
 messageListener.listen();

src/background/handler/userScheduleHandler.ts

@@ -0,0 +1,16 @@
+import { MessageHandler } from 'chrome-extension-toolkit';
+import { UserScheduleMessages } from 'src/shared/messages/UserScheduleMessages';
+import { Course } from 'src/shared/types/Course';
+import addCourse from '../lib/addCourse';
+import removeCourse from '../lib/removeCourse';
+
+const userScheduleHandler: MessageHandler<UserScheduleMessages> = {
+    addCourse({ data, sendResponse }) {
+        addCourse(data.scheduleId, new Course(data.course)).then(sendResponse);
+    },
+    removeCourse({ data, sendResponse }) {
+        removeCourse(data.scheduleId, new Course(data.course)).then(sendResponse);
+    },
+};
+
+export default userScheduleHandler;

src/background/lib/addCourse.ts

@@ -0,0 +1,18 @@
+import { userScheduleStore } from 'src/shared/storage/userScheduleStore';
+import { Course } from 'src/shared/types/Course';
+
+/**
+ *
+ */
+export default async function addCourse(scheduleId: string, course: Course): Promise<void> {
+    const schedules = await userScheduleStore.get('schedules');
+    const activeSchedule = schedules.find(s => s.id === scheduleId);
+    if (!activeSchedule) {
+        throw new Error('Schedule not found');
+    }
+
+    activeSchedule.creditHours += course.creditHours;
+    activeSchedule.courses.push(course);
+
+    await userScheduleStore.set('schedules', schedules);
+}

src/background/lib/removeCourse.ts

@@ -0,0 +1,18 @@
+import { userScheduleStore } from 'src/shared/storage/userScheduleStore';
+import { Course } from 'src/shared/types/Course';
+
+/**
+ *
+ */
+export default async function removeCourse(scheduleId: string, course: Course): Promise<void> {
+    const schedules = await userScheduleStore.get('schedules');
+    const activeSchedule = schedules.find(s => s.id === scheduleId);
+    if (!activeSchedule) {
+        throw new Error('Schedule not found');
+    }
+
+    activeSchedule.creditHours -= course.creditHours;
+    activeSchedule.courses = activeSchedule.courses.filter(c => c.uniqueId !== course.uniqueId);
+
+    await userScheduleStore.set('schedules', schedules);
+}

src/shared/messages/UserScheduleMessages.ts

@@ -0,0 +1,7 @@
+import { Course } from '../types/Course';
+
+export interface UserScheduleMessages {
+    addCourse: (data: { scheduleId: string; course: Course }) => void;
+
+    removeCourse: (data: { scheduleId: string; course: Course }) => void;
+}

src/shared/messages/index.ts

@@ -3,11 +3,15 @@ import TAB_MESSAGES from './TabMessages';
 import BrowserActionMessages from './BrowserActionMessages';
 import HotReloadingMessages from './HotReloadingMessages';
 import TabManagementMessages from './TabManagementMessages';
+import { UserScheduleMessages } from './UserScheduleMessages';
 
 /**
  * This is a type with all the message definitions that can be sent TO the background script
  */
-export type BACKGROUND_MESSAGES = BrowserActionMessages & TabManagementMessages & HotReloadingMessages;
+export type BACKGROUND_MESSAGES = BrowserActionMessages &
+    TabManagementMessages &
+    HotReloadingMessages &
+    UserScheduleMessages;
 
 /**
  * A utility object that can be used to send type-safe messages to the background script

src/shared/storage/UserScheduleStore.ts

@@ -1,5 +1,6 @@
 import { createLocalStore, debugStore } from 'chrome-extension-toolkit';
 import { UserSchedule } from 'src/shared/types/UserSchedule';
+import { v4 as uuidv4 } from 'uuid';
 
 interface IUserScheduleStore {
     schedules: UserSchedule[];
@@ -9,7 +10,14 @@ interface IUserScheduleStore {
  * A store that is used for storing user schedules (and the active schedule)
  */
 export const userScheduleStore = createLocalStore<IUserScheduleStore>({
-    schedules: [],
+    schedules: [
+        new UserSchedule({
+            courses: [],
+            id: uuidv4(),
+            name: 'Schedule 1',
+            creditHours: 0,
+        }),
+    ],
 });
 
 debugStore({ userScheduleStore });

src/shared/types/UserSchedule.ts

@@ -8,9 +8,11 @@ export class UserSchedule {
     courses: Course[];
     id: string;
     name: string;
+    creditHours: number;
 
     constructor(schedule: Serialized<UserSchedule>) {
         this.courses = schedule.courses.map(c => new Course(c));
+        this.creditHours = this.courses.reduce((acc, course) => acc + course.creditHours, 0);
         this.id = schedule.id;
         this.name = schedule.name;
     }
@@ -18,18 +20,4 @@ export class UserSchedule {
     containsCourse(course: Course): boolean {
         return this.courses.some(c => c.uniqueId === course.uniqueId);
     }
-
-    getCreditHours(): number {
-        return this.courses.reduce((acc, course) => acc + course.creditHours, 0);
-    }
-
-    addCourse(course: Course): void {
-        if (!this.containsCourse(course)) {
-            this.courses.push(course);
-        }
-    }
-
-    removeCourse(course: Course): void {
-        this.courses = this.courses.filter(c => c.uniqueId !== course.uniqueId);
-    }
 }

src/views/components/injected/CoursePopup/CourseHeader/CourseButtons/CourseButtons.tsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import { bMessenger } from 'src/shared/messages';
-import { userScheduleStore } from 'src/shared/storage/userScheduleStore';
 import { Course } from 'src/shared/types/Course';
 import { UserSchedule } from 'src/shared/types/UserSchedule';
 import { Button } from 'src/views/components/common/Button/Button';
@@ -14,7 +13,7 @@ type Props = {
     course: Course;
 };
 
-const { openNewTab } = bMessenger;
+const { openNewTab, addCourse, removeCourse } = bMessenger;
 
 /**
  * This component displays the buttons for the course info popup, that allow the user to either
@@ -64,17 +63,21 @@ export default function CourseButtons({ course, activeSchedule }: Props) {
         openNewTab({ url: url.toString() });
     };
 
-    const saveCourse = async () => {
+    const handleSaveCourse = async () => {
-        const schedules = await userScheduleStore.get('schedules');
+        if (!activeSchedule) return;
-        const active = schedules.find(schedule => schedule.id === activeSchedule?.id);
+        addCourse({ course, scheduleId: activeSchedule.id });
-
-        if (!active) return;
-
-        active.addCourse(course);
-
-        await userScheduleStore.set('schedules', schedules);
     };
 
+    const handleRemoveCourse = async () => {
+        if (!activeSchedule) return;
+        removeCourse({ course, scheduleId: activeSchedule.id });
+    };
+
+    const isCourseSaved = (() => {
+        if (!activeSchedule) return false;
+        return Boolean(activeSchedule.containsCourse(course));
+    })();
+
     return (
         <Card className={styles.container}>
             <Button
@@ -100,11 +103,16 @@ export default function CourseButtons({ course, activeSchedule }: Props) {
                 </Text>
                 <Icon className={styles.icon} color='white' name='collections_bookmark' size='medium' />
             </Button>
-            <Button disabled={!activeSchedule} onClick={saveCourse} type='success' className={styles.button}>
+            <Button
+                disabled={!activeSchedule}
+                onClick={isCourseSaved ? handleRemoveCourse : handleSaveCourse}
+                type={isCourseSaved ? 'danger' : 'success'}
+                className={styles.button}
+            >
                 <Text size='medium' weight='regular' color='white'>
-                    Save
+                    {isCourseSaved ? 'Remove' : 'Add'}
                 </Text>
-                <Icon className={styles.icon} color='white' name='add' size='medium' />
+                <Icon className={styles.icon} color='white' name={isCourseSaved ? 'remove' : 'add'} size='medium' />
             </Button>
         </Card>
     );

src/views/components/injected/CoursePopup/CourseHeader/CourseHeader.tsx

@@ -91,7 +91,7 @@ export default function CourseHeader({ course, activeSchedule, onClose }: Props)
                 </Text>
             ))}
 
-            <CourseButtons course={course} />
+            <CourseButtons course={course} activeSchedule={activeSchedule} />
         </Card>
     );
 }

src/views/components/injected/TableRow/TableRow.module.scss

@@ -18,3 +18,10 @@
         font-weight: bold !important;
     }
 }
+
+.isConflict {
+    * {
+        color: $speedway_brick !important;
+        text-decoration: line-through !important;
+    }
+}

src/views/components/injected/TableRow/TableRow.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import ReactDOM from 'react-dom';
 import { Course, ScrapedRow } from 'src/shared/types/Course';
+import { UserSchedule } from 'src/shared/types/UserSchedule';
 import { Button } from '../../common/Button/Button';
 import Icon from '../../common/Icon/Icon';
 import styles from './TableRow.module.scss';
@@ -9,17 +10,14 @@ interface Props {
     isSelected: boolean;
     row: ScrapedRow;
     onClick: (...args: any[]) => any;
-    /**
+    activeSchedule?: UserSchedule;
-     * Whether the course is in the user' active schedule.
-     */
-    isInActiveSchedule: boolean;
 }
 
 /**
  * This component is injected into each row of the course catalog table.
  * @returns a react portal to the new td in the column or null if the column has not been created yet.
  */
-export default function TableRow({ row, isSelected, isInActiveSchedule, onClick }: Props): JSX.Element | null {
+export default function TableRow({ row, isSelected, activeSchedule, onClick }: Props): JSX.Element | null {
     const [container, setContainer] = useState<HTMLTableCellElement | null>(null);
 
     const { element, course } = row;
@@ -40,8 +38,21 @@ export default function TableRow({ row, isSelected, isInActiveSchedule, onClick
     }, [isSelected, element.classList]);
 
     useEffect(() => {
-        element.classList[isInActiveSchedule ? 'add' : 'remove'](styles.inActiveSchedule);
+        if (!activeSchedule || !course) return;
-    }, [isInActiveSchedule, element.classList]);
+
+        const isInSchedule = activeSchedule.containsCourse(course);
+
+        element.classList[isInSchedule ? 'add' : 'remove'](styles.inActiveSchedule);
+
+        return () => {
+            element.classList.remove(styles.inActiveSchedule);
+        };
+    }, [activeSchedule, element.classList]);
+
+    useEffect(() => {
+        // if (!activeSchedule || !course) return;
+        // TODO: handle conflicts here
+    }, []);
 
     if (!container) {
         return null;