Skip to content

Marshaling: two labeled regions — pilot marshaling vs heat rulings & protests #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryan-johnson2 merged 1 commit into from
Jul 5, 2026
Merged

Marshaling: two labeled regions — pilot marshaling vs heat rulings & protests #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions frontend/apps/rd-console/src/screens/Marshaling.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,14 @@
</div>
{/if}

<!-- ── REGION: pilot marshaling ─────────────────────────────────────────────────
Everything from here to the heat-rulings divider is scoped to the SHOWN PILOT:
their trace, their detection levels, their laps and corrections. -->
<h3 class="region-head">
Pilot marshaling
<span class="region-hint">the shown pilot's laps, trace &amp; corrections</span>
</h3>

{#if hasShownTrace && shownTrace}
{@const tuning = canControl && tuneTrace != null && tuneKeyCurrent}
<!-- Signal-as-evidence (Slice 4): the RSSI graph for the selected pilot's captured trace. A
Expand Down Expand Up @@ -1264,6 +1272,15 @@
{/if}

{#if canControl}
<!-- ── REGION: heat rulings & protests ────────────────────────────────────────────
A deliberate hard break from the per-pilot surfaces above (RD-requested): from
here down the scope is the WHOLE HEAT — penalties, protests, the result
lifecycle, and the void — independent of which pilot is shown. -->
<hr class="region-divider" />
<h3 class="region-head heat">
Heat rulings &amp; protests
<span class="region-hint">whole-heat scope — penalties, protests &amp; the result</span>
</h3>
{#if resultLocked}
<!-- The official-result lock: the Director rejects every result-changing ruling on a
Final heat, so the correction surfaces below are withheld entirely and the ONE way
Expand Down Expand Up @@ -1819,6 +1836,34 @@
list-style: none;
padding: var(--gf-space-1) 0;
}
/* Region heads: the two scopes of this page (pilot vs heat), RD-requested after the
lap-editor consolidation made the seam invisible. The divider is deliberately HEAVY —
sunlit-laptop legible — and the heat region reads as a distinct zone, not more pilot UI. */
.region-head {
display: flex;
align-items: baseline;
gap: var(--gf-space-3);
margin: var(--gf-space-4) 0 var(--gf-space-2);
font-size: var(--gf-font-size-lg);
letter-spacing: var(--gf-tracking-caps);
text-transform: uppercase;
}
.region-head .region-hint {
font-size: var(--gf-font-size-sm);
letter-spacing: normal;
text-transform: none;
color: var(--gf-text-muted);
font-weight: var(--gf-font-weight-normal);
}
.region-divider {
margin: var(--gf-space-7) 0 var(--gf-space-2);
border: 0;
border-top: 3px solid color-mix(in srgb, var(--gf-accent, #7aa2ff) 45%, var(--gf-border));
}
.region-head.heat {
color: color-mix(in srgb, var(--gf-accent, #7aa2ff) 70%, var(--gf-text));
}

.lap-restore {
flex: none;
font-size: var(--gf-font-size-sm);
Expand Down
11 changes: 11 additions & 0 deletions frontend/apps/rd-console/tests/MarshalingScreen.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,17 @@ describe('Marshaling (Slice 3)', () => {
expect(sendSpy).toHaveBeenCalledWith({ SplitLap: { target: 13, at: 21_500_000 } });
});

it('the page reads as TWO scopes: pilot marshaling above, heat rulings below the divider', () => {
const { session } = makeTestSession({ live: liveRunning, laps: lapList });
render(Marshaling, { session });
expect(screen.getByRole('heading', { name: /Pilot marshaling/ })).toBeInTheDocument();
expect(screen.getByRole('heading', { name: /Heat rulings & protests/ })).toBeInTheDocument();
// The pilot region precedes the heat region in document order (the divider separates them).
const heads = screen.getAllByRole('heading', { name: /Pilot marshaling|Heat rulings/ });
expect(heads[0]).toHaveTextContent('Pilot marshaling');
expect(heads[1]).toHaveTextContent('Heat rulings & protests');
});

it('marshals a different heat WITHOUT moving Race Control’s current heat', async () => {
const heats: HeatSummary[] = [
{
Expand Down