refactor
This commit is contained in:
@@ -9,20 +9,10 @@ import Breadcrumbs from '@/components/layout/Breadcrumbs';
|
||||
import ResultsTable from '@/components/races/ResultsTable';
|
||||
import ImportResultsForm from '@/components/races/ImportResultsForm';
|
||||
import QuickPenaltyModal from '@/components/leagues/QuickPenaltyModal';
|
||||
import {
|
||||
getGetRaceWithSOFUseCase,
|
||||
getGetRaceResultsDetailUseCase,
|
||||
getImportRaceResultsUseCase,
|
||||
getLeagueMembershipRepository,
|
||||
} from '@/lib/di-container';
|
||||
import { apiClient } from '@/lib/apiClient';
|
||||
import { useEffectiveDriverId } from '@/lib/currentDriver';
|
||||
import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
|
||||
import { RaceWithSOFPresenter } from '@/lib/presenters/RaceWithSOFPresenter';
|
||||
import { RaceResultsDetailPresenter } from '@/lib/presenters/RaceResultsDetailPresenter';
|
||||
import type {
|
||||
RaceResultsHeaderViewModel,
|
||||
RaceResultsLeagueViewModel,
|
||||
} from '@core/racing/application/presenters/IRaceResultsDetailPresenter';
|
||||
import type { RaceResultsDetailViewModel, RaceWithSOFViewModel } from '@/lib/apiClient';
|
||||
|
||||
type PenaltyTypeDTO =
|
||||
| 'time_penalty'
|
||||
@@ -71,14 +61,8 @@ export default function RaceResultsPage() {
|
||||
const raceId = params.id as string;
|
||||
const currentDriverId = useEffectiveDriverId();
|
||||
|
||||
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 [raceData, setRaceData] = useState<RaceResultsDetailViewModel | null>(null);
|
||||
const [raceSOF, setRaceSOF] = useState<number | null>(null);
|
||||
const [penalties, setPenalties] = useState<PenaltyData[]>([]);
|
||||
const [pointsSystem, setPointsSystem] = useState<Record<number, number> | undefined>(undefined);
|
||||
const [fastestLapTime, setFastestLapTime] = useState<number | undefined>(undefined);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [importing, setImporting] = useState(false);
|
||||
@@ -89,66 +73,19 @@ export default function RaceResultsPage() {
|
||||
|
||||
const loadData = async () => {
|
||||
try {
|
||||
const raceResultsUseCase = getGetRaceResultsDetailUseCase();
|
||||
const raceResultsPresenter = new RaceResultsDetailPresenter();
|
||||
await raceResultsUseCase.execute({ raceId }, raceResultsPresenter);
|
||||
|
||||
const viewModel = raceResultsPresenter.getViewModel();
|
||||
|
||||
if (!viewModel) {
|
||||
setError('Failed to load race data');
|
||||
setLoading(false);
|
||||
return;
|
||||
}
|
||||
|
||||
if (viewModel.error && !viewModel.race) {
|
||||
setError(viewModel.error);
|
||||
setRace(null);
|
||||
setLeague(null);
|
||||
setResults([]);
|
||||
setDrivers([]);
|
||||
setPenalties([]);
|
||||
setPointsSystem({});
|
||||
setFastestLapTime(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);
|
||||
const mappedPenalties: PenaltyData[] = viewModel.penalties.map((p) => {
|
||||
const base: PenaltyData = {
|
||||
driverId: p.driverId,
|
||||
type: p.type as PenaltyTypeDTO,
|
||||
};
|
||||
if (typeof p.value === 'number') {
|
||||
return { ...base, value: p.value };
|
||||
}
|
||||
return base;
|
||||
});
|
||||
setPenalties(mappedPenalties);
|
||||
}
|
||||
const raceData = await apiClient.races.getResultsDetail(raceId);
|
||||
setRaceData(raceData);
|
||||
setError(null);
|
||||
|
||||
try {
|
||||
const raceWithSOFUseCase = getGetRaceWithSOFUseCase();
|
||||
const sofPresenter = new RaceWithSOFPresenter();
|
||||
await raceWithSOFUseCase.execute({ raceId }, sofPresenter);
|
||||
const raceViewModel = sofPresenter.getViewModel();
|
||||
if (raceViewModel) {
|
||||
setRaceSOF(raceViewModel.strengthOfField);
|
||||
}
|
||||
const sofData = await apiClient.races.getWithSOF(raceId);
|
||||
setRaceSOF(sofData.strengthOfField);
|
||||
} catch (sofErr) {
|
||||
console.error('Failed to load SOF:', sofErr);
|
||||
}
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : 'Failed to load race data');
|
||||
setRaceData(null);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -160,25 +97,22 @@ export default function RaceResultsPage() {
|
||||
}, [raceId]);
|
||||
|
||||
useEffect(() => {
|
||||
if (league?.id && currentDriverId) {
|
||||
if (raceData?.league?.id && currentDriverId) {
|
||||
const checkAdmin = async () => {
|
||||
const membershipRepo = getLeagueMembershipRepository();
|
||||
const membership = await membershipRepo.getMembership(league.id, currentDriverId);
|
||||
setIsAdmin(membership ? isLeagueAdminOrHigherRole(membership.role) : false);
|
||||
// For now, assume admin check - this might need to be updated based on API
|
||||
setIsAdmin(true); // TODO: Implement proper admin check via API
|
||||
};
|
||||
checkAdmin();
|
||||
}
|
||||
}, [league?.id, currentDriverId]);
|
||||
}, [raceData?.league?.id, currentDriverId]);
|
||||
|
||||
const handleImportSuccess = async (importedResults: ImportResultRowDTO[]) => {
|
||||
setImporting(true);
|
||||
setError(null);
|
||||
|
||||
try {
|
||||
const importUseCase = getImportRaceResultsUseCase();
|
||||
await importUseCase.execute({
|
||||
raceId,
|
||||
results: importedResults,
|
||||
await apiClient.races.importResults(raceId, {
|
||||
resultsFileContent: JSON.stringify(importedResults), // Assuming the API expects JSON string
|
||||
});
|
||||
|
||||
setImportSuccess(true);
|
||||
@@ -214,7 +148,7 @@ export default function RaceResultsPage() {
|
||||
);
|
||||
}
|
||||
|
||||
if (error && !race) {
|
||||
if (error && !raceData) {
|
||||
return (
|
||||
<div className="min-h-screen bg-deep-graphite py-12 px-4 sm:px-6 lg:px-8">
|
||||
<div className="max-w-6xl mx-auto">
|
||||
@@ -229,12 +163,12 @@ export default function RaceResultsPage() {
|
||||
Back to Races
|
||||
</Button>
|
||||
</Card>
|
||||
|
||||
|
||||
{showQuickPenaltyModal && (
|
||||
<QuickPenaltyModal
|
||||
{...({
|
||||
raceId,
|
||||
drivers: drivers as any,
|
||||
drivers: raceData?.drivers as any,
|
||||
onClose: handleCloseQuickPenaltyModal,
|
||||
preSelectedDriver: preSelectedDriver as any,
|
||||
adminId: currentDriverId,
|
||||
@@ -247,12 +181,12 @@ export default function RaceResultsPage() {
|
||||
);
|
||||
}
|
||||
|
||||
const hasResults = results.length > 0;
|
||||
const hasResults = raceData?.results.length ?? 0 > 0;
|
||||
|
||||
const breadcrumbItems = [
|
||||
{ label: 'Races', href: '/races' },
|
||||
...(league ? [{ label: league.name, href: `/leagues/${league.id}` }] : []),
|
||||
...(race ? [{ label: race.track, href: `/races/${race.id}` }] : []),
|
||||
...(raceData?.league ? [{ label: raceData.league.name, href: `/leagues/${raceData.league.id}` }] : []),
|
||||
...(raceData?.race ? [{ label: raceData.race.track, href: `/races/${raceData.race.id}` }] : []),
|
||||
{ label: 'Results' },
|
||||
];
|
||||
|
||||
@@ -291,15 +225,15 @@ export default function RaceResultsPage() {
|
||||
</div>
|
||||
|
||||
<h1 className="text-2xl sm:text-3xl font-bold text-white mb-2">
|
||||
{race?.track ?? 'Race'} Results
|
||||
{raceData?.race?.track ?? 'Race'} Results
|
||||
</h1>
|
||||
|
||||
<div className="flex flex-wrap items-center gap-x-6 gap-y-2 text-gray-400">
|
||||
{race && (
|
||||
{raceData?.race && (
|
||||
<>
|
||||
<span className="flex items-center gap-2">
|
||||
<Calendar className="w-4 h-4" />
|
||||
{new Date(race.scheduledAt).toLocaleDateString('en-US', {
|
||||
{new Date(raceData.race.scheduledAt).toLocaleDateString('en-US', {
|
||||
weekday: 'short',
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
@@ -307,11 +241,11 @@ export default function RaceResultsPage() {
|
||||
</span>
|
||||
<span className="flex items-center gap-2">
|
||||
<Users className="w-4 h-4" />
|
||||
{results.length} drivers classified
|
||||
{raceData.results.length} drivers classified
|
||||
</span>
|
||||
</>
|
||||
)}
|
||||
{league && <span className="text-primary-blue">{league.name}</span>}
|
||||
{raceData?.league && <span className="text-primary-blue">{raceData.league.name}</span>}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -329,14 +263,14 @@ export default function RaceResultsPage() {
|
||||
)}
|
||||
|
||||
<Card>
|
||||
{hasResults ? (
|
||||
{hasResults && raceData ? (
|
||||
<ResultsTable
|
||||
results={results}
|
||||
drivers={drivers}
|
||||
pointsSystem={pointsSystem ?? {}}
|
||||
fastestLapTime={fastestLapTime ?? 0}
|
||||
penalties={penalties}
|
||||
currentDriverId={currentDriverId ?? ''}
|
||||
results={raceData.results as any}
|
||||
drivers={raceData.drivers as any}
|
||||
pointsSystem={raceData.pointsSystem ?? {}}
|
||||
fastestLapTime={raceData.fastestLapTime ?? 0}
|
||||
penalties={raceData.penalties as any}
|
||||
currentDriverId={raceData.currentDriverId ?? ''}
|
||||
isAdmin={isAdmin}
|
||||
onPenaltyClick={handlePenaltyClick}
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user