Merge branch 'master' into kagiura/mobility

Author: kagiura

docker-compose.yml

@@ -35,7 +35,7 @@ services:
       - website
     init: true
     security_opt:
-      - seccomp="infra/instance/chromium.seccomp.json"
+      - seccomp=infra/instance/chromium.seccomp.json
     environment:
       - NODE_ENV=development
       - PORT=8082

website/src/actions/export.ts

@@ -1,4 +1,4 @@
-import type { Module, Semester } from 'types/modules';
+import type { Module, ModuleCode, Semester } from 'types/modules';
 import type { ExportData } from 'types/export';
 import type { Dispatch, GetState } from 'types/redux';
 import { hydrateSemTimetableWithLessons } from 'utils/timetables';
@@ -31,11 +31,12 @@ export function downloadAsIcal(semester: Semester) {
       .then(([ical, icalUtils]) => {
         const state = getState();
         const { modules } = state.moduleBank;
+        const hiddenModules: ModuleCode[] = state.timetables.hidden[semester] || [];
 
         const timetable = getSemesterTimetableLessons(state)(semester);
         const timetableWithLessons = hydrateSemTimetableWithLessons(timetable, modules, semester);
 
-        const events = icalUtils.default(semester, timetableWithLessons, modules);
+        const events = icalUtils.default(semester, timetableWithLessons, modules, hiddenModules);
         const cal = ical.default({
           domain: 'nusmods.com',
           prodId: '//NUSMods//NUSMods//EN',

website/src/data/team.json

@@ -45,7 +45,6 @@
   {
     "name": "Li Kai",
     "description": "Happy to help. Software Engineer @ Quora, Ex-Front End Engineer Intern @ Facebook",
-    "active": true,
     "link": "https://www.github.com/li-kai",
     "gravatar": "3d2bcece0409c7578b2e9d87f0c1b6d7",
     "gravatarAlt": "Li Kai",
@@ -76,7 +75,6 @@
   {
     "name": "Zhang Yi Jiang",
     "description": "Fan of pretty purple pony princesses. Software Engineer @ Ironclad",
-    "active": true,
     "link": "https://meebleforp.com",
     "gravatar": "263859aefe62ee6cc1aa993e8e2293e0",
     "gravatarAlt": "Zhang Yi Jiang",
@@ -86,7 +84,6 @@
   {
     "name": "E-Liang Tan",
     "description": "Makers gotta make. Software Engineer @ Ironclad, Ex-Software Engineer Intern @ Facebook",
-    "active": true,
     "link": "https://www.eliangtan.com/",
     "gravatar": "3064783701c7bb1b4451c79318e1b536",
     "gravatarAlt": "E-Liang Tan",
@@ -106,5 +103,47 @@
     "twitter": "chrisgzf",
     "github": "chrisgzf",
     "linkedin": "chrisgzf"
+  },
+  {
+    "name": "Wong Kok Rui",
+    "description": "Likes geography trivia, ball sports, and musicals.",
+    "active": true,
+    "link": "https://kokruiwo.ng/",
+    "gravatar": "7acde926ae46e7a9533715a387260c7a8677d648c2677a8f6ff97e9b6e02a49b",
+    "gravatarAlt": "Wong Kok Rui",
+    "github": "kokrui",
+    "linkedin": "kokrui"
+  },
+  {
+    "name": "Ravern Koh",
+    "description": "I enjoy coding, reading, climbing and watching movies!",
+    "active": true,
+    "link": "https://github.com/ravern",
+    "gravatar": "12caf9f1faf78359205cfa178379cb54c675193763b02beb2e18b9b3f5cccef1",
+    "gravatarAlt": "Ravern Koh",
+    "twitter": "ravernkoh",
+    "github": "ravern",
+    "linkedin": "ravern"
+  },
+  {
+    "name": "Liew Zhao Wei",
+    "description": "[object Object]",
+    "active": true,
+    "link": "https://github.com/zwliew",
+    "gravatar": "lalalathisisbogus",
+    "gravatarAlt": "Liew Zhao Wei",
+    "github": "zwliew",
+    "linkedin": "zwliew"
+  },
+  {
+    "name": "Alissa",
+    "description": "Coding on the weekdays, swimming on the weekends...",
+    "active": true,
+    "link": "https://www.github.com/alissayarmantho",
+    "gravatar": "734d1659aa15ece4532e39008f4d9fc0745d852e60c9f966330d20db078d4711",
+    "gravatarAlt": "Alissa",
+    "twitter": "yarmantho",
+    "github": "alissayarmantho",
+    "linkedin": "alissayarmantho"
   }
 ]

website/src/data/venues.json

@@ -4587,6 +4587,22 @@
       "y": 1.2949252184799644
     }
   },
+  "COM3-01-23": {
+    "roomName": "Seminar Room 14",
+    "floor": 1,
+    "location": {
+      "x": 103.7748425,
+      "y": 1.2950386
+    }
+  },
+  "COM3-01-25": {
+    "roomName": "Seminar Room 15",
+    "floor": 1,
+    "location": {
+      "x": 103.7749804,
+      "y": 1.2948523
+    }
+  },
   "COM3-MPH": {
     "roomName": "COM3-MPH",
     "floor": 1,

website/src/utils/ical.test.ts

@@ -307,8 +307,18 @@ describe(iCalForTimetable, () => {
       CS1010S,
       CS3216,
     };
-    const actual = iCalForTimetable(1, mockTimetable, moduleData);
+    const actual = iCalForTimetable(1, mockTimetable, moduleData, []);
     // 5 lesson types for cs1010s, 1 for cs3216, 1 exam for cs1010s
     expect(actual).toHaveLength(7);
   });
+
+  test('should produce the correct number of lesson after excluding hidden mod', () => {
+    const moduleData = {
+      CS1010S,
+      CS3216,
+    };
+    const actual = iCalForTimetable(1, mockTimetable, moduleData, ['CS3216']);
+    // 5 lesson types for cs1010s, 1 exam for cs1010s, ( 1 lesson for cs3216 will be exluded)
+    expect(actual).toHaveLength(6);
+  });
 });

website/src/utils/ical.ts

@@ -174,6 +174,7 @@ export default function iCalForTimetable(
   semester: Semester,
   timetable: SemTimetableConfigWithLessons,
   moduleData: { [moduleCode: string]: Module },
+  hiddenModules: string[],
   academicYear: string = config.academicYear,
 ): EventOption[] {
   const [year, month, day] = academicCalendar[academicYear][semester].start;
@@ -182,6 +183,8 @@ export default function iCalForTimetable(
   const events: EventOption[] = [];
 
   _.each(timetable, (lessonConfig, moduleCode) => {
+    if (hiddenModules.includes(moduleCode)) return;
+
     _.each(lessonConfig, (lessons) => {
       lessons.forEach((lesson) => {
         events.push(iCalEventForLesson(lesson, moduleData[moduleCode], semester, firstDayOfSchool));

website/src/utils/timetables.ts

@@ -484,7 +484,12 @@ function parseModuleConfig(serialized: string | string[] | null): ModuleLessonCo
  * - 1,2,3       => Weeks 1-3
  * - 1,2,3,5,6,7 => Weeks 1-3, 5-7
  */
-export function formatNumericWeeks(weeks: NumericWeeks): string | null {
+export function formatNumericWeeks(unprocessedWeeks: NumericWeeks): string | null {
+  // Ensure list of weeks are unique
+  const weeks = unprocessedWeeks.filter(
+    (value, index) => unprocessedWeeks.indexOf(value) === index,
+  );
+
   if (weeks.length === 13) return null;
   if (weeks.length === 1) return `Week ${weeks[0]}`;
 
@@ -509,7 +514,7 @@ export function formatNumericWeeks(weeks: NumericWeeks): string | null {
   };
 
   weeks.slice(1).forEach((next) => {
-    if (next - end === 1) {
+    if (next - end <= 1) {
       // Consecutive week number - keep going
       end = next;
     } else {

website/src/views/mpe/form/MpeFormContainer.tsx

@@ -25,19 +25,18 @@ const MpeFormContainer: React.FC<Props> = ({ getSubmission, updateSubmission })
     Promise.all([fetchMpeModuleList(), getSubmission()])
       .then(([fetchedMpeModuleList, fetchedSubmission]) => {
         setMpeModuleList(fetchedMpeModuleList);
+        const moduleLookup = new Map(
+          fetchedMpeModuleList.map((module) => [module.moduleCode, module]),
+        );
         setSubmission({
           ...fetchedSubmission,
           // Replace data fetched from MPE server with latest data from MPE module list
-          // TODO: Optimize. This does an linear time lookup for each preference
           preferences: fetchedSubmission.preferences.map((preference) => {
-            const mpeModule = fetchedMpeModuleList.find(
-              (m) => m.moduleCode === preference.moduleCode,
-            );
+            const mpeModule = moduleLookup.get(preference.moduleCode);
             if (!mpeModule) return preference;
             return {
               ...preference,
               moduleTitle: mpeModule.title,
-              moduleCode: mpeModule.moduleCode,
               moduleCredits: parseInt(mpeModule.moduleCredit, 10),
             };
           }),

website/src/views/planner/AddModule.tsx

@@ -119,7 +119,7 @@ export default class AddModule extends React.PureComponent<Props, State> {
 
           <div className={styles.actions}>
             <button className={classnames('btn btn-primary')} type="submit">
-              Add course
+              Add Category
             </button>
             <button
               className={classnames(styles.cancel, 'btn btn-svg')}

website/src/views/planner/PlannerContainer/PlannerContainer.scss

@@ -12,14 +12,20 @@
 
 .header {
   display: flex;
-  justify-content: space-between;
   align-items: center;
+  width: 100%;
+  gap: 1rem;
 
-  h1 {
+  .headerLeft {
     display: flex;
+    flex: 1;
     align-items: center;
     margin: 0;
-    font-size: $font-size-xlg;
+
+    h1 {
+      margin: 1rem;
+      font-size: $font-size-xlg;
+    }
 
     button {
       margin-left: 1rem;
@@ -32,12 +38,21 @@
 
   .headerRight {
     display: flex;
+    justify-content: flex-end;
     align-items: center;
   }
 
   .moduleStats {
+    display: flex;
+    flex-wrap: wrap;
     margin-right: 1rem;
+
+    p {
+      white-space: nowrap;
+    }
   }
+
+  @include scrollable;
 }
 
 .addYearButton {
@@ -60,6 +75,9 @@
 
 .moduleLists {
   display: flex;
+  width: 100%;
+
+  @include scrollable;
 }
 
 .modListHeaders {
@@ -71,6 +89,7 @@
 .trash {
   opacity: 0.6;
   width: $semester-width;
+  min-width: $semester-width;
   border: 1px dashed;
   border-radius: 0.4rem;
   text-align: center;