Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions src/components/ScheduleDisplay.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import React from 'react';

interface ScheduleDisplayProps<T> {
schedule: T | null;
scheduleLoaded: boolean;
renderSchedule: (schedule: T) => React.ReactNode;
/** Optional custom message shown when the schedule is not yet released. */
notReleasedMessage?: string;
}

/**
* ScheduleDisplay
*
* Renders the match schedule, a loading spinner while fetching, or an
* informative message when the schedule has not been released yet.
*
* Resolves issue #200: previously an infinite spinner was shown when the
* schedule simply hadn't been published yet.
*/
export function ScheduleDisplay<T>({
schedule,
scheduleLoaded,
renderSchedule,
notReleasedMessage = 'The match schedule has not been released yet. Check back closer to the event!',
}: ScheduleDisplayProps<T>) {
if (!scheduleLoaded) {
return (
<div className="flex items-center justify-center p-8">
<div
className="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600"
aria-label="Loading schedule"
/>
</div>
);
}

if (!schedule) {
return (
<div className="flex items-center justify-center p-8">
<p className="text-gray-500 italic text-center">{notReleasedMessage}</p>
</div>
);
}

return <>{renderSchedule(schedule)}</>;
}
54 changes: 54 additions & 0 deletions src/hooks/useMatchSchedule.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import { useState, useEffect } from 'react';

export interface MatchScheduleResult<T> {
schedule: T | null;
/** True once the fetch has completed, even if no data was returned. */
scheduleLoaded: boolean;
error: Error | null;
}

/**
* useMatchSchedule
*
* Fetches the match schedule for a given team and returns both the data and
* a `scheduleLoaded` flag so callers can distinguish between
* "still loading" and "loaded but no schedule released yet" (issue #200).
*
* @param fetchFn - Async function that fetches the schedule data.
* @param deps - Dependency array (passed to useEffect).
*/
export function useMatchSchedule<T>(
fetchFn: () => Promise<T | null>,
deps: unknown[] = [],
): MatchScheduleResult<T> {
const [schedule, setSchedule] = useState<T | null>(null);
const [scheduleLoaded, setScheduleLoaded] = useState(false);
const [error, setError] = useState<Error | null>(null);

useEffect(() => {
let cancelled = false;
setScheduleLoaded(false);
setError(null);

fetchFn()
.then((data) => {
if (!cancelled) {
setSchedule(data);
setScheduleLoaded(true);
}
})
.catch((err: unknown) => {
if (!cancelled) {
setError(err instanceof Error ? err : new Error(String(err)));
setScheduleLoaded(true); // stop spinner even on error
}
});

return () => {
cancelled = true;
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, deps);

return { schedule, scheduleLoaded, error };
}
Loading