This commit is contained in:
2025-12-11 00:57:32 +01:00
parent 1303a14493
commit 6a427eab57
112 changed files with 6148 additions and 2272 deletions

View File

@@ -2,45 +2,77 @@
import { useState, useEffect } from 'react';
import { useRouter, useParams } from 'next/navigation';
import { ArrowLeft, Zap, Trophy, Users, Clock, Calendar } from 'lucide-react';
import Button from '@/components/ui/Button';
import Card from '@/components/ui/Card';
import Breadcrumbs from '@/components/layout/Breadcrumbs';
import ResultsTable from '@/components/races/ResultsTable';
import ImportResultsForm from '@/components/races/ImportResultsForm';
import { Race } from '@gridpilot/racing/domain/entities/Race';
import { League } from '@gridpilot/racing/domain/entities/League';
import { Result } from '@gridpilot/racing/domain/entities/Result';
import { Driver } from '@gridpilot/racing/domain/entities/Driver';
import type { PenaltyType } from '@gridpilot/racing/domain/entities/Penalty';
import {
getRaceRepository,
getLeagueRepository,
getResultRepository,
getStandingRepository,
getDriverRepository,
getGetRaceWithSOFUseCase,
getGetRacePenaltiesUseCase,
getGetRaceResultsDetailUseCase,
getImportRaceResultsUseCase,
} from '@/lib/di-container';
import type {
RaceResultsHeaderViewModel,
RaceResultsLeagueViewModel,
} from '@gridpilot/racing/application/presenters/IRaceResultsDetailPresenter';
type PenaltyTypeDTO =
| 'time_penalty'
| 'grid_penalty'
| 'points_deduction'
| 'disqualification'
| 'warning'
| 'license_points'
| string;
interface PenaltyData {
driverId: string;
type: PenaltyType;
type: PenaltyTypeDTO;
value?: number;
}
import { ArrowLeft, Zap, Trophy, Users, Clock, Calendar } from 'lucide-react';
interface RaceResultRowDTO {
id: string;
raceId: string;
driverId: string;
position: number;
fastestLap: number;
incidents: number;
startPosition: number;
getPositionChange(): number;
}
interface DriverRowDTO {
id: string;
name: string;
}
interface ImportResultRowDTO {
id: string;
raceId: string;
driverId: string;
position: number;
fastestLap: number;
incidents: number;
startPosition: number;
}
export default function RaceResultsPage() {
const router = useRouter();
const params = useParams();
const raceId = params.id as string;
const [race, setRace] = useState<Race | null>(null);
const [league, setLeague] = useState<League | null>(null);
const [results, setResults] = useState<Result[]>([]);
const [drivers, setDrivers] = useState<Driver[]>([]);
const [race, setRace] = useState<RaceResultsHeaderViewModel | null>(null);
const [league, setLeague] = useState<RaceResultsLeagueViewModel | null>(null);
const [results, setResults] = useState<RaceResultRowDTO[]>([]);
const [drivers, setDrivers] = useState<DriverRowDTO[]>([]);
const [currentDriverId, setCurrentDriverId] = useState<string | undefined>(undefined);
const [raceSOF, setRaceSOF] = useState<number | null>(null);
const [penalties, setPenalties] = useState<PenaltyData[]>([]);
const [pointsSystem, setPointsSystem] = useState<Record<number, number>>({});
const [fastestLapTime, setFastestLapTime] = useState<number | undefined>(undefined);
const [loading, setLoading] = useState(true);
const [error, setError] = useState<string | null>(null);
const [importing, setImporting] = useState(false);
@@ -48,60 +80,59 @@ export default function RaceResultsPage() {
const loadData = async () => {
try {
const raceRepo = getRaceRepository();
const leagueRepo = getLeagueRepository();
const resultRepo = getResultRepository();
const driverRepo = getDriverRepository();
const raceWithSOFUseCase = getGetRaceWithSOFUseCase();
const raceResultsUseCase = getGetRaceResultsDetailUseCase();
await raceResultsUseCase.execute({ raceId });
const raceData = await raceRepo.findById(raceId);
if (!raceData) {
setError('Race not found');
const viewModel = raceResultsUseCase.presenter.getViewModel();
if (!viewModel) {
setError('Failed to load race data');
setLoading(false);
return;
}
setRace(raceData);
// Load race with SOF from application use case
await raceWithSOFUseCase.execute({ raceId });
const raceViewModel = raceWithSOFUseCase.presenter.getViewModel();
if (raceViewModel) {
setRaceSOF(raceViewModel.strengthOfField);
if (viewModel.error && !viewModel.race) {
setError(viewModel.error);
setRace(null);
setLeague(null);
setResults([]);
setDrivers([]);
setPenalties([]);
setPointsSystem({});
setFastestLapTime(undefined);
setCurrentDriverId(undefined);
} else {
setError(null);
setRace(viewModel.race);
setLeague(viewModel.league);
setResults(viewModel.results as unknown as RaceResultRowDTO[]);
setDrivers(
viewModel.drivers.map((d) => ({
id: d.id,
name: d.name,
})),
);
setPointsSystem(viewModel.pointsSystem);
setFastestLapTime(viewModel.fastestLapTime);
setCurrentDriverId(viewModel.currentDriverId);
setPenalties(
viewModel.penalties.map((p) => ({
driverId: p.driverId,
type: p.type as PenaltyTypeDTO,
value: p.value,
})),
);
}
// Load league data
const leagueData = await leagueRepo.findById(raceData.leagueId);
setLeague(leagueData);
// Load results
const resultsData = await resultRepo.findByRaceId(raceId);
setResults(resultsData);
// Load drivers
const driversData = await driverRepo.findAll();
setDrivers(driversData);
// Get current driver (first driver in demo mode)
if (driversData.length > 0) {
setCurrentDriverId(driversData[0].id);
}
// Load penalties for this race
try {
const penaltiesUseCase = getGetRacePenaltiesUseCase();
await penaltiesUseCase.execute(raceId);
const penaltiesViewModel = penaltiesUseCase.presenter.getViewModel();
// Map the DTO to the PenaltyData interface expected by ResultsTable
setPenalties(penaltiesViewModel.map(p => ({
driverId: p.driverId,
type: p.type,
value: p.value,
})));
} catch (penaltyErr) {
console.error('Failed to load penalties:', penaltyErr);
// Don't fail the whole page if penalties fail to load
const raceWithSOFUseCase = getGetRaceWithSOFUseCase();
await raceWithSOFUseCase.execute({ raceId });
const raceViewModel = raceWithSOFUseCase.presenter.getViewModel();
if (raceViewModel) {
setRaceSOF(raceViewModel.strengthOfField);
}
} catch (sofErr) {
console.error('Failed to load SOF:', sofErr);
}
} catch (err) {
setError(err instanceof Error ? err.message : 'Failed to load race data');
@@ -115,32 +146,19 @@ export default function RaceResultsPage() {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [raceId]);
const handleImportSuccess = async (importedResults: Result[]) => {
const handleImportSuccess = async (importedResults: ImportResultRowDTO[]) => {
setImporting(true);
setError(null);
try {
const resultRepo = getResultRepository();
const standingRepo = getStandingRepository();
const importUseCase = getImportRaceResultsUseCase();
await importUseCase.execute({
raceId,
results: importedResults,
});
// Check if results already exist
const existingResults = await resultRepo.existsByRaceId(raceId);
if (existingResults) {
throw new Error('Results already exist for this race');
}
// Create all results
await resultRepo.createMany(importedResults);
// Recalculate standings for the league
if (league) {
await standingRepo.recalculate(league.id);
}
// Reload results
const resultsData = await resultRepo.findByRaceId(raceId);
setResults(resultsData);
setImportSuccess(true);
await loadData();
} catch (err) {
setError(err instanceof Error ? err.message : 'Failed to import results');
} finally {
@@ -152,31 +170,6 @@ export default function RaceResultsPage() {
setError(errorMessage);
};
const getPointsSystem = (): Record<number, number> => {
if (!league) return {};
const pointsSystems: Record<string, Record<number, number>> = {
'f1-2024': {
1: 25, 2: 18, 3: 15, 4: 12, 5: 10,
6: 8, 7: 6, 8: 4, 9: 2, 10: 1
},
'indycar': {
1: 50, 2: 40, 3: 35, 4: 32, 5: 30,
6: 28, 7: 26, 8: 24, 9: 22, 10: 20,
11: 19, 12: 18, 13: 17, 14: 16, 15: 15
}
};
return league.settings.customPoints ||
pointsSystems[league.settings.pointsSystem] ||
pointsSystems['f1-2024'];
};
const getFastestLapTime = (): number | undefined => {
if (results.length === 0) return undefined;
return Math.min(...results.map(r => r.fastestLap));
};
if (loading) {
return (
<div className="min-h-screen bg-deep-graphite py-12 px-4 sm:px-6 lg:px-8">
@@ -212,14 +205,13 @@ export default function RaceResultsPage() {
const breadcrumbItems = [
{ label: 'Races', href: '/races' },
...(league ? [{ label: league.name, href: `/leagues/${league.id}` }] : []),
...(race ? [{ label: race.track, href: `/races/${raceId}` }] : []),
...(race ? [{ label: race.track, href: `/races/${race.id}` }] : []),
{ label: 'Results' },
];
return (
<div className="min-h-screen bg-deep-graphite py-8 px-4 sm:px-6 lg:px-8">
<div className="max-w-6xl mx-auto space-y-6">
{/* Navigation Row: Breadcrumbs left, Back button right */}
<div className="flex items-center justify-between">
<Breadcrumbs items={breadcrumbItems} className="text-sm text-gray-400" />
<Button
@@ -232,15 +224,16 @@ export default function RaceResultsPage() {
</Button>
</div>
{/* Hero Header */}
<div className="relative overflow-hidden rounded-2xl bg-gray-500/10 border border-gray-500/30 p-6 sm:p-8">
<div className="absolute top-0 right-0 w-64 h-64 bg-white/5 rounded-full blur-3xl" />
<div className="relative z-10">
<div className="flex items-center gap-3 mb-4">
<div className="flex items-center gap-2 px-3 py-1.5 rounded-full bg-performance-green/10 border border-performance-green/30">
<Trophy className="w-4 h-4 text-performance-green" />
<span className="text-sm font-semibold text-performance-green">Final Results</span>
<span className="text-sm font-semibold text-performance-green">
Final Results
</span>
</div>
{raceSOF && (
<span className="flex items-center gap-1.5 text-warning-amber text-sm">
@@ -249,11 +242,11 @@ export default function RaceResultsPage() {
</span>
)}
</div>
<h1 className="text-2xl sm:text-3xl font-bold text-white mb-2">
{race?.track ?? 'Race'} Results
</h1>
<div className="flex flex-wrap items-center gap-x-6 gap-y-2 text-gray-400">
{race && (
<>
@@ -271,35 +264,30 @@ export default function RaceResultsPage() {
</span>
</>
)}
{league && (
<span className="text-primary-blue">{league.name}</span>
)}
{league && <span className="text-primary-blue">{league.name}</span>}
</div>
</div>
</div>
{/* Success Message */}
{importSuccess && (
<div className="p-4 bg-performance-green/10 border border-performance-green/30 rounded-lg text-performance-green">
<strong>Success!</strong> Results imported and standings updated.
</div>
)}
{/* Error Message */}
{error && (
<div className="p-4 bg-warning-amber/10 border border-warning-amber/30 rounded-lg text-warning-amber">
<strong>Error:</strong> {error}
</div>
)}
{/* Content */}
<Card>
{hasResults ? (
<ResultsTable
results={results}
drivers={drivers}
pointsSystem={getPointsSystem()}
fastestLapTime={getFastestLapTime()}
pointsSystem={pointsSystem}
fastestLapTime={fastestLapTime}
penalties={penalties}
currentDriverId={currentDriverId}
/>