feat: use normalized track names and save only touched configs
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
'use client';
|
'use client';
|
||||||
|
|
||||||
import type { EventConfig, Session } from '@/lib/schemas/config';
|
import type { EventConfig, Session } from '@/lib/schemas/config';
|
||||||
|
import { TRACKS } from '@/lib/constants/tracks';
|
||||||
|
|
||||||
interface EventConfigEditorProps {
|
interface EventConfigEditorProps {
|
||||||
formData: EventConfig;
|
formData: EventConfig;
|
||||||
@@ -69,31 +70,11 @@ export function EventConfigEditor({ formData, disabled, onFormDataChange }: Even
|
|||||||
onChange={(e) => handleInputChange('track', e.target.value)}
|
onChange={(e) => handleInputChange('track', e.target.value)}
|
||||||
className="form-select w-full"
|
className="form-select w-full"
|
||||||
>
|
>
|
||||||
<option value="barcelona">Barcelona</option>
|
{Object.entries(TRACKS).map(([key, name]) => (
|
||||||
<option value="brands_hatch">Brands Hatch</option>
|
<option key={key} value={key}>
|
||||||
<option value="donington">Donington</option>
|
{name}
|
||||||
<option value="cota">COTA</option>
|
</option>
|
||||||
<option value="hungaroring">Hungaroring</option>
|
))}
|
||||||
<option value="imola">Imola</option>
|
|
||||||
<option value="indianapolis">Indianapolis</option>
|
|
||||||
<option value="kyalami">Kyalami</option>
|
|
||||||
<option value="laguna_seca">Laguna Seca</option>
|
|
||||||
<option value="misano">Misano</option>
|
|
||||||
<option value="monza">Monza</option>
|
|
||||||
<option value="mount_panorama">Mount Panorama</option>
|
|
||||||
<option value="nurburgring">Nurburgring</option>
|
|
||||||
<option value="nurburgring_24h">Nurburgring 24h</option>
|
|
||||||
<option value="oulton_park">Oulton Park</option>
|
|
||||||
<option value="paul_ricard">Paul Ricard</option>
|
|
||||||
<option value="red_bull_ring">Red Bull Ring</option>
|
|
||||||
<option value="silverstone">Silverstone</option>
|
|
||||||
<option value="snetterton">Snetterton</option>
|
|
||||||
<option value="spa">Spa-Francorchamps</option>
|
|
||||||
<option value="suzuka">Suzuka</option>
|
|
||||||
<option value="valencia">Valencia</option>
|
|
||||||
<option value="zandvoort">Zandvoort</option>
|
|
||||||
<option value="zolder">Zolder</option>
|
|
||||||
<option value="watkins_glen">Watkins Glen</option>
|
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,12 @@ const numberFields = [
|
|||||||
label: 'Max Total Driving Time (seconds)',
|
label: 'Max Total Driving Time (seconds)',
|
||||||
min: -1
|
min: -1
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: 'maxDriversCount' as keyof EventRules,
|
||||||
|
label: 'Max Drivers Count',
|
||||||
|
min: 1,
|
||||||
|
max: 10
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key: 'tyreSetCount' as keyof EventRules,
|
key: 'tyreSetCount' as keyof EventRules,
|
||||||
label: 'Tyre Set Count',
|
label: 'Tyre Set Count',
|
||||||
|
|||||||
@@ -80,6 +80,10 @@ const selectFields = [
|
|||||||
key: 'shortFormationLap' as keyof ServerSettings,
|
key: 'shortFormationLap' as keyof ServerSettings,
|
||||||
label: 'Short Formation Lap'
|
label: 'Short Formation Lap'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: 'dumpEntryList' as keyof ServerSettings,
|
||||||
|
label: 'Dump Entry List'
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key: 'ignorePrematureDisconnects' as keyof ServerSettings,
|
key: 'ignorePrematureDisconnects' as keyof ServerSettings,
|
||||||
label: 'Ignore Premature Disconnects'
|
label: 'Ignore Premature Disconnects'
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
import { useTransition } from 'react';
|
import { useTransition } from 'react';
|
||||||
import { Server, ServiceStatus, serviceStatusToString } from '@/lib/schemas';
|
import { Server, ServiceStatus, serviceStatusToString } from '@/lib/schemas';
|
||||||
|
import { getTrackDisplayName } from '@/lib/constants/tracks';
|
||||||
import {
|
import {
|
||||||
startServerEventAction,
|
startServerEventAction,
|
||||||
restartServerEventAction,
|
restartServerEventAction,
|
||||||
@@ -72,7 +73,7 @@ export function ServerCard({ server }: ServerCardProps) {
|
|||||||
<div>
|
<div>
|
||||||
<div className="text-xs text-subtle">Track</div>
|
<div className="text-xs text-subtle">Track</div>
|
||||||
<div className="truncate text-sm font-semibold text-primary">
|
<div className="truncate text-sm font-semibold text-primary">
|
||||||
{server.state?.track || 'N/A'}
|
{server.state?.track ? getTrackDisplayName(server.state.track) : 'N/A'}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
'use client';
|
'use client';
|
||||||
|
|
||||||
import { Configurations, ServerTab } from '@/lib/schemas/config';
|
import { type Configurations, ServerTab } from '@/lib/schemas/config';
|
||||||
import { ConfigurationEditor } from '@/components/configuration/ConfigurationEditor';
|
import { ConfigurationEditor } from '@/components/configuration/ConfigurationEditor';
|
||||||
import { AssistRulesEditor } from '@/components/configuration/AssistRulesEditor';
|
import { AssistRulesEditor } from '@/components/configuration/AssistRulesEditor';
|
||||||
import { EventConfigEditor } from '@/components/configuration/EventConfigEditor';
|
import { EventConfigEditor } from '@/components/configuration/EventConfigEditor';
|
||||||
@@ -54,30 +54,34 @@ export function ServerConfigurationTabs({
|
|||||||
const [eventData, setEventData] = useState(configurations.event);
|
const [eventData, setEventData] = useState(configurations.event);
|
||||||
const [eventRulesData, setEventRulesData] = useState(configurations.eventRules);
|
const [eventRulesData, setEventRulesData] = useState(configurations.eventRules);
|
||||||
const [settingsData, setSettingsData] = useState(configurations.settings);
|
const [settingsData, setSettingsData] = useState(configurations.settings);
|
||||||
|
const [dirtyConfigs, setDirtyConfigs] = useState<Set<keyof Configurations>>(new Set());
|
||||||
|
|
||||||
const [restart, setRestart] = useState(true);
|
const [restart, setRestart] = useState(true);
|
||||||
const [isSubmitting, setIsSubmitting] = useState(false);
|
const [isSubmitting, setIsSubmitting] = useState(false);
|
||||||
const [saveError, setSaveError] = useState<string | null>(null);
|
const [saveError, setSaveError] = useState<string | null>(null);
|
||||||
const [saveSuccess, setSaveSuccess] = useState(false);
|
const [saveSuccess, setSaveSuccess] = useState(false);
|
||||||
|
|
||||||
|
const markDirty = (key: keyof Configurations) =>
|
||||||
|
setDirtyConfigs((prev) => new Set(prev).add(key));
|
||||||
|
|
||||||
const handleSaveAll = async () => {
|
const handleSaveAll = async () => {
|
||||||
|
if (dirtyConfigs.size === 0) return;
|
||||||
|
|
||||||
setIsSubmitting(true);
|
setIsSubmitting(true);
|
||||||
setSaveError(null);
|
setSaveError(null);
|
||||||
setSaveSuccess(false);
|
setSaveSuccess(false);
|
||||||
|
|
||||||
const result = await bulkUpdateConfigurationsAction(
|
const payload: Partial<Configurations> = {};
|
||||||
serverId,
|
if (dirtyConfigs.has('configuration')) payload.configuration = configData;
|
||||||
{
|
if (dirtyConfigs.has('assistRules')) payload.assistRules = assistData;
|
||||||
configuration: configData,
|
if (dirtyConfigs.has('event')) payload.event = eventData;
|
||||||
assistRules: assistData,
|
if (dirtyConfigs.has('eventRules')) payload.eventRules = eventRulesData;
|
||||||
event: eventData,
|
if (dirtyConfigs.has('settings')) payload.settings = settingsData;
|
||||||
eventRules: eventRulesData,
|
|
||||||
settings: settingsData
|
const result = await bulkUpdateConfigurationsAction(serverId, payload, restart);
|
||||||
},
|
|
||||||
restart
|
|
||||||
);
|
|
||||||
|
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
|
setDirtyConfigs(new Set());
|
||||||
setSaveSuccess(true);
|
setSaveSuccess(true);
|
||||||
setTimeout(() => setSaveSuccess(false), 3000);
|
setTimeout(() => setSaveSuccess(false), 3000);
|
||||||
} else {
|
} else {
|
||||||
@@ -99,7 +103,7 @@ export function ServerConfigurationTabs({
|
|||||||
<ConfigurationEditor
|
<ConfigurationEditor
|
||||||
formData={configData}
|
formData={configData}
|
||||||
disabled={isSubmitting}
|
disabled={isSubmitting}
|
||||||
onFormDataChange={setConfigData}
|
onFormDataChange={(data) => { setConfigData(data); markDirty('configuration'); }}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -108,7 +112,7 @@ export function ServerConfigurationTabs({
|
|||||||
<AssistRulesEditor
|
<AssistRulesEditor
|
||||||
formData={assistData}
|
formData={assistData}
|
||||||
disabled={isSubmitting}
|
disabled={isSubmitting}
|
||||||
onFormDataChange={setAssistData}
|
onFormDataChange={(data) => { setAssistData(data); markDirty('assistRules'); }}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -117,7 +121,7 @@ export function ServerConfigurationTabs({
|
|||||||
<EventConfigEditor
|
<EventConfigEditor
|
||||||
formData={eventData}
|
formData={eventData}
|
||||||
disabled={isSubmitting}
|
disabled={isSubmitting}
|
||||||
onFormDataChange={setEventData}
|
onFormDataChange={(data) => { setEventData(data); markDirty('event'); }}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -126,7 +130,7 @@ export function ServerConfigurationTabs({
|
|||||||
<EventRulesEditor
|
<EventRulesEditor
|
||||||
formData={eventRulesData}
|
formData={eventRulesData}
|
||||||
disabled={isSubmitting}
|
disabled={isSubmitting}
|
||||||
onFormDataChange={setEventRulesData}
|
onFormDataChange={(data) => { setEventRulesData(data); markDirty('eventRules'); }}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -135,7 +139,7 @@ export function ServerConfigurationTabs({
|
|||||||
<ServerSettingsEditor
|
<ServerSettingsEditor
|
||||||
formData={settingsData}
|
formData={settingsData}
|
||||||
disabled={isSubmitting}
|
disabled={isSubmitting}
|
||||||
onFormDataChange={setSettingsData}
|
onFormDataChange={(data) => { setSettingsData(data); markDirty('settings'); }}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -203,7 +207,7 @@ export function ServerConfigurationTabs({
|
|||||||
</label>
|
</label>
|
||||||
<button
|
<button
|
||||||
onClick={handleSaveAll}
|
onClick={handleSaveAll}
|
||||||
disabled={isSubmitting}
|
disabled={isSubmitting || dirtyConfigs.size === 0}
|
||||||
className="rounded-md bg-btn-green border border-btn-green px-5 py-2 text-sm font-medium text-white transition-colors hover:bg-btn-green-hover disabled:cursor-not-allowed disabled:opacity-40"
|
className="rounded-md bg-btn-green border border-btn-green px-5 py-2 text-sm font-medium text-white transition-colors hover:bg-btn-green-hover disabled:cursor-not-allowed disabled:opacity-40"
|
||||||
>
|
>
|
||||||
{isSubmitting ? 'Saving…' : 'Save All'}
|
{isSubmitting ? 'Saving…' : 'Save All'}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
'use client';
|
'use client';
|
||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
import { Server, serviceStatusToString, ServiceStatus } from '@/lib/schemas/server';
|
import { Server, serviceStatusToString, ServiceStatus } from '@/lib/schemas/server';
|
||||||
|
import { getTrackDisplayName } from '@/lib/constants/tracks';
|
||||||
import {
|
import {
|
||||||
startServerEventAction,
|
startServerEventAction,
|
||||||
restartServerEventAction,
|
restartServerEventAction,
|
||||||
@@ -72,7 +73,7 @@ export function ServerHeader({ server, user }: ServerHeaderProps) {
|
|||||||
|
|
||||||
<div className="flex flex-wrap gap-6 border-b border-border-muted px-5 py-3">
|
<div className="flex flex-wrap gap-6 border-b border-border-muted px-5 py-3">
|
||||||
{[
|
{[
|
||||||
{ label: 'Track', value: server.state?.track ?? 'N/A' },
|
{ label: 'Track', value: server.state?.track ? getTrackDisplayName(server.state.track) : 'N/A' },
|
||||||
{ label: 'Players', value: `${server.state?.playerCount ?? 0} / ${server.state?.maxConnections ?? 0}` },
|
{ label: 'Players', value: `${server.state?.playerCount ?? 0} / ${server.state?.maxConnections ?? 0}` },
|
||||||
{ label: 'Session', value: server.state?.session ?? 'N/A' },
|
{ label: 'Session', value: server.state?.session ?? 'N/A' },
|
||||||
].map(({ label, value }) => (
|
].map(({ label, value }) => (
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { useTransition } from 'react';
|
|||||||
import { useRouter } from 'next/navigation';
|
import { useRouter } from 'next/navigation';
|
||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
import { Server, ServiceStatus } from '@/lib/schemas';
|
import { Server, ServiceStatus } from '@/lib/schemas';
|
||||||
|
import { getTrackDisplayName } from '@/lib/constants/tracks';
|
||||||
import {
|
import {
|
||||||
startServerEventAction,
|
startServerEventAction,
|
||||||
restartServerEventAction,
|
restartServerEventAction,
|
||||||
@@ -51,7 +52,7 @@ export function ServerRow({ server }: ServerRowProps) {
|
|||||||
<div className="min-w-0">
|
<div className="min-w-0">
|
||||||
<div className="truncate text-sm font-semibold text-primary">{server.name}</div>
|
<div className="truncate text-sm font-semibold text-primary">{server.name}</div>
|
||||||
<div className="truncate text-xs text-muted">
|
<div className="truncate text-xs text-muted">
|
||||||
{server.state?.track ?? 'No track'} · {server.state?.playerCount ?? 0} players
|
{server.state?.track ? getTrackDisplayName(server.state.track) : 'No track'} · {server.state?.playerCount ?? 0} players
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { getTrackDisplayName } from '@/lib/constants/tracks';
|
||||||
|
|
||||||
interface RecentSession {
|
interface RecentSession {
|
||||||
id: string;
|
id: string;
|
||||||
date: string;
|
date: string;
|
||||||
@@ -70,7 +72,7 @@ export function RecentSessions({ sessions }: RecentSessionsProps) {
|
|||||||
{session.type === 'R' ? 'Race' : session.type === 'Q' ? 'Qualify' : 'Practice'}
|
{session.type === 'R' ? 'Race' : session.type === 'Q' ? 'Qualify' : 'Practice'}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-4 py-3 text-sm text-secondary">{session.track}</td>
|
<td className="px-4 py-3 text-sm text-secondary">{getTrackDisplayName(session.track)}</td>
|
||||||
<td className="px-4 py-3 text-sm text-muted">
|
<td className="px-4 py-3 text-sm text-muted">
|
||||||
{formatDuration(session.duration)}
|
{formatDuration(session.duration)}
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -114,6 +114,7 @@ export async function updateServerSettingsAction(serverId: string, formData: For
|
|||||||
centralEntryListPath: formData.get('centralEntryListPath') as string,
|
centralEntryListPath: formData.get('centralEntryListPath') as string,
|
||||||
allowAutoDQ: parseInt(formData.get('allowAutoDQ') as string),
|
allowAutoDQ: parseInt(formData.get('allowAutoDQ') as string),
|
||||||
shortFormationLap: parseInt(formData.get('shortFormationLap') as string),
|
shortFormationLap: parseInt(formData.get('shortFormationLap') as string),
|
||||||
|
dumpEntryList: parseInt(formData.get('dumpEntryList') as string),
|
||||||
formationLapType: parseInt(formData.get('formationLapType') as string),
|
formationLapType: parseInt(formData.get('formationLapType') as string),
|
||||||
ignorePrematureDisconnects: parseInt(formData.get('ignorePrematureDisconnects') as string)
|
ignorePrematureDisconnects: parseInt(formData.get('ignorePrematureDisconnects') as string)
|
||||||
};
|
};
|
||||||
@@ -201,6 +202,7 @@ export async function updateEventRulesAction(serverId: string, formData: FormDat
|
|||||||
driverStintTimeSec: parseInt(formData.get('driverStintTimeSec') as string),
|
driverStintTimeSec: parseInt(formData.get('driverStintTimeSec') as string),
|
||||||
mandatoryPitstopCount: parseInt(formData.get('mandatoryPitstopCount') as string),
|
mandatoryPitstopCount: parseInt(formData.get('mandatoryPitstopCount') as string),
|
||||||
maxTotalDrivingTime: parseInt(formData.get('maxTotalDrivingTime') as string),
|
maxTotalDrivingTime: parseInt(formData.get('maxTotalDrivingTime') as string),
|
||||||
|
maxDriversCount: parseInt(formData.get('maxDriversCount') as string),
|
||||||
isRefuellingAllowedInRace: boolToInt(formData.get('isRefuellingAllowedInRace') === 'true'),
|
isRefuellingAllowedInRace: boolToInt(formData.get('isRefuellingAllowedInRace') === 'true'),
|
||||||
isRefuellingTimeFixed: boolToInt(formData.get('isRefuellingTimeFixed') === 'true'),
|
isRefuellingTimeFixed: boolToInt(formData.get('isRefuellingTimeFixed') === 'true'),
|
||||||
isMandatoryPitstopRefuellingRequired:
|
isMandatoryPitstopRefuellingRequired:
|
||||||
@@ -237,13 +239,13 @@ export async function updateEventRulesAction(serverId: string, formData: FormDat
|
|||||||
|
|
||||||
export async function bulkUpdateConfigurationsAction(
|
export async function bulkUpdateConfigurationsAction(
|
||||||
serverId: string,
|
serverId: string,
|
||||||
configs: Configurations,
|
configs: Partial<Configurations>,
|
||||||
restart: boolean
|
restart: boolean
|
||||||
) {
|
) {
|
||||||
try {
|
try {
|
||||||
const session = await requireAuth();
|
const session = await requireAuth();
|
||||||
|
|
||||||
const validated = configurationsSchema.safeParse(configs);
|
const validated = configurationsSchema.partial().safeParse(configs);
|
||||||
if (!validated.success) {
|
if (!validated.success) {
|
||||||
return { success: false, message: validated.error.message };
|
return { success: false, message: validated.error.message };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ export async function updateServerConfiguration(
|
|||||||
export async function bulkUpdateServerConfigurations(
|
export async function bulkUpdateServerConfigurations(
|
||||||
token: string,
|
token: string,
|
||||||
serverId: string,
|
serverId: string,
|
||||||
configs: Configurations,
|
configs: Partial<Configurations>,
|
||||||
restart = false
|
restart = false
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
await fetchServerAPI<ConfigAuditRecord[]>(
|
await fetchServerAPI<ConfigAuditRecord[]>(
|
||||||
|
|||||||
31
src/lib/constants/tracks.ts
Normal file
31
src/lib/constants/tracks.ts
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
export const TRACKS: Record<string, string> = {
|
||||||
|
barcelona: 'Barcelona',
|
||||||
|
brands_hatch: 'Brands Hatch',
|
||||||
|
cota: 'COTA',
|
||||||
|
donington: 'Donington',
|
||||||
|
hungaroring: 'Hungaroring',
|
||||||
|
imola: 'Imola',
|
||||||
|
indianapolis: 'Indianapolis',
|
||||||
|
kyalami: 'Kyalami',
|
||||||
|
laguna_seca: 'Laguna Seca',
|
||||||
|
misano: 'Misano',
|
||||||
|
monza: 'Monza',
|
||||||
|
mount_panorama: 'Mount Panorama',
|
||||||
|
nurburgring: 'Nürburgring',
|
||||||
|
nurburgring_24h: 'Nürburgring 24h',
|
||||||
|
oulton_park: 'Oulton Park',
|
||||||
|
paul_ricard: 'Paul Ricard',
|
||||||
|
red_bull_ring: 'Red Bull Ring',
|
||||||
|
silverstone: 'Silverstone',
|
||||||
|
snetterton: 'Snetterton',
|
||||||
|
spa: 'Spa-Francorchamps',
|
||||||
|
suzuka: 'Suzuka',
|
||||||
|
valencia: 'Valencia',
|
||||||
|
watkins_glen: 'Watkins Glen',
|
||||||
|
zandvoort: 'Zandvoort',
|
||||||
|
zolder: 'Zolder'
|
||||||
|
};
|
||||||
|
|
||||||
|
export function getTrackDisplayName(key: string): string {
|
||||||
|
return TRACKS[key] ?? key.replace(/_/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase());
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user