website: timetables: Re-fix deserialization of TA courses in share link (#4226)

The previous fix didn't work for courses with multiple lessons. Fix that case.

Fixes #4171 again

Author: zwliew

website/src/utils/timetables.test.ts

@@ -691,5 +691,15 @@ describe(deserializeTa, () => {
       CS3210: [['Tutorial', '02']],
       CS3219: [['Tutorial', '15']],
     });
+    expect(
+      deserializeTa('?CS1010S=REC:1,TUT:8&ta=CS3210(TUT:02),CS3219(TUT:15),CS3211(LAB:B05,TUT:13)'),
+    ).toEqual({
+      CS3210: [['Tutorial', '02']],
+      CS3219: [['Tutorial', '15']],
+      CS3211: [
+        ['Laboratory', 'B05'],
+        ['Tutorial', '13'],
+      ],
+    });
   });
 });

website/src/utils/timetables.ts

@@ -625,13 +625,15 @@ export function deserializeTa(serialized: string): TaModulesConfig {
   // If user manually enters multiple TA query keys, use latest one
   const ta = Array.isArray(params.ta) ? last(params.ta) : params.ta;
   if (!ta) return deserialized;
-  ta.split(LESSON_SEP).forEach((moduleConfig) => {
+  ta.split(')').forEach((_moduleConfig) => {
+    // Second and subsequent matches have a leading comma
+    const moduleConfig = _moduleConfig.replace(/^,/, '');
     const moduleCodeMatches = moduleConfig.match(/(.*)\(/);
     if (moduleCodeMatches === null) {
       return;
     }
 
-    const lessonsMatches = moduleConfig.match(/\((.*)\)/);
+    const lessonsMatches = moduleConfig.match(/\((.*)/);
     if (lessonsMatches === null) {
       return;
     }