Fixing "next match" feature

src/routes/event-team.tsx

@@ -13,7 +13,7 @@ import { getEventTeamInfo } from '@/api/event-team-info/get-event-team-info'
 import { css } from '@linaria/core'
 import { useEventInfo } from '@/cache/event-info/use'
 import { usePromise } from '@/utils/use-promise'
-import { nextIncompleteMatch } from '@/utils/next-incomplete-match'
+import { getUpcomingMatches } from '@/utils/upcoming-matches'
 import { ChartCard } from '@/components/chart'
 import { useEventMatches } from '@/cache/event-matches/use'
 import { useSchema } from '@/cache/schema/use'
@@ -27,12 +27,7 @@ import { useCurrentTime } from '@/utils/use-current-time'
 import { saveTeam, useSavedTeams, removeTeam } from '@/api/save-teams'
 import IconButton from '@/components/icon-button'
 import { EventTeamInfo } from '@/api/event-team-info'
-
-const sectionStyle = css`
-  font-weight: normal;
-  text-align: center;
-  font-size: 1.2rem;
-`
+import { Heading } from '@/components/heading'
 
 interface Props {
   eventKey: string
@@ -60,8 +55,6 @@ const queueDuration = 20 * minute
 const isCurrent = (now: Date) => (match: ProcessedMatchInfo): boolean => {
   const matchStartTime = match.time
   if (!matchStartTime) return false
-  // match starts at 3:04
-  // match is current till 3:11 (+7m)
   const matchEndTime = new Date(matchStartTime.getTime() + matchCycleDuration)
   return matchStartTime < now && now < matchEndTime
 }
@@ -108,9 +101,6 @@ const guessTeamLocation = (
     if (!m.time) return false
 
     const matchStartTime = m.time.getTime()
-    // match starts at 3:04
-    // match queueing starts at 2:39
-    // verify that 2:39 < now < 3:04
     const matchQueueStartTime = matchStartTime - queueDuration
     return matchQueueStartTime < currentTime && currentTime < matchStartTime
   })
