2026-09-21 03:16:40 +02:00
8 changed files with 157 additions and 186 deletions
@@ -1,5 +1,9 @@
 # Changelog

+## v0.33.0 — 2026-09-21 00:45
+- **Merged On board into the Fleet list (ISS-054).** The left pane's separate "On board" section is deleted; each Fleet row (`components/LeftPane.tsx`) is now the single per-plane block — status/fuel/loadout plus, when present, that plane's loaded/expired cargo rows (fly-to / refuel-for-flight / abandon + penalty preview) and its queue legs. The header shows "in flight" + the current leg for flying planes and the location ICAO when grounded; the empty "Queue" heading is no longer rendered (the sub-section renders only with ≥1 queued leg). All per-item testids unchanged (`onboard-package-*`, `fly-to-*`, `refuel-for-*`, `abandon-*`, `abandon-penalty-*`, `plane-leg-*`, `queue-leg-*`, `queue-cancel-*`); the removed one is `onboard-{plane.id}` (use `plane-{id}`). CSS: `.onboard-block .contract-row*` re-targeted to `.plane-row .contract-row*`; no server or OpenAPI changes
+- **E2E updates.** The four `onboard-{plane.id}` references now target the fleet rows (`e2e/hover.spec.ts`, `e2e/right-pane.spec.ts`, `e2e/two-planes.spec.ts`); `e2e/panes.spec.ts` no longer asserts an "On board" heading — it asserts the heading is absent from both panes
+
 ## v0.32.0 — 2026-09-20 23:47
 - **Queue via fly-to and Relocate; dedicated queue-add input removed (ISS-053).** The flight queue no longer has its own entry point in the On board block (`components/LeftPane.tsx`): the per-cargo "Fly to …" button is now enabled for ANY plane state, and posts to `/api/planes/{id}/queue` instead of `/fly` when the plane is `flying` (grounded → `/fly`, unchanged); Relocate's plane list widened from grounded-only to ALL planes (`relocatable = state.planes`; Refuel keeps its own `grounded` filter), and `relocate-go` posts to `/queue` when the SELECTED plane is flying, else `/fly`. The queue-add select + "Add to queue" button (and the shared `queueAddDestIcao` state) are deleted; leg rows + cancel buttons unchanged. No server or OpenAPI changes — both endpoints already existed
 - **E2E updates.** `e2e/queue.spec.ts` test 1 now adds its queued leg via the Relocate section (selects plane-starter, which is flying at that point → `/queue`) instead of the removed queue-add control; `e2e/two-planes.spec.ts` "per-plane queues are independent" adds the starter's second leg via API POST `/api/planes/plane-starter/queue` (the starter is grounded there, so fly-to would start rather than queue). All `queue-leg-*` / `queue-cancel-*` assertions unchanged
@@ -376,17 +376,10 @@ body {
  font-variant-numeric: tabular-nums;
 }

