Skip 'orphaned' activities in the Schedule View component (thewca#9509)

* Be more conservative about listing WCIF events * Filter out orphaned activities * Improve orphan detection
abunickabhi · Jun 12, 2024 · 356c24d · 356c24d
1 parent da07de0
commit 356c24d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 12 deletions.
diff --git a/app/webpacker/components/Schedule/CalendarView.jsx b/app/webpacker/components/Schedule/CalendarView.jsx
@@ -6,6 +6,7 @@ import React from 'react';
 import {
   earliestTimeOfDayWithBuffer,
   getActivityEventId,
+  isOrphanedActivity,
   latestTimeOfDayWithBuffer,
   localizeActivityName,
 } from '../../lib/utils/activities';
@@ -31,14 +32,15 @@ export default function CalendarView({
   timeZone,
   activeVenues,
   activeRooms,
-  activeEvents,
+  activeEventIds,
   calendarLocale,
+  wcifEvents,
 }) {
-  const activeEventIds = activeEvents.map(({ id }) => id);
   const fcActivities = activeRooms.flatMap((room) => room.activities
     .filter((activity) => ['other', ...activeEventIds].includes(getActivityEventId(activity)))
+    .filter((activity) => !isOrphanedActivity(activity, wcifEvents))
     .map((activity) => {
-      const eventName = activity.activityCode.startsWith('other') ? activity.name : localizeActivityName(activity, activeEvents);
+      const eventName = activity.activityCode.startsWith('other') ? activity.name : localizeActivityName(activity, wcifEvents);
       const eventColor = activity.activityCode.startsWith('other') ? ACTIVITY_OTHER_GREY : room.color;
 
       return ({

diff --git a/app/webpacker/components/Schedule/TableView.jsx b/app/webpacker/components/Schedule/TableView.jsx
@@ -9,7 +9,9 @@ import {
   earliestWithLongestTieBreaker,
   getActivityEventId,
   getActivityRoundId,
-  groupActivities, localizeActivityName,
+  groupActivities,
+  isOrphanedActivity,
+  localizeActivityName,
 } from '../../lib/utils/activities';
 import { getSimpleTimeString } from '../../lib/utils/dates';
 import { toDegrees } from '../../lib/utils/edit-schedule';
@@ -42,8 +44,10 @@ export default function TableView({
     .flatMap((room) => room.activities)
     .toSorted(earliestWithLongestTieBreaker);
 
-  const eventIds = activeEvents.map(({ id }) => id);
-  const visibleActivities = sortedActivities.filter((activity) => ['other', ...eventIds].includes(getActivityEventId(activity)));
+  const activeEventIds = activeEvents.map(({ id }) => id);
+  const visibleActivities = sortedActivities
+    .filter((activity) => ['other', ...activeEventIds].includes(getActivityEventId(activity)))
+    .filter((activity) => !isOrphanedActivity(activity, wcifEvents));
 
   return (
     <>
@@ -69,7 +73,6 @@ export default function TableView({
             date={date}
             timeZone={timeZone}
             groupedActivities={groupedActivitiesForDay}
-            events={activeEvents}
             rounds={activeRounds}
             rooms={activeRooms}
             isExpanded={isExpanded}
@@ -87,7 +90,6 @@ function SingleDayTable({
   date,
   timeZone,
   groupedActivities,
-  events,
   rounds,
   rooms,
   isExpanded,
@@ -137,7 +139,6 @@ function SingleDayTable({
                 key={representativeActivity.id}
                 isExpanded={isExpanded}
                 activityGroup={activityGroup}
-                events={events}
                 round={activityRound}
                 rooms={rooms}
                 timeZone={timeZone}
@@ -179,7 +180,6 @@ function HeaderRow({ isExpanded }) {
 function ActivityRow({
   isExpanded,
   activityGroup,
-  events,
   round,
   rooms,
   timeZone,
@@ -188,7 +188,7 @@ function ActivityRow({
   const representativeActivity = activityGroup[0];
   const { startTime, endTime } = representativeActivity;
 
-  const name = representativeActivity.activityCode.startsWith('other') ? representativeActivity.name : localizeActivityName(representativeActivity, events);
+  const name = representativeActivity.activityCode.startsWith('other') ? representativeActivity.name : localizeActivityName(representativeActivity, wcifEvents);
   const eventId = representativeActivity.activityCode.startsWith('other') ? 'other' : parseActivityCode(representativeActivity.activityCode).eventId;
 
   const activityIds = activityGroup.map((activity) => activity.id);

diff --git a/app/webpacker/components/Schedule/index.jsx b/app/webpacker/components/Schedule/index.jsx
@@ -167,8 +167,9 @@ export default function Schedule({
           timeZone={activeTimeZone}
           activeVenues={activeVenues}
           activeRooms={activeRooms}
-          activeEvents={activeEvents}
+          activeEventIds={activeEventIds}
           calendarLocale={calendarLocale}
+          wcifEvents={wcifEvents}
         />
       ) : (
         <TableView

diff --git a/app/webpacker/lib/utils/activities.js b/app/webpacker/lib/utils/activities.js
@@ -123,3 +123,17 @@ export const localizeActivityName = (activity, wcifEvents) => {
 
   return localizeActivityCode(activity.activityCode, activityRound, activityEvent);
 };
+
+export const isOrphanedActivity = (activity, wcifEvents) => {
+  if (getActivityEventId(activity) === 'other') {
+    // 'other' activities are never matched to an event because by definition,
+    //   they are not a standard WCA event.
+    return false;
+  }
+
+  const activityEvent = findActivityEvent(activity, wcifEvents);
+
+  return (
+    activityEvent === undefined || findActivityRound(activity, activityEvent.rounds) === undefined
+  );
+};