CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 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
+
 ## v0.31.0 — 2026-09-20 21:23
 - **Two-plane Load is one-click again (ISS-055).** The reported "can't load cargo with two planes at the same airport" was UX, not a server bug: `LoadControls` (`components/RightPane.tsx`) rendered a plane picker for ≥2 eligible planes whose Load button stayed DISABLED until a pick existed, while the single-plane path is one-click. The multi-plane path now PRESELECTS the first eligible plane (`effective = … ?? eligible[0] ?? null`; the select already bound to `effective?.id`), so Load is enabled and one-click whenever ≥1 plane qualifies — the dropdown still allows picking a different plane
 - **LeftPane queue testids scoped by plane id (ISS-055).** With two on-board blocks in the DOM the unscoped ids duplicated: `queue-leg-{i}` → `queue-leg-{plane.id}-{i}`, `queue-cancel-{i}` → `queue-cancel-{plane.id}-{i}`, plus the add control `queue-add-dest`/`queue-add` → `queue-add-dest-{plane.id}`/`queue-add-{plane.id}` (`components/LeftPane.tsx`). The shared pane-level destination pick is unchanged. `e2e/queue.spec.ts` locators updated to the scoped form (single-plane fleet, id `plane-starter`)

components/LeftPane.tsx

@@ -106,10 +106,6 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
   // a sensible default (first grounded plane with fuel below max).
   const [refuelPlaneId, setRefuelPlaneId] = useState<string | null>(null);
 
-  // ISS-043 (v0.26.0): flight-queue "add" destination — one shared pick across every on-board
-  // block's queue-add select (the e2e fleet is a single plane; per-block state would be dead weight).
-  const [queueAddDestIcao, setQueueAddDestIcao] = useState<string | null>(null);
-
   // ISS-010 (v0.18.0): one-time /api/airports fetch per page life — destination options for the
   // Relocate section, sorted by name so e2e selection is stable. Same promise-ref pattern as Map.tsx;
   // on failure airportOptions stays null and the Relocate button simply remains disabled. Moved here
@@ -209,17 +205,20 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
     ? state.planes.filter((p) => p.status === 'flying' || cargoWeightFor(state, p.id) > 0 || (p.queue?.length ?? 0) > 0)
     : [];
 
-  // ISS-023 (v0.21.0): Relocate — any GROUNDED 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 market row; with state null both fall back to null and the section isn't rendered.
-  const grounded = state ? state.planes.filter((p) => p.status === 'available') : [];
-  const relocatePlane = grounded.find((p) => p.id === relocatePlaneId) ?? grounded[0] ?? null;
+  // 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
+  // market row; with state null both fall back to null and the section isn't rendered.
+  // ISS-053 (v0.32.0): widened from grounded-only to ALL planes — a flying plane's relocation is
+  // queued instead of started immediately (see relocate-go below). `grounded` stays for Refuel.
+  const relocatable = state ? state.planes : [];
+  const relocatePlane = relocatable.find((p) => p.id === relocatePlaneId) ?? relocatable[0] ?? null;
   const relocateDest =
     airportOptions === null ? null : airportOptions.find((a) => a.icao === relocateDestIcao) ?? airportOptions[0] ?? null;
 
   // ISS-035 (v0.23.0): Refuel-to-full — any GROUNDED plane with fuel below max can be topped up via the
   // existing refuel endpoint (no body → server defaults to mode 'full'). Moved here from the right-pane
-  // market row; reuses `grounded` above, and with state null falls back to null.
+  // market row; grounded-only, and with state null falls back to null.
+  const grounded = relocatable.filter((p) => p.status === 'available');
   const refuelable = grounded.filter((p) => p.fuel < p.maxFuel);
   const refuelPlane =
     (state?.planes.find((p) => p.id === refuelPlaneId && p.status === 'available' && p.fuel < p.maxFuel)) ??
@@ -422,8 +421,10 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
                             type="button"
                             data-testid={`fly-to-${pkg.id}`}
                             className="pane-btn onboard-fly-btn"
