Accept Zoom links per room+slot

For online events such as Breakout Days, it does not make a lot of sense to
reuse Zoom coordinates from one session to the next, as the notion of room does
not make a lot of sense.

The code now accepts to take an optional "Zoom" sheet in the spreadsheet that
has "Room" and "Slot" as the first two columns, and Zoom information columns
afterwards (as in the "Rooms" sheet). It uses the Zoom information in that
sheet if it finds it and falls back to reusing the Zoom information at the
room level otheriwse.

When instructed to hide rooms, the code also no longer creates fake room names
à la "R01", but rather sets the location to "Online" for Breakout days, and
"No assigned room yet" otherwise. The new calendar grid still groups the
sessions together in the same column, which is great. Via #333.

The update also fixes a couple of hiccups that prevented it from actually
setting Zoom coordinates in the new API calendar endpoint system...

Author: tidoust

test/stubs.mjs

@@ -188,6 +188,7 @@ async function getTestData(testDataId) {
     },
     rooms: toGraphQLRoomList(custom.rooms ?? ['Panic room (25)']),
     slots: toGraphQLSlotList(custom.slots ?? ['2042-04-07 9:00-10:00']),
+    zoom: [],
     sessions: toGraphQLSessions(custom.sessions ?? [
       { number: 1, title: 'A test session' }
     ]),

tools/appscript/lib/project.mjs

@@ -17,7 +17,8 @@ export function getProjectSheets(spreadsheet) {
     meetings: { titleMatch: /meetings/i },
     rooms: { titleMatch: /rooms/i },
     slots: { titleMatch: /slots/i },
-    people: { titleMatch: /people/i }
+    people: { titleMatch: /people/i },
+    zoom: { titleMatch: /zoom/i }
   };
 
   // Retrieve the sheets from the spreadsheet
@@ -216,6 +217,9 @@ export function getProject(spreadsheet) {
       })
     ),
 
+    zoom: (sheets.zoom?.values ?? [])
+      .filter(v => !!v.name),
+
     sheets: sheets
   };
 

tools/common/calendar.mjs

@@ -297,8 +297,12 @@ export function convertEntryToJSON({
   // Compute room location label
   let roomLocation = '';
   if (project.metadata.rooms === 'hide') {
-    const roomIdx = project.rooms.findIndex(room => room.name === entry.meeting.room);
-    roomLocation = 'R' + (roomIdx < 9 ? '0' : '') + (roomIdx + 1);
+    if (project.metadata.fullType === 'breakouts-day') {
+      roomLocation = 'Online';
+    }
+    else {
+      roomLocation = 'No assigned room yet';
+    }
   }
   else {
     const room = project.rooms.find(room => room.name === entry.meeting.room);
@@ -539,7 +543,8 @@ export async function synchronizeSessionWithCalendar(
   for (const entry of actions.update) {
     console.log(`- refresh calendar entry ${entry.url}, meeting in ${entry.meeting.room} on ${entry.day} ${entry.start} - ${entry.end}`);
     const room = project.rooms.find(room => room.name === entry.meeting.room);
-    const zoom = project.metadata.rooms === 'hide' ? null : room;
+    const zoom = project.zoom?.find(z => z.room === room.name && z.slot.startsWith(`${entry.day} ${entry.start}`)) ??
+      (project.metadata.rooms === 'hide' ? null : room);
     entry.url = await updateCalendarEntry({
       calendarServer,
       entry, session, project,
@@ -550,7 +555,8 @@ export async function synchronizeSessionWithCalendar(
   for (const entry of actions.create) {
     console.log(`- create new calendar entry, meeting in ${entry.meeting.room} on ${entry.day} ${entry.start} - ${entry.end}`);
     const room = project.rooms.find(room => room.name === entry.meeting.room);
-    const zoom = project.metadata.rooms === 'hide' ? null : room;
+    const zoom = project.zoom?.find(z => z.room === room.name && z.slot.startsWith(`${entry.day} ${entry.start}`)) ??
+      (project.metadata.rooms === 'hide' ? null : room);
     entry.url = await updateCalendarEntry({
       calendarServer,
       entry, session, project,
@@ -564,7 +570,7 @@ export async function synchronizeSessionWithCalendar(
     if (e1.day < e2.day) {
       return -1;
     }
-    else if (e1.day > e2.date) {
+    else if (e1.day > e2.day) {
       return 1;
     }
     else {

tools/common/project.mjs

@@ -59,6 +59,7 @@ export async function fetchProjectFromGitHub(reponame, sessionTemplate) {
     metadata: await importVariableFromGitHub(reponame, 'EVENT') ?? {},
     rooms: await importVariableFromGitHub(reponame, 'ROOMS') ?? [],
     slots: await importVariableFromGitHub(reponame, 'SLOTS') ?? [],
+    zoom: await importVariableFromGitHub(reponame, 'ZOOM') ?? [],
     sessions: await fetchSessions(reponame)
   };
 
@@ -139,6 +140,7 @@ export async function exportProjectToGitHub(project, { what }) {
   if (!what || what === 'all' || what === 'metadata') {
     await exportVariableToGitHub(reponame, 'EVENT', project.metadata);
     await exportVariableToGitHub(reponame, 'ROOMS', project.rooms);
+    await exportVariableToGitHub(reponame, 'ZOOM', project.zoom);
     await exportVariableToGitHub(reponame, 'SLOTS', project.slots);
   }