@@ -121,9 +111,6 @@ const guessTeamLocation = (
     if (!m.time) return false
     const matchStartTime = m.time.getTime()
     const matchEndTime = matchStartTime + matchCycleDuration
-    // match started at 3:04
-    // match ended at 3:11 (+7m)
-    // verify that 3:11 < now < 3:21 (+10m)
     return (
       matchEndTime < currentTime &&
       currentTime < matchEndTime + afterMatchDuration
@@ -167,7 +154,9 @@ const EventTeam = ({ eventKey, teamNum }: Props) => {
     compareMatches,
   )
 
-  const nextMatch = teamMatches && nextIncompleteMatch(teamMatches)
+  const currentTime = useCurrentTime().getTime()
+  const upcomingMatches =
+    teamMatches && getUpcomingMatches(teamMatches, currentTime)
 
   const savedTeams = useSavedTeams()
   const isTeamSaved = savedTeams.some(
@@ -195,10 +184,26 @@ const EventTeam = ({ eventKey, teamNum }: Props) => {
       back={`/events/${eventKey}`}
       class={eventTeamStyle}
     >
-      {nextMatch && (
+      {upcomingMatches && upcomingMatches.length > 0 && (
         <>
-          <h2 class={sectionStyle}>Next Match</h2>
-          <MatchDetailsCard match={nextMatch} eventKey={eventKey} link />
+          <Heading level={2}>Upcoming Matches</Heading>
+          <div
+            class={css`
+              display: grid;
+              grid-template-columns: 20rem;
+              justify-self: stretch;
+              margin-top: ${spacing};
+            `}
+          >
+            {upcomingMatches.map((match) => (
+              <MatchDetailsCard
+                key={match.key}
+                match={match}
+                eventKey={eventKey}
+                link
+              />
+            ))}
+          </div>
         </>
       )}
       <EventTeamInfoCard

src/routes/event.tsx

@@ -4,11 +4,13 @@ import { useEventInfo } from '@/cache/event-info/use'
 import { css } from '@linaria/core'
 import { EventInfoCard } from '@/components/event-info-card'
 import Button from '@/components/button'
-import { nextIncompleteMatch } from '@/utils/next-incomplete-match'
+import { getUpcomingMatches } from '@/utils/upcoming-matches'
 import { Heading } from '@/components/heading'
 import { EventMatches } from '@/components/event-matches'
 import Loader from '@/components/loader'
 import { useEventMatches } from '@/cache/event-matches/use'
+import { useCurrentTime } from '@/utils/use-current-time'
+import clsx from 'clsx'
 
 interface Props {
   eventKey: string
@@ -32,8 +34,8 @@ const eventStyle = css`
 
 const sectionStyle = css`
   display: grid;
-  grid-template-columns: auto;
-  grid-gap: 2.5rem;
+  grid-template-columns: 1fr;
+  grid-gap: ${spacing};
 `
 
 const headingStyle = css`
@@ -51,7 +53,11 @@ const noMatchesStyle = css`
 const Event = ({ eventKey }: Props) => {
   const matches = useEventMatches(eventKey)
   const eventInfo = useEventInfo(eventKey)
-  const newestIncompleteMatch = matches && nextIncompleteMatch(matches)
+
+  const currentTime = useCurrentTime().getTime()
+  const upcomingMatches = matches
+    ? getUpcomingMatches(matches, currentTime)
+    : []
 
   return (
     <Page
@@ -68,16 +74,43 @@ const Event = ({ eventKey }: Props) => {
       </div>
 
       <div class={sectionStyle}>
-        <Heading level={2} class={headingStyle}>
-          {newestIncompleteMatch ? 'Next Match' : 'Matches'}
-        </Heading>
-        {newestIncompleteMatch && (
-          <MatchDetailsCard
-            key={newestIncompleteMatch.key}
-            match={newestIncompleteMatch}
-            eventKey={eventKey}
-            link
-          />
+        {upcomingMatches.length > 0 ? (
+          <>
+            <Heading level={2} class={headingStyle}>
+              Upcoming Matches
+            </Heading>
+            <div
+              class={css`
+                display: grid;
+                grid-template-columns: auto;
+                grid-gap: 1.1rem;
+              `}
+            >
+              {upcomingMatches.map((match) => (
+                <MatchDetailsCard
+                  key={match.key}
+                  match={match}
+                  eventKey={eventKey}
+                  link
+                />
+              ))}
+            </div>
+            <Heading
+              level={2}
+              class={clsx(
+                headingStyle,
+                css`
+                  margin-top: ${spacing};
+                `,
+              )}
+            >
+              All Matches
+            </Heading>
+          </>
+        ) : (
+          <Heading level={2} class={headingStyle}>
+            Matches
+          </Heading>
         )}
         {matches ? (
           matches.length > 0 ? (

src/utils/clean-field-name.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-warning-comments */
 // TODO: Remove once we can handle multiple fields of the same name
 export const cleanFieldName = (fieldName: string) =>
   fieldName.replace(/\((?:auto|teleop)\)/, '').trim()

src/utils/move-focus-inside/index.ts

@@ -4,6 +4,7 @@ const tababblesStr = tabbables.join(',')
 
 export const moveFocusInside = (el: HTMLElement) => {
   if (el.matches(tababblesStr)) return el.focus()
+  // eslint-disable-next-line no-warning-comments
   // TODO: Should this handle elements with modified tabindex, like https://github.com/theKashey/focus-lock/blob/master/src/utils/tabOrder.js
   const firstFocusableElement = el.querySelector(tababblesStr)
   if (firstFocusableElement) (firstFocusableElement as HTMLElement).focus()

src/utils/upcoming-matches.ts

@@ -0,0 +1,16 @@
+import { ProcessedMatchInfo } from '@/api/match-info'
+
+const ONE_DAY = 24 * 60 * 60 * 1000
+
+/** Return the first three matches of the given set that haven't finished yet (no scores posted)
+ * and are less than one day past their expected start times. */
+export const getUpcomingMatches = (
+  matches: ProcessedMatchInfo[],
+  currentTime: number,
+) =>
+  matches
+    .filter((match) => match.redScore === undefined)
+    .filter(
+      (match) => match.time && match.time.getTime() > currentTime - ONE_DAY,
+    )
+    .slice(0, 3)