-                            disabled={actionsBusy || plane.status !== 'available'}
-                            onClick={() => void runAction(`/api/planes/${plane.id}/fly`, { destIcao: pkg.destIcao })}
+                            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}
@@ -462,8 +463,9 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
                         </div>
                       );
                     })}
-                    {/* ISS-043 (v0.26.0): flight queue — the not-yet-started legs with cancel, plus an
-                        add control reusing this pane's already-fetched airport options (no second fetch). */}
+                    {/* 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
@@ -484,32 +486,6 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
                           </button>
                         </div>
                       ))}
-                      <div className="market-row">
-                        <select
-                          data-testid={`queue-add-dest-${plane.id}`}
-                          aria-label="Airport to add to the flight queue"
-                          value={queueAddDestIcao ?? ''}
-                          onChange={(e) => setQueueAddDestIcao(e.target.value || null)}
-                        >
-                          <option value="">Select an airport…</option>
-                          {airportOptions?.map((a) => (
-                            <option key={a.icao} value={a.icao}>
-                              {a.name}
-                            </option>
-                          ))}
-                        </select>
-                        <button
-                          type="button"
-                          data-testid={`queue-add-${plane.id}`}
-                          className="pane-btn"
-                          disabled={actionsBusy || queueAddDestIcao === null}
-                          onClick={() => {
-                            if (queueAddDestIcao) void runAction(`/api/planes/${plane.id}/queue`, { destIcao: queueAddDestIcao });
-                          }}
-                        >
-                          Add to queue
-                        </button>
-                      </div>
                     </div>
                   </div>
                 );
@@ -521,7 +497,7 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
               everything else about our planes, between On board 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 grounded plane or no loaded airport options there is nothing to preview → null. */}
+              With no planes or no loaded airport options there is nothing to preview → null. */}
           <section
             className="pane-section"
             data-testid="relocate-section"
@@ -535,8 +511,9 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
             onMouseLeave={() => onHover(null)}
           >
             <h3 className="pane-heading">Relocate</h3>
-            {/* ISS-010 (v0.18.0): relocate a grounded plane — the fly endpoint already allows pure
-                repositioning, this row just exposes it for planes with nothing on board. */}
+            {/* ISS-010 (v0.18.0): relocate a plane — the fly endpoint already allows pure
+                repositioning, this row just exposes it for planes with nothing on board.
+                ISS-053 (v0.32.0): lists ALL planes; a flying one's relocation is queued below. */}
             <div className="market-row market-row-relocate">
               <select
                 data-testid="relocate-plane"
@@ -544,7 +521,7 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
                 value={relocatePlane?.id ?? ''}
                 onChange={(e) => setRelocatePlaneId(e.target.value || null)}
               >
