feat(aviation): track-tab search, richer flight cards, Google Flights in command bar #2516
+149
−28
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| import { fetchFlightStatus, fetchAirportOpsSummary, fetchFlightPrices, fetchAviationNews, fetchGoogleFlights } from '@/services/aviation'; | ||
| import { escapeHtml, sanitizeUrl } from '@/utils/sanitize'; | ||
|
|
||
| // ---- Intent types ---- | ||
|
|
@@ -11,6 +11,13 @@ type Intent = | |
| | { type: 'TRACK'; callsign?: string; icao24?: string } | ||
| | { type: 'UNKNOWN'; raw: string }; | ||
|
|
||
| function fmtDur(m: number): string { | ||
| if (!m) return ''; | ||
| const h = Math.floor(m / 60); | ||
| const min = m % 60; | ||
| return min > 0 ? `${h}h ${min}m` : `${h}h`; | ||
| } | ||
|
|
||
| // ---- Intent parser ---- | ||
|
|
||
| function parseIntent(raw: string): Intent { | ||
|
|
@@ -23,21 +30,21 @@ function parseIntent(raw: string): Intent { | |
| if (airports.length) return { type: 'OPS', airports }; | ||
| } | ||
|
|
||
| // FLIGHT <IATA-FLIGHT> or <IATA-FLIGHT> [STATUS|FLIGHT|FLT] | ||
| if (/^(FLIGHT|FLT)\s+[A-Z]{2,3}\d{1,4}/.test(q) || /[A-Z]{2,3}\d{1,4}\s+(STATUS|FLIGHT|FLT)/.test(q) || /^STATUS\s+[A-Z]{2,3}\d{1,4}/.test(q)) { | ||
| const match = q.match(/[A-Z]{2,3}\d{1,4}/); | ||
| if (match) { | ||
| const origin = words.find(w => /^[A-Z]{3}$/.test(w) && w !== match[0]); | ||
| return { type: 'FLIGHT_STATUS', flightNumber: match[0], origin }; | ||
| } | ||
| } | ||
|
|
||
| // PRICE / PRICES <ORG> <DST> or <ORG> TO <DST> PRICE[S] | ||
| if (words.some(w => /^PRICE[S]?$/.test(w))) { | ||
| const priceAirports = words.filter(w => /^[A-Z]{3}$/.test(w) && w !== 'TO'); | ||
| if (priceAirports.length >= 2) { | ||
| const date = words.find(w => /^\d{4}-\d{2}-\d{2}$/.test(w)); | ||
| return { type: 'PRICE_WATCH', origin: priceAirports[0]!, destination: priceAirports[1]!, date }; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -79,19 +86,45 @@ async function executeIntent(intent: Intent): Promise<CommandResult> { | |
| const flights = await fetchFlightStatus(intent.flightNumber, undefined, intent.origin); | ||
| if (!flights.length) return { html: `<div class="cmd-empty">No results for ${escapeHtml(intent.flightNumber)}.</div>` }; | ||
| const f = flights[0]!; | ||
| const depStr = f.estimatedDeparture | ||
| ? `Dep ${f.estimatedDeparture.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', hour12: false })}` | ||
| : ''; | ||
| const arrStr = f.estimatedArrival | ||
| ? ` · Arr ${f.estimatedArrival.toLocaleTimeString([], { hour: '2-digit', minute: '2-digit', hour12: false })}` | ||
| : ''; | ||
| const carrierLabel = f.carrier.name || f.carrier.iata; | ||
| const gateLine = (f.gate || f.terminal) | ||
| ? `<div style="color:#9ca3af;font-size:11px">Gate ${escapeHtml(f.gate || '—')}${f.terminal ? ` · Terminal ${escapeHtml(f.terminal)}` : ''}</div>` | ||
| : ''; | ||
| const acLine = f.aircraftType | ||
| ? `<div style="color:#9ca3af;font-size:11px">${escapeHtml(f.aircraftType)}</div>` | ||
| : ''; | ||
| return { | ||
| html: `<div class="cmd-section"> | ||
| <strong>✈️ ${escapeHtml(f.flightNumber)}</strong>${carrierLabel ? ` <span style="color:#9ca3af">(${escapeHtml(carrierLabel)})</span>` : ''} | ||
| <div>${escapeHtml(f.origin.iata)} → ${escapeHtml(f.destination.iata)} · ${f.status}${depStr ? ` · ${depStr}` : ''}${arrStr}</div> | ||
| ${acLine}${gateLine} | ||
| ${f.delayMinutes > 0 ? `<div style="color:#f97316">+${f.delayMinutes}m delay</div>` : ''} | ||
| </div>` }; | ||
| } | ||
|
|
||
| if (intent.type === 'PRICE_WATCH') { | ||
| const date = intent.date ?? new Date(Date.now() + 7 * 86400000).toISOString().slice(0, 10); | ||
| // Try Google Flights first (real data) | ||
| const gfResult = await fetchGoogleFlights({ origin: intent.origin, destination: intent.destination, departureDate: date }); | ||
| if (gfResult.flights.length) { | ||
| const best = gfResult.flights[0]!; | ||
| const leg = best.legs[0]; | ||
| const carrier = leg ? `${leg.airlineCode} ${leg.flightNumber}` : ''; | ||
| const stops = best.stops === 0 ? 'nonstop' : `${best.stops} stop`; | ||
| return { | ||
| html: `<div class="cmd-section"> | ||
| <strong>💸 ${escapeHtml(intent.origin)} → ${escapeHtml(intent.destination)}</strong> | ||
| <div>Best: <strong style="color:#60a5fa">$${Math.round(best.price).toLocaleString()}</strong> · ${escapeHtml(carrier)} · ${stops} · ${escapeHtml(fmtDur(best.durationMinutes))}</div> | ||
| ${gfResult.degraded ? '<div style="color:#f59e0b;font-size:11px">Partial results</div>' : ''} | ||
| </div>` }; | ||
| } | ||
| // Fallback to TravelPayouts / demo | ||
|
Comment on lines
+113
to
+127
There was a problem hiding this comment.
The TravelPayouts fallback is only reached when Wrap the Google Flights call so a thrown exception is treated the same as an empty result: let gfResult: Awaited<ReturnType<typeof fetchGoogleFlights>> | null = null;
try {
gfResult = await fetchGoogleFlights({ origin: intent.origin, destination: intent.destination, departureDate: date });
} catch { /* fall through to TravelPayouts */ }
if (gfResult?.flights.length) {
// … render Google Flights card
}
// Fallback to TravelPayouts / demo
const { quotes, isDemoMode } = await fetchFlightPrices(…); |
||
| const { quotes, isDemoMode } = await fetchFlightPrices({ origin: intent.origin, destination: intent.destination, departureDate: date }); | ||
| if (!quotes.length) return { html: '<div class="cmd-empty">No prices found.</div>' }; | ||
| const best = quotes[0]!; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,9 @@ | |
| background: var(--bg); | ||
| scrollbar-width: none; | ||
| -ms-overflow-style: none; | ||
| /* Fade hint on right edge when tabs overflow */ | ||
| -webkit-mask-image: linear-gradient(to right, black calc(100% - 24px), transparent 100%); | ||
| mask-image: linear-gradient(to right, black calc(100% - 24px), transparent 100%); | ||
| } | ||
|
|
||
| /* When .panel-content contains tabs (at any depth), remove top padding | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
renderTab()already returns early with the barerenderLoading()spinner wheneverthis.loading === true, so theif (this.loading)branch insiderenderTracking()is unreachable. The search bar never appears alongside the loading indicator as intended, and the user sees a plain spinner with no input while their query is executing.The root cause is in
renderTab():Decide on one approach — either each tab owns its loading rendering (remove the guard from
renderTab()), or the tracking-tab branch needs to callrenderTracking()even whenloading === true.