-/* v0.12.0 — on-board blocks (per plane); moved to the left pane in ISS-021 (v0.20.0) */
-.onboard-block {
-  background: rgba(30, 41, 59, 0.6);
-  border-radius: 6px;
-  padding: 8px;
-  margin-bottom: 8px;
-}
-
-/* ISS-028 (v0.20.0 part 2) — on-board cargo rows are two lines: a full-width fly-to button,
-   then refuel + abandon side by side below it; long destination names truncate with an ellipsis. */
-.onboard-block .contract-row {
+/* ISS-054 (v0.33.0) — per-plane cargo rows nested inside the Fleet list's plane cards: two lines,
+   a full-width fly-to button then refuel + abandon side by side below it; long destination names
+   truncate with an ellipsis. Transparent sub-rows with a top border under the card header. */
+.plane-row .contract-row {
  background: transparent;
  padding: 6px 0 0;
  border-top: 1px solid rgba(148, 163, 184, 0.2);
@@ -395,7 +388,7 @@ body {
  gap: 5px;
 }

-.onboard-block .contract-row .contract-sub {
+.plane-row .contract-row .contract-sub {
  margin-top: 0; /* row spacing comes from the container's gap */
 }

@@ -19,7 +19,7 @@ interface LeftPaneProps {
  // The shell's single-poll refresh — called after a sim-control POST so the pane updates immediately.
  onRefresh: () => void;
  // ISS-021 (v0.20.0): push the full snapshot returned by an action endpoint into the shared shell
-  // state — needed now that the On board section's refuel/fly/abandon actions live in this pane.
+  // state — needed now that the per-plane cargo rows' refuel/fly/abandon actions live in this pane.
  applySnapshot: (snapshot: StateSnapshot) => void;
  // ISS-002 (v0.15.0): report fleet-row hovers to the shell so the map can highlight the plane.
  onHover: (target: HoverTarget | null) => void;
@@ -92,7 +92,7 @@ export async function retrySimPost(
 export default function LeftPane({ state, loading, error, onRefresh, applySnapshot, onHover, onError }: LeftPaneProps) {
  const [busy, setBusy] = useState(false);

-  // ISS-021 (v0.20.0): shared action runner for the On board section (moved here from RightPane).
+  // ISS-021 (v0.20.0): shared action runner for the per-plane cargo/queue actions (moved here from RightPane).
  const { runAction, busy: actionsBusy, actionError } = useGameAction(state, applySnapshot, onError);

  // ISS-023 (v0.21.0): Relocate selections — moved here from the right-pane market row; same
@@ -195,15 +195,8 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
  const paused = state?.simState.paused ?? false;
  const timeScale = state?.simState.timeScale ?? 1;

-  // On board (v0.12.0, moved from the right pane in ISS-021 v0.20.0): every plane that carries
-  // cargo or is mid-flight gets a block — its loaded/expired packages with fly-to-destination +
-  // abandon controls, and flying planes show their current leg.
+  // Snapshot clock — feeds the deadline/penalty previews in the per-plane cargo rows.
  const clockMs = state?.simState.clockMs ?? 0;
-  // ISS-043 (v0.26.0): a plane with queued legs always shows its block too — the queue is the
-  // reason it's here even when grounded with nothing on board.
-  const onboard = state
-    ? state.planes.filter((p) => p.status === 'flying' || cargoWeightFor(state, p.id) > 0 || (p.queue?.length ?? 0) > 0)
-    : [];

  // ISS-023 (v0.21.0): Relocate — any plane can be repositioned to any airport via the existing fly
  // endpoint (pure repositioning, no package needed since v0.12.0). Moved here from the right-pane
@@ -340,161 +333,143 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
              <p className="pane-muted">No planes.</p>
            ) : (
              <ul data-testid="fleet-list" className="fleet-list">
-                {state.planes.map((p) => (
-                  // ISS-002: hovering a fleet row highlights the plane on the map.
-                  <li
-                    key={p.id}
-                    data-testid={`plane-${p.id}`}
-                    className="plane-row"
-                    onMouseEnter={() => onHover({ kind: 'plane', id: p.id })}
-                    onMouseLeave={() => onHover(null)}
-                  >
-                    <div className="plane-main">
-                      <span className="plane-model">{PLANE_TYPES[p.model]?.name ?? p.model}</span>
-                      <span className={`plane-status status-${p.status}`}>{p.status}</span>
-                    </div>
-                    <div className="fuel-bar" aria-hidden="true">
-                      <div style={{ width: `${Math.max(0, Math.min(100, (p.fuel / p.maxFuel) * 100))}%` }} />
-                    </div>
-                    <div className="plane-sub">
-                      <span data-testid={`plane-fuel-${p.id}`}>{formatFuel(p.fuel, p.maxFuel)}</span>
-                      <span data-testid={`plane-loadout-${p.id}`}>{loadoutFor(state, p)}</span>
-                      <span className="plane-loc">{planeLocation(p)}</span>
-                    </div>
-                  </li>
-                ))}
+                {state.planes.map((p) => {
+                  // ISS-054 (v0.33.0): the merged per-plane block — status/fuel/loadout plus the former
+                  // On board section's cargo rows and queue legs, so all plane info lives in one place.
+                  const cargo = state.packages.filter(
+                    (pkg) => pkg.planeId === p.id && (pkg.status === 'loaded' || pkg.status === 'expired'),
+                  );
+                  return (
+                    // ISS-002: hovering a fleet row highlights the plane on the map. Handlers live only on
+                    // the outer <li> — React's enter/leave don't fire when moving to a child, so this covers
+                    // the whole block without flicker between sub-elements; cargo rows override with their
+                    // own package hover (below).
+                    <li
+                      key={p.id}
+                      data-testid={`plane-${p.id}`}
+                      className="plane-row"
+                      onMouseEnter={() => onHover({ kind: 'plane', id: p.id })}
+                      onMouseLeave={() => onHover(null)}
+                    >
+                      <div className="plane-main">
+                        <span className="plane-model">{PLANE_TYPES[p.model]?.name ?? p.model}</span>
+                        {p.status === 'flying' ? (
+                          <>
+                            <span className="plane-status status-flying">in flight</span>
+                            {p.destName && (
+                              <span data-testid={`plane-leg-${p.id}`} className="contract-route">
+                                {p.locationName} → {p.destName}
+                              </span>
+                            )}
+                          </>
+                        ) : (
+                          <span className="plane-status status-available">{p.locationIcao}</span>
+                        )}
+                      </div>
+                      <div className="fuel-bar" aria-hidden="true">
+                        <div style={{ width: `${Math.max(0, Math.min(100, (p.fuel / p.maxFuel) * 100))}%` }} />
+                      </div>
+                      <div className="plane-sub">
+                        <span data-testid={`plane-fuel-${p.id}`}>{formatFuel(p.fuel, p.maxFuel)}</span>
+                        <span data-testid={`plane-loadout-${p.id}`}>{loadoutFor(state, p)}</span>
+                        <span className="plane-loc">{planeLocation(p)}</span>
+                      </div>
+                      {cargo.map((pkg) => {
+                        const penalty = abandonPenalty(pkg, clockMs);
+                        return (
+                          // ISS-025 (v0.22.0): hovering a loaded package draws its full origin→dest trace on the map —
+                          // same as job-list rows — and keeps this plane's halo lit via planeId. Leaving the row restores
+                          // the block's plain plane highlight; leaving the whole block still ends at null (the child's
+                          // mouseleave fires before the parent's).
+                          <div
+                            key={pkg.id}
+                            data-testid={`onboard-package-${pkg.id}`}
+                            className="contract-row"
+                            onMouseEnter={() => onHover({ kind: 'package', originIcao: pkg.originIcao, destIcao: pkg.destIcao, planeId: p.id })}
+                            onMouseLeave={() => onHover({ kind: 'plane', id: p.id })}
+                          >
+                            <button
+                              type="button"
+                              data-testid={`fly-to-${pkg.id}`}
+                              className="pane-btn onboard-fly-btn"
+                              disabled={actionsBusy}
+                              // ISS-053 (v0.32.0): a flying plane can't start another leg — the click queues it instead,
+                              // so "Fly to …" works from any state and the queue needs no dedicated input.
+                              onClick={() => void runAction(`/api/planes/${p.id}/${p.status === 'flying' ? 'queue' : 'fly'}`, { destIcao: pkg.destIcao })}
+                            >
+                              <span className="onboard-fly-label" title={`Fly to ${pkg.destName}`}>
+                                Fly to {pkg.destName}
+                              </span>
+                            </button>
+                            <div className="onboard-actions">
+                              <button
+                                type="button"
+                                data-testid={`refuel-for-${pkg.id}`}
+                                className="pane-btn"
+                                disabled={actionsBusy || p.status !== 'available'}
+                                onClick={() => void runAction(`/api/planes/${p.id}/refuel`, { mode: 'forFlight', packageId: pkg.id })}
+                              >
+                                Refuel
+                              </button>
+                              <button
+                                type="button"
+                                data-testid={`abandon-${pkg.id}`}
+                                className="pane-btn"
+                                disabled={actionsBusy || p.status !== 'available'}
+                                onClick={() => void runAction(`/api/packages/${pkg.id}/abandon`)}
+                              >
+                                Abandon{' '}
+                                <span data-testid={`abandon-penalty-${pkg.id}`}>−{formatCash(penalty)}</span>
+                              </button>
+                            </div>
+                            <div className="contract-sub">
+                              <span className="contract-route">{pkg.originName} → {pkg.destName}</span>
+                              <span>{formatCash(pkg.reward)}</span>
+                              {pkg.status === 'expired' ? (
+                                <span data-testid={`onboard-expired-${pkg.id}`}>expired</span>
+                              ) : (
+                                <span>{formatDeadlineRelative(pkg.deadlineSimTime, clockMs)}</span>
+                              )}
+                            </div>
+                          </div>
+                        );
+                      })}
+                      {/* ISS-043 (v0.26.0): flight queue — the not-yet-started legs with cancel.
+                          ISS-053 (v0.32.0): the dedicated add input is gone — fly-to and Relocate post to
+                          /queue while a plane is flying, so no separate entry point is needed.
+                          ISS-054 (v0.33.0): rendered only when non-empty. */}
+                      {p.queue.length > 0 && (
+                        <div className="queue-subsection">
+                          <span className="queue-heading">Queue</span>
+                          {/* ISS-055 (v0.31.0): testids scoped by plane id — with two blocks the unscoped ids
+                              duplicated in the DOM and broke Playwright strict mode. */}
+                          {p.queue.map((icao, i) => (
+                            <div key={`${icao}-${i}`} data-testid={`queue-leg-${p.id}-${i}`} className="queue-row">
+                              <span className="contract-route">
+                                {airportOptions?.find((a) => a.icao === icao)?.name ?? icao} ({icao})
+                              </span>
+                              <button
+                                type="button"
+                                data-testid={`queue-cancel-${p.id}-${i}`}
+                                className="pane-btn"
+                                disabled={actionsBusy}
+                                onClick={() => void runAction(`/api/planes/${p.id}/queue/cancel`, { index: i })}
+                              >
+                                Cancel
+                              </button>
+                            </div>
+                          ))}
+                        </div>
+                      )}
+                    </li>
+                  );
+                })}
              </ul>
            )}
          </section>

-          {/* ISS-021 (v0.20.0): moved here from the right pane — between Fleet and Time. */}
-          <section className="pane-section">
-            <h3 className="pane-heading">On board</h3>
-            {onboard.length === 0 ? (
-              <p className="pane-muted">Nothing on board.</p>
-            ) : (
-              onboard.map((plane) => {
-                const cargo = state.packages.filter(
-                  (pkg) => pkg.planeId === plane.id && (pkg.status === 'loaded' || pkg.status === 'expired'),
-                );
-                return (
-                  // ISS-002: hovering the on-board block (including its cargo rows) highlights the plane.
-                  // Handlers live only on the outer div — React's enter/leave don't fire when moving to a
-                  // child, so this covers the whole block without flicker between sub-elements.
-                  <div
-                    key={plane.id}
-                    data-testid={`onboard-${plane.id}`}
-                    className="onboard-block"
-                    onMouseEnter={() => onHover({ kind: 'plane', id: plane.id })}
-                    onMouseLeave={() => onHover(null)}
-                  >
-                    <div className="contract-main">
-                      <span className="plane-model">{PLANE_TYPES[plane.model]?.name ?? plane.model}</span>
-                      {plane.status === 'flying' ? (
-                        <>
-                          <span className="plane-status status-flying">in flight</span>
-                          {plane.destName && (
-                            <span data-testid={`plane-leg-${plane.id}`} className="contract-route">
-                              {plane.locationName} → {plane.destName}
-                            </span>
-                          )}
-                        </>
-                      ) : (
-                        <span className="plane-status status-available">{plane.locationIcao}</span>
-                      )}
-                    </div>
-                    {cargo.map((pkg) => {
-                      const penalty = abandonPenalty(pkg, clockMs);
-                      return (
-                        // ISS-025 (v0.22.0): hovering a loaded package draws its full origin→dest trace on the map —
-                        // same as job-list rows — and keeps this plane's halo lit via planeId. Leaving the row restores
-                        // the block's plain plane highlight; leaving the whole block still ends at null (the child's
-                        // mouseleave fires before the parent's).
-                        <div
-                          key={pkg.id}
-                          data-testid={`onboard-package-${pkg.id}`}
-                          className="contract-row"
-                          onMouseEnter={() => onHover({ kind: 'package', originIcao: pkg.originIcao, destIcao: pkg.destIcao, planeId: plane.id })}
-                          onMouseLeave={() => onHover({ kind: 'plane', id: plane.id })}
-                        >
-                          <button
-                            type="button"
-                            data-testid={`fly-to-${pkg.id}`}
-                            className="pane-btn onboard-fly-btn"
-                            disabled={actionsBusy}
-                            // ISS-053 (v0.32.0): a flying plane can't start another leg — the click queues it instead,
-                            // so "Fly to …" works from any state and the queue needs no dedicated input.
-                            onClick={() => void runAction(`/api/planes/${plane.id}/${plane.status === 'flying' ? 'queue' : 'fly'}`, { destIcao: pkg.destIcao })}
-                          >
-                            <span className="onboard-fly-label" title={`Fly to ${pkg.destName}`}>
-                              Fly to {pkg.destName}
-                            </span>
-                          </button>
-                          <div className="onboard-actions">
-                            <button
-                              type="button"
-                              data-testid={`refuel-for-${pkg.id}`}
-                              className="pane-btn"
-                              disabled={actionsBusy || plane.status !== 'available'}
-                              onClick={() => void runAction(`/api/planes/${plane.id}/refuel`, { mode: 'forFlight', packageId: pkg.id })}
-                            >
-                              Refuel
-                            </button>
-                            <button
-                              type="button"
-                              data-testid={`abandon-${pkg.id}`}
-                              className="pane-btn"
-                              disabled={actionsBusy || plane.status !== 'available'}
-                              onClick={() => void runAction(`/api/packages/${pkg.id}/abandon`)}
-                            >
-                              Abandon{' '}
-                              <span data-testid={`abandon-penalty-${pkg.id}`}>−{formatCash(penalty)}</span>
-                            </button>
-                          </div>
-                          <div className="contract-sub">
-                            <span className="contract-route">{pkg.originName} → {pkg.destName}</span>
-                            <span>{formatCash(pkg.reward)}</span>
-                            {pkg.status === 'expired' ? (
-                              <span data-testid={`onboard-expired-${pkg.id}`}>expired</span>
-                            ) : (
-                              <span>{formatDeadlineRelative(pkg.deadlineSimTime, clockMs)}</span>
-                            )}
-                          </div>
-                        </div>
-                      );
-                    })}
-                    {/* ISS-043 (v0.26.0): flight queue — the not-yet-started legs with cancel.
-                        ISS-053 (v0.32.0): the dedicated add input is gone — fly-to and Relocate post to
-                        /queue while a plane is flying, so no separate entry point is needed. */}
-                    <div className="queue-subsection">
-                      <span className="queue-heading">Queue</span>
-                      {/* ISS-055 (v0.31.0): testids scoped by plane id — with two on-board blocks the
-                          unscoped ids duplicated in the DOM and broke Playwright strict mode. */}
-                      {plane.queue.map((icao, i) => (
-                        <div key={`${icao}-${i}`} data-testid={`queue-leg-${plane.id}-${i}`} className="queue-row">
-                          <span className="contract-route">
-                            {airportOptions?.find((a) => a.icao === icao)?.name ?? icao} ({icao})
-                          </span>
-                          <button
-                            type="button"
-                            data-testid={`queue-cancel-${plane.id}-${i}`}
-                            className="pane-btn"
-                            disabled={actionsBusy}
-                            onClick={() => void runAction(`/api/planes/${plane.id}/queue/cancel`, { index: i })}
-                          >
-                            Cancel
-                          </button>
-                        </div>
-                      ))}
-                    </div>
-                  </div>
-                );
-              })
-            )}
-          </section>
-
          {/* ISS-023 (v0.21.0): moved here from the right-pane market row — it belongs with
-              everything else about our planes, between On board and Time. */}
+              everything else about our planes, between Fleet and Time. */}
          {/* ISS-027 (v0.22.0): hovering the section previews the planned relocation on the map —
              dashed trace from the selected plane's airport to the destination + a ring on the target.
              With no planes or no loaded airport options there is nothing to preview → null. */}
@@ -562,7 +537,7 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
          <section className="pane-section" data-testid="refuel-section">
            <h3 className="pane-heading">Refuel</h3>
            {/* Moved verbatim from the right-pane Market section — same testids/labels; the per-package
-                "Refuel" button in On board (mode 'forFlight') is a different feature and stays there. */}
+                "Refuel" button in the fleet rows (mode 'forFlight') is a different feature and stays there. */}
            <div className="market-row">
              {refuelable.length === 0 ? (
                <span data-testid="market-refuel-none" className="pane-muted">
@@ -439,7 +439,7 @@ test('hovering the Relocate section previews the planned route and target airpor
  }).toBe(0);
 });

-test('hovering an on-board block of a flying plane highlights its route', async ({ page }) => {
+test('hovering the fleet row of a flying plane highlights its route', async ({ page }) => {
  test.setTimeout(600_000); // self-heal + one flight at scale 1000 + fly-home cleanup
  await flyHomeViaApi(page);

@@ -458,8 +458,8 @@ test('hovering an on-board block of a flying plane highlights its route', async
  expect(fly.status()).toBe(200);
  await setScale(page, SCALE);

-  // The on-board block shows the plane in flight once a snapshot with status 'flying' lands.
-  const block = page.getByTestId('onboard-plane-starter');
+  // The fleet row shows the plane in flight once a snapshot with status 'flying' lands (ISS-054).
+  const block = page.getByTestId('plane-plane-starter');
  await expect(block).toContainText(/in flight/i, { timeout: 15_000 });

  // Freeze mid-flight so the ~10 s leg can't land under us while we assert (same pattern as
@@ -70,10 +70,9 @@ test('left pane renders wallet, reputation and the starter fleet at Frankfurt',
  // Sim clock renders (UTC wall-clock of the game time).
  await expect(page.getByTestId('sim-clock')).toContainText(/UTC/);

-  // ISS-021 (v0.20.0): the On board section moved to the left pane (between Fleet and Time) —
-  // its heading renders here…
-  await expect(page.getByTestId('left-pane').getByRole('heading', { name: 'On board', exact: true })).toBeVisible();
-  // …and no longer in the right pane.
+  // ISS-054 (v0.33.0): On board merged into the Fleet list — its heading is gone from both panes,
+  // per-plane cargo rows now render inside the fleet rows.
+  await expect(page.getByTestId('left-pane').getByRole('heading', { name: 'On board', exact: true })).toHaveCount(0);
  await expect(page.getByTestId('right-pane').getByRole('heading', { name: 'On board', exact: true })).toHaveCount(0);

  // ISS-035 (v0.23.0): the Refuel-to-full row moved to the left pane next to Relocate — its section
@@ -268,8 +268,8 @@ test('on-board list: fly-to-destination + abandon with penalty preview; flying p
  await expect(flyBtn).toBeEnabled();
  await flyBtn.click();

-  // The on-board block now shows the plane in flight with its current leg…
-  await expect(page.getByTestId('onboard-plane-starter')).toContainText(/in flight/i, { timeout: 10_000 });
+  // The fleet row now shows the plane in flight with its current leg (ISS-054)…
+  await expect(page.getByTestId('plane-plane-starter')).toContainText(/in flight/i, { timeout: 10_000 });
  const leg = page.getByTestId('plane-leg-plane-starter');
  await expect(leg).toBeVisible();
  await expect(leg).toContainText('→');
@@ -323,9 +323,9 @@ test('two grounded planes: Load is one-click with a preselected plane; the picke
    }, { timeout: 15_000, message: 'waiting for the second package to load onto a plane' })
    .toBe(secondId);

-  // Both planes carry cargo simultaneously — both on-board blocks render.
-  await expect(page.getByTestId(`onboard-${STARTER}`), 'the starter block renders').toBeVisible({ timeout: 15_000 });
-  await expect(page.getByTestId(`onboard-${secondId}`), 'the second plane block renders').toBeVisible({ timeout: 15_000 });
+  // Both planes carry cargo simultaneously — both fleet rows render their cargo (ISS-054).
+  await expect(page.getByTestId(`plane-${STARTER}`), 'the starter row renders').toBeVisible({ timeout: 15_000 });
+  await expect(page.getByTestId(`plane-${secondId}`), 'the second plane row renders').toBeVisible({ timeout: 15_000 });
 });

 test('two planes fly in parallel; the last landing slows to 1× and the next dispatch resumes', async ({ page }) => {
@@ -1,6 +1,6 @@
 {
  "name": "flight-ops",
-  "version": "0.32.0",
+  "version": "0.33.0",
  "private": true,
  "scripts": {
    "dev": "next dev -p 3000",