-                {grounded.map((p) => (
+                {relocatable.map((p) => (
                   <option key={p.id} value={p.id}>
                     {PLANE_TYPES[p.model]?.name ?? p.model} — {p.locationIcao}
                   </option>
@@ -567,9 +544,11 @@ export default function LeftPane({ state, loading, error, onRefresh, applySnapsh
                 data-testid="relocate-go"
                 className="pane-btn"
                 disabled={actionsBusy || relocatePlane === null || relocateDest === null}
+                // ISS-053 (v0.32.0): a flying plane can't start another leg — queue it instead, so the
+                // relocation takes off when the current one lands.
                 onClick={() => {
                   if (relocatePlane && relocateDest) {
-                    void runAction(`/api/planes/${relocatePlane.id}/fly`, { destIcao: relocateDest.icao });
+                    void runAction(`/api/planes/${relocatePlane.id}/${relocatePlane.status === 'flying' ? 'queue' : 'fly'}`, { destIcao: relocateDest.icao });
                   }
                 }}
               >

e2e/queue.spec.ts

@@ -1,7 +1,8 @@
 import { test, expect, type Page } from '@playwright/test';
 
 // v0.26.0 — ISS-043 part 2 (UI): the flight queue. A plane's not-yet-started legs show up in a
-// Queue sub-section of its on-board block (add via airport select + button, cancel per leg), and
+// Queue sub-section of its on-board block (cancel per leg; adding happens via fly-to / Relocate
+// while flying, ISS-053), and
 // a flying plane with queued legs draws them as a DOTTED line (`queue-routes` layer) chaining
 // dest → queue[0] → … — the active leg stays in the solid `routes-legs` layer. Landing auto-starts
 // the next queued leg server-side (part 1); test 3 exercises that chain end-to-end through the API.
@@ -216,10 +217,9 @@ test('queue display + cancel via UI (ISS-043 part 2)', async ({ page }) => {
   const onboardRow = page.getByTestId(`onboard-package-${pkg.id}`);
   await expect(onboardRow, 'loaded package appears in the On board section').toBeVisible({ timeout: 15_000 });
 
-  // LeftPane's own /api/airports fetch populates the queue-add select — wait for it.
-  // ISS-055 (v0.31.0): queue testids are scoped by plane id (the e2e fleet is one plane here).
-  const addSelect = page.getByTestId('queue-add-dest-plane-starter');
-  await expect(addSelect.locator(`option[value="${QUEUE}"]`)).toHaveCount(1, { timeout: 15_000 });
+  // LeftPane's own /api/airports fetch populates the Relocate destination select — wait for it.
+  const destSelect = page.getByTestId('relocate-dest');
+  await expect(destSelect.locator(`option[value="${QUEUE}"]`)).toHaveCount(1, { timeout: 15_000 });
 
   // START leg 1 via the UI (fly-to button in the on-board block).
   const flyBtn = page.getByTestId(`fly-to-${pkg.id}`);
@@ -233,12 +233,11 @@ test('queue display + cancel via UI (ISS-043 part 2)', async ({ page }) => {
   }, { timeout: 15_000, message: 'waiting for the fly click to take effect (status "flying" + dest set)' }).toBe(true);
   await postSim(page, { paused: true }); // pause-sim pattern: deterministic window for UI clicks
 
-  // ADD a leg to the queue via the UI. The button is disabled until an airport is selected…
-  const addButton = page.getByTestId('queue-add-plane-starter');
-  await expect(addButton).toBeDisabled();
-  await addSelect.selectOption(QUEUE);
-  await expect(addButton).toBeEnabled();
-  await addButton.click();
+  // ADD a leg to the queue via the Relocate section (ISS-053): the starter is flying, so relocate-go
+  // posts to /queue and the leg starts when it lands.
+  await page.getByTestId('relocate-plane').selectOption('plane-starter');
+  await destSelect.selectOption(QUEUE);
+  await page.getByTestId('relocate-go').click();
 
   // …and the new leg appears as queue-leg-0 with its destination.
   const legRow = page.getByTestId('queue-leg-plane-starter-0');

e2e/two-planes.spec.ts

@@ -519,13 +519,9 @@ test('per-plane queues are independent; landing auto-chains the next queued leg'
   await expect(starterLeg0, 'the starter block renders its queued leg').toContainText(a.icao, { timeout: 15_000 });
   await expect(page.getByTestId(`queue-leg-${secondId}-0`), 'the second block renders its queued leg').toContainText(b.icao);
 
-  // …and ADD a second leg to the STARTER via its scoped controls only.
-  const starterDest = page.getByTestId(`queue-add-dest-${STARTER}`);
-  await expect(starterDest.locator(`option[value="${b.icao}"]`)).toHaveCount(1, { timeout: 15_000 }); // airports fetched
-  await starterDest.selectOption(b.icao);
-  const starterAdd = page.getByTestId(`queue-add-${STARTER}`);
-  await expect(starterAdd).toBeEnabled();
-  await starterAdd.click();
+  // …and ADD a second leg to the STARTER via the API — the dedicated queue-add UI was removed in
+  // ISS-053 (fly-to / Relocate cover it), and the starter is grounded here so fly-to would start, not queue.
+  expect((await page.request.post(`/api/planes/${STARTER}/queue`, { data: { destIcao: b.icao } })).status()).toBe(200);
   await expect(page.getByTestId(`queue-leg-${STARTER}-1`), 'the second leg is queued on the STARTER').toContainText(b.icao, { timeout: 15_000 });
 
   // CANCEL the only leg on the SECOND plane — its queue empties, the starter's stays intact.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flight-ops",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "private": true,
   "scripts": {
     "dev": "next dev -p 3000",