refactor
This commit is contained in:
@@ -26,8 +26,6 @@ import {
|
||||
import Card from '@/components/ui/Card';
|
||||
import Button from '@/components/ui/Button';
|
||||
import { getAuthService } from '@/lib/auth';
|
||||
import { getGetDashboardOverviewUseCase } from '@/lib/di-container';
|
||||
import { DashboardOverviewPresenter } from '@/lib/presenters/DashboardOverviewPresenter';
|
||||
import type {
|
||||
DashboardOverviewViewModel,
|
||||
DashboardFeedItemSummaryViewModel,
|
||||
@@ -94,10 +92,11 @@ export default async function DashboardPage() {
|
||||
|
||||
const currentDriverId = session.user.primaryDriverId ?? '';
|
||||
|
||||
const useCase = getGetDashboardOverviewUseCase();
|
||||
const presenter = new DashboardOverviewPresenter();
|
||||
await useCase.execute({ driverId: currentDriverId }, presenter);
|
||||
const viewModel = presenter.getViewModel();
|
||||
const response = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/races/dashboard/overview?driverId=${currentDriverId}`);
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to fetch dashboard overview');
|
||||
}
|
||||
const viewModel: DashboardOverviewViewModel = await response.json();
|
||||
|
||||
if (!viewModel) {
|
||||
return null;
|
||||
|
||||
@@ -51,7 +51,7 @@ import type { ProfileOverviewViewModel } from '@core/racing/application/presente
|
||||
import Button from '@/components/ui/Button';
|
||||
import Card from '@/components/ui/Card';
|
||||
import Breadcrumbs from '@/components/layout/Breadcrumbs';
|
||||
import type { GetDriverTeamQueryResultDTO } from '@core/racing/application/dto/TeamCommandAndQueryDTO';
|
||||
import type { GetDriverTeamQueryResultDTO } from '@core/racing/application/dtos/GetDriverTeamQueryResultDTO';
|
||||
import type { TeamMemberViewModel } from '@core/racing/application/presenters/ITeamMembersPresenter';
|
||||
|
||||
// ============================================================================
|
||||
|
||||
@@ -10,7 +10,7 @@ import Breadcrumbs from '@/components/layout/Breadcrumbs';
|
||||
import FileProtestModal from '@/components/races/FileProtestModal';
|
||||
import EndRaceModal from '@/components/leagues/EndRaceModal';
|
||||
import SponsorInsightsCard, { useSponsorMode, MetricBuilders, SlotTemplates } from '@/components/sponsors/SponsorInsightsCard';
|
||||
import { getGetRaceDetailUseCase, getRegisterForRaceUseCase, getWithdrawFromRaceUseCase, getCancelRaceUseCase, getCompleteRaceUseCase } from '@/lib/di-container';
|
||||
import { apiClient } from '@/lib/apiClient';
|
||||
import { useEffectiveDriverId } from '@/lib/currentDriver';
|
||||
import { getMembership, isOwnerOrAdmin } from '@/lib/leagueMembership';
|
||||
import type {
|
||||
@@ -61,10 +61,7 @@ export default function RaceDetailPage() {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
try {
|
||||
const useCase = getGetRaceDetailUseCase();
|
||||
const presenter = new RaceDetailPresenter();
|
||||
await useCase.execute({ raceId, driverId: currentDriverId }, presenter);
|
||||
const vm = presenter.getViewModel();
|
||||
const vm = await apiClient.races.getDetail(raceId, currentDriverId);
|
||||
if (!vm) {
|
||||
throw new Error('Race detail not available');
|
||||
}
|
||||
@@ -130,8 +127,7 @@ export default function RaceDetailPage() {
|
||||
|
||||
setCancelling(true);
|
||||
try {
|
||||
const useCase = getCancelRaceUseCase();
|
||||
await useCase.execute({ raceId: race.id });
|
||||
await apiClient.races.cancel(race.id);
|
||||
await loadRaceData();
|
||||
} catch (err) {
|
||||
alert(err instanceof Error ? err.message : 'Failed to cancel race');
|
||||
@@ -153,9 +149,7 @@ export default function RaceDetailPage() {
|
||||
|
||||
setRegistering(true);
|
||||
try {
|
||||
const useCase = getRegisterForRaceUseCase();
|
||||
await useCase.execute({
|
||||
raceId: race.id,
|
||||
await apiClient.races.register(race.id, {
|
||||
leagueId: league.id,
|
||||
driverId: currentDriverId,
|
||||
});
|
||||
@@ -180,9 +174,7 @@ export default function RaceDetailPage() {
|
||||
|
||||
setRegistering(true);
|
||||
try {
|
||||
const useCase = getWithdrawFromRaceUseCase();
|
||||
await useCase.execute({
|
||||
raceId: race.id,
|
||||
await apiClient.races.withdraw(race.id, {
|
||||
driverId: currentDriverId,
|
||||
});
|
||||
await loadRaceData();
|
||||
@@ -984,8 +976,7 @@ export default function RaceDetailPage() {
|
||||
raceName={race.track}
|
||||
onConfirm={async () => {
|
||||
try {
|
||||
const completeRace = getCompleteRaceUseCase();
|
||||
await completeRace.execute({ raceId: race.id });
|
||||
await apiClient.races.complete(race.id);
|
||||
await loadRaceData();
|
||||
setShowEndRaceModal(false);
|
||||
} catch (err) {
|
||||
|
||||
@@ -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}
|
||||
/>
|
||||
|
||||
@@ -22,21 +22,10 @@ import {
|
||||
import Card from '@/components/ui/Card';
|
||||
import Button from '@/components/ui/Button';
|
||||
import Breadcrumbs from '@/components/layout/Breadcrumbs';
|
||||
import {
|
||||
getGetRaceProtestsUseCase,
|
||||
getGetRacePenaltiesUseCase,
|
||||
getRaceRepository,
|
||||
getLeagueRepository,
|
||||
getLeagueMembershipRepository,
|
||||
} from '@/lib/di-container';
|
||||
import { apiClient } from '@/lib/apiClient';
|
||||
import { useEffectiveDriverId } from '@/lib/currentDriver';
|
||||
import { isLeagueAdminOrHigherRole } from '@/lib/leagueRoles';
|
||||
import { RaceProtestsPresenter } from '@/lib/presenters/RaceProtestsPresenter';
|
||||
import { RacePenaltiesPresenter } from '@/lib/presenters/RacePenaltiesPresenter';
|
||||
import type { RaceProtestViewModel } from '@core/racing/application/presenters/IRaceProtestsPresenter';
|
||||
import type { RacePenaltyViewModel } from '@core/racing/application/presenters/IRacePenaltiesPresenter';
|
||||
import type { League } from '@core/racing/domain/entities/League';
|
||||
import type { Race } from '@core/racing/domain/entities/Race';
|
||||
import type { RaceProtestsViewModel, RacePenaltiesViewModel } from '@/lib/apiClient';
|
||||
|
||||
export default function RaceStewardingPage() {
|
||||
const params = useParams();
|
||||
@@ -44,12 +33,10 @@ export default function RaceStewardingPage() {
|
||||
const raceId = params.id as string;
|
||||
const currentDriverId = useEffectiveDriverId();
|
||||
|
||||
const driversById: Record<string, { name?: string }> = {};
|
||||
|
||||
const [race, setRace] = useState<Race | null>(null);
|
||||
const [league, setLeague] = useState<League | null>(null);
|
||||
const [protests, setProtests] = useState<RaceProtestViewModel[]>([]);
|
||||
const [penalties, setPenalties] = useState<RacePenaltyViewModel[]>([]);
|
||||
const [race, setRace] = useState<any>(null); // TODO: Define proper race type
|
||||
const [league, setLeague] = useState<any>(null); // TODO: Define proper league type
|
||||
const [protestsData, setProtestsData] = useState<RaceProtestsViewModel | null>(null);
|
||||
const [penaltiesData, setPenaltiesData] = useState<RacePenaltiesViewModel | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [isAdmin, setIsAdmin] = useState(false);
|
||||
const [activeTab, setActiveTab] = useState<'pending' | 'resolved' | 'penalties'>('pending');
|
||||
@@ -58,39 +45,24 @@ export default function RaceStewardingPage() {
|
||||
async function loadData() {
|
||||
setLoading(true);
|
||||
try {
|
||||
const raceRepo = getRaceRepository();
|
||||
const leagueRepo = getLeagueRepository();
|
||||
const membershipRepo = getLeagueMembershipRepository();
|
||||
const protestsUseCase = getGetRaceProtestsUseCase();
|
||||
const penaltiesUseCase = getGetRacePenaltiesUseCase();
|
||||
// Get race detail for basic info
|
||||
const raceDetail = await apiClient.races.getDetail(raceId, currentDriverId);
|
||||
setRace(raceDetail.race);
|
||||
setLeague(raceDetail.league);
|
||||
|
||||
const raceData = await raceRepo.findById(raceId);
|
||||
if (!raceData) {
|
||||
setLoading(false);
|
||||
return;
|
||||
}
|
||||
setRace(raceData);
|
||||
|
||||
const leagueData = await leagueRepo.findById(raceData.leagueId);
|
||||
setLeague(leagueData);
|
||||
|
||||
if (leagueData) {
|
||||
const membership = await membershipRepo.getMembership(
|
||||
leagueData.id,
|
||||
currentDriverId,
|
||||
);
|
||||
setIsAdmin(membership ? isLeagueAdminOrHigherRole(membership.role) : false);
|
||||
if (raceDetail.league) {
|
||||
// TODO: Implement admin check via API
|
||||
setIsAdmin(true);
|
||||
}
|
||||
|
||||
const protestsPresenter = new RaceProtestsPresenter();
|
||||
await protestsUseCase.execute({ raceId }, protestsPresenter);
|
||||
const protestsViewModel = protestsPresenter.getViewModel();
|
||||
setProtests(protestsViewModel?.protests ?? []);
|
||||
// Get protests and penalties
|
||||
const [protestsData, penaltiesData] = await Promise.all([
|
||||
apiClient.races.getProtests(raceId),
|
||||
apiClient.races.getPenalties(raceId),
|
||||
]);
|
||||
|
||||
const penaltiesPresenter = new RacePenaltiesPresenter();
|
||||
await penaltiesUseCase.execute({ raceId }, penaltiesPresenter);
|
||||
const penaltiesViewModel = penaltiesPresenter.getViewModel();
|
||||
setPenalties(penaltiesViewModel?.penalties ?? []);
|
||||
setProtestsData(protestsData);
|
||||
setPenaltiesData(penaltiesData);
|
||||
} catch (err) {
|
||||
console.error('Failed to load data:', err);
|
||||
} finally {
|
||||
@@ -101,15 +73,15 @@ export default function RaceStewardingPage() {
|
||||
loadData();
|
||||
}, [raceId, currentDriverId]);
|
||||
|
||||
const pendingProtests = protests.filter(
|
||||
const pendingProtests = protestsData?.protests.filter(
|
||||
(p) => p.status === 'pending' || p.status === 'under_review',
|
||||
);
|
||||
const resolvedProtests = protests.filter(
|
||||
) ?? [];
|
||||
const resolvedProtests = protestsData?.protests.filter(
|
||||
(p) =>
|
||||
p.status === 'upheld' ||
|
||||
p.status === 'dismissed' ||
|
||||
p.status === 'withdrawn',
|
||||
);
|
||||
) ?? [];
|
||||
|
||||
const getStatusBadge = (status: string) => {
|
||||
switch (status) {
|
||||
@@ -247,7 +219,7 @@ export default function RaceStewardingPage() {
|
||||
<Gavel className="w-4 h-4" />
|
||||
<span className="text-xs font-medium uppercase">Penalties</span>
|
||||
</div>
|
||||
<div className="text-2xl font-bold text-white">{penalties.length}</div>
|
||||
<div className="text-2xl font-bold text-white">{penaltiesData?.penalties.length ?? 0}</div>
|
||||
</div>
|
||||
</div>
|
||||
</Card>
|
||||
@@ -306,8 +278,8 @@ export default function RaceStewardingPage() {
|
||||
</Card>
|
||||
) : (
|
||||
pendingProtests.map((protest) => {
|
||||
const protester = driversById[protest.protestingDriverId];
|
||||
const accused = driversById[protest.accusedDriverId];
|
||||
const protester = protestsData?.driverMap[protest.protestingDriverId];
|
||||
const accused = protestsData?.driverMap[protest.accusedDriverId];
|
||||
const daysSinceFiled = Math.floor(
|
||||
(Date.now() - new Date(protest.filedAt).getTime()) / (1000 * 60 * 60 * 24)
|
||||
);
|
||||
@@ -393,8 +365,8 @@ export default function RaceStewardingPage() {
|
||||
</Card>
|
||||
) : (
|
||||
resolvedProtests.map((protest) => {
|
||||
const protester = driversById[protest.protestingDriverId];
|
||||
const accused = driversById[protest.accusedDriverId];
|
||||
const protester = protestsData?.driverMap[protest.protestingDriverId];
|
||||
const accused = protestsData?.driverMap[protest.accusedDriverId];
|
||||
|
||||
return (
|
||||
<Card key={protest.id}>
|
||||
@@ -455,8 +427,8 @@ export default function RaceStewardingPage() {
|
||||
</p>
|
||||
</Card>
|
||||
) : (
|
||||
penalties.map((penalty) => {
|
||||
const driver = driversById[penalty.driverId];
|
||||
penaltiesData?.penalties.map((penalty) => {
|
||||
const driver = penaltiesData?.driverMap[penalty.driverId];
|
||||
return (
|
||||
<Card key={penalty.id}>
|
||||
<div className="flex items-center gap-4">
|
||||
|
||||
@@ -7,12 +7,8 @@ import Card from '@/components/ui/Card';
|
||||
import Button from '@/components/ui/Button';
|
||||
import Heading from '@/components/ui/Heading';
|
||||
import Breadcrumbs from '@/components/layout/Breadcrumbs';
|
||||
import { getGetAllRacesPageDataUseCase } from '@/lib/di-container';
|
||||
import { AllRacesPagePresenter } from '@/lib/presenters/AllRacesPagePresenter';
|
||||
import type {
|
||||
AllRacesPageViewModel,
|
||||
AllRacesListItemViewModel,
|
||||
} from '@core/racing/application/presenters/IAllRacesPagePresenter';
|
||||
import { apiClient } from '@/lib/apiClient';
|
||||
import type { RacesPageDataViewModel, RacesPageDataRaceViewModel } from '@/lib/apiClient';
|
||||
import {
|
||||
Calendar,
|
||||
Clock,
|
||||
@@ -39,7 +35,7 @@ export default function AllRacesPage() {
|
||||
const router = useRouter();
|
||||
const searchParams = useSearchParams();
|
||||
|
||||
const [pageData, setPageData] = useState<AllRacesPageViewModel | null>(null);
|
||||
const [pageData, setPageData] = useState<RacesPageDataViewModel | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
// Pagination
|
||||
@@ -53,10 +49,7 @@ export default function AllRacesPage() {
|
||||
|
||||
const loadRaces = async () => {
|
||||
try {
|
||||
const useCase = getGetAllRacesPageDataUseCase();
|
||||
const presenter = new AllRacesPagePresenter();
|
||||
await useCase.execute(undefined, presenter);
|
||||
const viewModel = presenter.getViewModel();
|
||||
const viewModel = await apiClient.races.getAllPageData();
|
||||
setPageData(viewModel);
|
||||
} catch (err) {
|
||||
console.error('Failed to load races:', err);
|
||||
@@ -69,7 +62,7 @@ export default function AllRacesPage() {
|
||||
void loadRaces();
|
||||
}, []);
|
||||
|
||||
const races: AllRacesListItemViewModel[] = pageData?.races ?? [];
|
||||
const races: RacesPageDataRaceViewModel[] = pageData?.races ?? [];
|
||||
|
||||
const filteredRaces = useMemo(() => {
|
||||
return races.filter(race => {
|
||||
@@ -244,11 +237,14 @@ export default function AllRacesPage() {
|
||||
className="px-4 py-2 bg-deep-graphite border border-charcoal-outline rounded-lg text-white text-sm focus:outline-none focus:ring-2 focus:ring-primary-blue"
|
||||
>
|
||||
<option value="all">All Leagues</option>
|
||||
{pageData?.filters.leagues.map((league) => (
|
||||
<option key={league.id} value={league.id}>
|
||||
{league.name}
|
||||
</option>
|
||||
))}
|
||||
{pageData && [...new Set(pageData.races.map(r => r.leagueId))].map(leagueId => {
|
||||
const race = pageData.races.find(r => r.leagueId === leagueId);
|
||||
return race ? (
|
||||
<option key={leagueId} value={leagueId}>
|
||||
{race.leagueName}
|
||||
</option>
|
||||
) : null;
|
||||
})}
|
||||
</select>
|
||||
|
||||
{/* Clear Filters */}
|
||||
|
||||
@@ -6,12 +6,8 @@ import Link from 'next/link';
|
||||
import Card from '@/components/ui/Card';
|
||||
import Button from '@/components/ui/Button';
|
||||
import Heading from '@/components/ui/Heading';
|
||||
import { getGetRacesPageDataUseCase } from '@/lib/di-container';
|
||||
import { RacesPagePresenter } from '@/lib/presenters/RacesPagePresenter';
|
||||
import type {
|
||||
RacesPageViewModel,
|
||||
RaceListItemViewModel,
|
||||
} from '@core/racing/application/presenters/IRacesPagePresenter';
|
||||
import { apiClient } from '@/lib/apiClient';
|
||||
import type { RacesPageDataViewModel, RacesPageDataRaceViewModel } from '@/lib/apiClient';
|
||||
import {
|
||||
Calendar,
|
||||
Clock,
|
||||
@@ -31,14 +27,14 @@ import {
|
||||
} from 'lucide-react';
|
||||
|
||||
type TimeFilter = 'all' | 'upcoming' | 'live' | 'past';
|
||||
type RaceStatusFilter = RaceListItemViewModel['status'];
|
||||
type RaceStatusFilter = RacesPageDataRaceViewModel['status'];
|
||||
|
||||
export default function RacesPage() {
|
||||
const router = useRouter();
|
||||
|
||||
const [pageData, setPageData] = useState<RacesPageViewModel | null>(null);
|
||||
|
||||
const [pageData, setPageData] = useState<RacesPageDataViewModel | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
|
||||
// Filters
|
||||
const [statusFilter, setStatusFilter] = useState<RaceStatusFilter | 'all'>('all');
|
||||
const [leagueFilter, setLeagueFilter] = useState<string>('all');
|
||||
@@ -46,10 +42,7 @@ export default function RacesPage() {
|
||||
|
||||
const loadRaces = async () => {
|
||||
try {
|
||||
const useCase = getGetRacesPageDataUseCase();
|
||||
const presenter = new RacesPagePresenter();
|
||||
await useCase.execute(undefined, presenter);
|
||||
const data = presenter.getViewModel();
|
||||
const data = await apiClient.races.getPageData();
|
||||
setPageData(data);
|
||||
} catch (err) {
|
||||
console.error('Failed to load races:', err);
|
||||
@@ -65,7 +58,7 @@ export default function RacesPage() {
|
||||
// Filter races
|
||||
const filteredRaces = useMemo(() => {
|
||||
if (!pageData) return [];
|
||||
|
||||
|
||||
return pageData.races.filter((race) => {
|
||||
// Status filter
|
||||
if (statusFilter !== 'all' && race.status !== statusFilter) {
|
||||
@@ -94,7 +87,7 @@ export default function RacesPage() {
|
||||
|
||||
// Group races by date for calendar view
|
||||
const racesByDate = useMemo(() => {
|
||||
const grouped = new Map<string, RaceListItemViewModel[]>();
|
||||
const grouped = new Map<string, RacesPageDataRaceViewModel[]>();
|
||||
filteredRaces.forEach((race) => {
|
||||
if (typeof race.scheduledAt !== 'string') {
|
||||
return;
|
||||
@@ -107,11 +100,16 @@ export default function RacesPage() {
|
||||
});
|
||||
return grouped;
|
||||
}, [filteredRaces]);
|
||||
|
||||
const upcomingRaces = pageData?.upcomingThisWeek ?? [];
|
||||
const liveRaces = pageData?.liveRaces ?? [];
|
||||
const recentResults = pageData?.recentResults ?? [];
|
||||
const stats = pageData?.stats ?? { total: 0, scheduled: 0, running: 0, completed: 0 };
|
||||
|
||||
const upcomingRaces = filteredRaces.filter(r => r.isUpcoming).slice(0, 5);
|
||||
const liveRaces = filteredRaces.filter(r => r.isLive);
|
||||
const recentResults = filteredRaces.filter(r => r.isPast).slice(0, 5);
|
||||
const stats = {
|
||||
total: pageData?.races.length ?? 0,
|
||||
scheduled: pageData?.races.filter(r => r.status === 'scheduled').length ?? 0,
|
||||
running: pageData?.races.filter(r => r.status === 'running').length ?? 0,
|
||||
completed: pageData?.races.filter(r => r.status === 'completed').length ?? 0,
|
||||
};
|
||||
|
||||
const formatDate = (date: Date | string) => {
|
||||
const d = typeof date === 'string' ? new Date(date) : date;
|
||||
|
||||
Reference in New Issue
Block a user