From 60f8d79d9e8ccedcd95610a88dd7dc8ec5521aca Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Mon, 3 Nov 2025 10:51:47 +0100 Subject: Simplify estimates endpoint to return only arrival data (#57) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: arielcostas <94913521+arielcostas@users.noreply.github.com> --- src/frontend/app/components/GroupedTable.tsx | 10 +++++----- src/frontend/app/components/RegularTable.tsx | 8 ++++---- src/frontend/app/components/StopSheet.tsx | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/frontend/app/components') diff --git a/src/frontend/app/components/GroupedTable.tsx b/src/frontend/app/components/GroupedTable.tsx index fd97d5b..9bdd5a0 100644 --- a/src/frontend/app/components/GroupedTable.tsx +++ b/src/frontend/app/components/GroupedTable.tsx @@ -1,9 +1,9 @@ -import { type StopDetails } from "../routes/estimates-$id"; +import { type Estimate } from "../routes/estimates-$id"; import LineIcon from "./LineIcon"; import { type RegionConfig } from "../data/RegionConfig"; interface GroupedTable { - data: StopDetails; + data: Estimate[]; dataDate: Date | null; regionConfig: RegionConfig; } @@ -17,7 +17,7 @@ export const GroupedTable: React.FC = ({ data, dataDate, regionCon } }; - const groupedEstimates = data.estimates.reduce( + const groupedEstimates = data.reduce( (acc, estimate) => { if (!acc[estimate.line]) { acc[estimate.line] = []; @@ -25,7 +25,7 @@ export const GroupedTable: React.FC = ({ data, dataDate, regionCon acc[estimate.line].push(estimate); return acc; }, - {} as Record, + {} as Record, ); const sortedLines = Object.keys(groupedEstimates).sort((a, b) => { @@ -72,7 +72,7 @@ export const GroupedTable: React.FC = ({ data, dataDate, regionCon )} - {data?.estimates.length === 0 && ( + {data?.length === 0 && ( diff --git a/src/frontend/app/components/RegularTable.tsx b/src/frontend/app/components/RegularTable.tsx index 68b732a..868332f 100644 --- a/src/frontend/app/components/RegularTable.tsx +++ b/src/frontend/app/components/RegularTable.tsx @@ -1,10 +1,10 @@ import { useTranslation } from "react-i18next"; -import { type StopDetails } from "../routes/estimates-$id"; +import { type Estimate } from "../routes/estimates-$id"; import LineIcon from "./LineIcon"; import { type RegionConfig } from "../data/RegionConfig"; interface RegularTableProps { - data: StopDetails; + data: Estimate[]; dataDate: Date | null; regionConfig: RegionConfig; } @@ -56,7 +56,7 @@ export const RegularTable: React.FC = ({ - {data.estimates + {data .sort((a, b) => a.minutes - b.minutes) .map((estimate, idx) => ( @@ -80,7 +80,7 @@ export const RegularTable: React.FC = ({ ))} - {data?.estimates.length === 0 && ( + {data?.length === 0 && ( diff --git a/src/frontend/app/components/StopSheet.tsx b/src/frontend/app/components/StopSheet.tsx index 0084c14..4bd75a8 100644 --- a/src/frontend/app/components/StopSheet.tsx +++ b/src/frontend/app/components/StopSheet.tsx @@ -6,7 +6,7 @@ import { Clock, ClockFading, Hourglass, RefreshCw } from "lucide-react"; import LineIcon from "./LineIcon"; import { StopSheetSkeleton } from "./StopSheetSkeleton"; import { ErrorDisplay } from "./ErrorDisplay"; -import { type StopDetails } from "../routes/estimates-$id"; +import { type Estimate } from "../routes/estimates-$id"; import { type RegionId, getRegionConfig } from "../data/RegionConfig"; import { useApp } from "../AppContext"; import "./StopSheet.css"; @@ -24,7 +24,7 @@ interface ErrorInfo { message?: string; } -const loadStopData = async (region: RegionId, stopId: number): Promise => { +const loadStopData = async (region: RegionId, stopId: number): Promise => { const regionConfig = getRegionConfig(region); const resp = await fetch(`${regionConfig.estimatesEndpoint}?id=${stopId}`, { headers: { @@ -48,7 +48,7 @@ export const StopSheet: React.FC = ({ const { t } = useTranslation(); const { region } = useApp(); const regionConfig = getRegionConfig(region); - const [data, setData] = useState(null); + const [data, setData] = useState(null); const [loading, setLoading] = useState(false); const [error, setError] = useState(null); const [lastUpdated, setLastUpdated] = useState(null); @@ -120,7 +120,7 @@ export const StopSheet: React.FC = ({ // Show only the next 4 arrivals const limitedEstimates = - data?.estimates.sort((a, b) => a.minutes - b.minutes).slice(0, 4) || []; + data?.sort((a, b) => a.minutes - b.minutes).slice(0, 4) || []; return (