Pulls in 13 modified + 4 new source files that were uncommitted on main
when this branch forked. Without them, ScheduleStartPage.test.tsx fails
4 tests against the committed main state, which would mask real
regressions during the CI/CD pipeline rollout.
Source files only — no test infra or pipeline code. The user's main
checkout still owns these changes; this commit will dedupe naturally
once the branches reconcile.
Captures the agreed two-workflow shape (push-deploy + manual release)
so the implementation plan has an unambiguous source of truth before
touching scripts, Dockerfile build-args, or nginx config.
The app normalises a short-form /en locale prefix to the BCP-47
form /en-en/ at the router layer, so asserting on the short form is
brittle. Assert a loose /en(-xx)?/onlineboard URL regex instead.
- ScheduleDetailsPage: drop shiftYmd helper and selectedYmd local —
both were left over from the removed day-sibling search path.
- ScheduleFlightBody.test: drop fireEvent import + FUTURE_340D /
FUTURE_1H / YESTERDAY / todayUtc constants; they belonged to the
Buy/Status button tests that moved to the summary-header layer.
- flight-details + error-handling integration tests: mock
useCityName / useStationDisplayName so OnlineBoardDetailsPage can
render without an ApiClientProvider wrapping — the station lookup
hooks now transitively depend on useApiClient via the cached
useDictionaries fetcher introduced in 7deb46a.
On a typical page the console showed 25-30 duplicate 'Failed to load
resource' errors because every consumer hook fired its own copy of
the same network request:
- useDictionaries: once per `useCityName`/`useStationDisplayName`
call (6-10x per render across StationDisplay, PopularRequestItem,
mini-list rows, etc.) — now a module-level WeakMap<ApiClient>
single-flight cache returns the same in-flight Promise.
- usePopularRequests: same pattern across start-page and search-
history dropdowns — cached via the same mechanism.
- useAppSettings: 7+ callers — cached.
Dropped console error count on /ru-ru/ from 29 to 5 (the remaining 5
are WAF 403 infra issues from the dev:full proxy cookie, not code).
Also updates e2e specs:
- schedule-details-mini-list-scoped: asserts the new single-card
rail behaviour (was still checking for the old 3-row flat list).
- smoke /xx/smoke: targets `[data-testid=error-page-404]` instead
of `text=404` — the latter matches both the <title> tag (hidden
by user-agent CSS) and multiple DOM nodes, tripping strict-mode.
Left rail previously rendered the open flight PLUS its day-±1
siblings from a route search. For a connecting itinerary the three
rows were visually identical (Moscow → Murmansk on the same times),
so users read them as duplicates. Angular's schedule-flights-mini-list
only shows a multi-day accordion when schedule.length > 1 and falls
back to a single-card view otherwise; mirror that by always passing
an empty flights[] to ScheduleFlightsMiniList — it shows only the
synthesized open flight.
Header-left drops the Онлайн-Табло / Расписание / Карта полетов
tab strip; Angular's schedule-flight-details-view only slots
<details-back>, so the top 'Вернуться к Расписанию' link is the
single navigation affordance on the details page.
FlightsMiniListItem now joins _childFlightIds as 'SU 6188, SU 6341'
for connecting itineraries — Angular's flights-details-list-flight
surfaces every leg's number in the rail label, not just the primary.
Removes the day-sibling useScheduleSearch call + the miniListFlights
filter memo + PageTabs import + pageTabs JSX — all unused now.
React templated the booking URL as '${locale}-${locale}', which
produced 'sb/app/ru-ru-ru-ru' for a BCP-47 'ru-ru' prop (our router
emits locales in BCP-47 form). The resulting link 404'd on the
Aeroflot booking tool.
Angular's BuyTicketLogic.getLink hardcodes 'sb/app/ru-ru' regardless
of the current UI language; do the same. The 'locale' prop is kept
optional on BuyTicketButton for backward-compat with existing
callers but is no longer consumed inside the URL builder.
Each flight card and the Пересадка strip are now sibling elements
inside .schedule-details — each flight in its own <section class="frame">,
the TransferBar standalone between them. The shared outer frame
wrapper is gone, so the dark page background shows through the
between-block gaps instead of one continuous white surface.
That produces the 'three separate white cards on dark bg'
visual Angular uses for a connecting itinerary (flight 1 frame |
Пересадка | flight 2 frame) — 40px white margins that previously
bled into the surrounding frame disappeared because the flex gap
now renders against the actual page background.
The Пересадка wrapper bumps to $space-xxl (40px) margin: at 15px
the strip blended with the regular between-card gap from
`.schedule-details { gap: $space-l }` and read as a sibling card
rather than a separator. 40/40 mirrors Angular's breathing room.
FlightActions gains a `forceBuy` prop that bypasses the
canBuyTicket() status/window gate. The schedule summary passes it
because the Buy pill there is a generic 'open the Aeroflot booking
tool for this route' affordance — the user picks any date in the
booking flow, so hiding the button on a specific day's 'Cancelled'
status (as the Onlineboard detail page does) loses a useful entry
point. Board detail pages still pass the default (status-gated).
Between two flight cards on a connecting itinerary the TransferBar
used to sit flush against the preceding FlightSchedule block and the
next flight's header — no breathing room, no edge, read as a shared
card rather than a separator. Now the strip is wrapped in a
'__transfer' div that adds '$space-l' top/bottom margin and gives
the inner .transfer-bar the same 'border-radius' Angular uses for its
'.transfer-bar--separated' card variant.
Connecting itineraries now render details-header-badge with the small
round airline icon (36×36) from Angular's `[round]="isConnecting"`
path and drop the 'Авиакомпания' caption, so the SU 6188 + SU 6341
row sits compactly next to the share/buy/last-update cluster instead
of stretching two wide wordmarks across the summary.
Share + Buy buttons removed from ScheduleFlightBody — Angular's
`flight-schedule-details` wires `[share]=false [buy]=false
[print]=false [details]=false [register]=false` into its inner
flight-actions, so a per-leg action strip was never meant to exist.
The page-level summary header now owns those affordances.
OperatorLogo.scss: override the 180×46 rule inside .details-header-badge
when the logo carries .operator-logo--round so the connecting-summary
badge doesn't force a wide wordmark.
BoardDetailsHeader.scss is imported from DetailsHeaderBadge.tsx so
consumers (schedule details summary) that use the badge without the
full BoardDetailsHeader wrapper still pick up flex/gap/typography.
The schedule details page now renders Angular's <schedule-details-header>
summary block (badges per flight + share/last-update + full-route
timeline) between the day-tabs strip and the per-leg cards, so a
connecting itinerary like SU 6188 + SU 6341 surfaces both flight
numbers and the combined Moscow→Murmansk timeline up top instead of
jumping straight from the date tabs to the first-leg detail card.
Mini-list duplicate fix: when the sibling search returned 0 matches
the fallback path used to leak the URL-parsed per-leg breakdown into
the rail, producing a first-leg-only row stacked next to the
synthesized combined row. Now the fallback is empty — the mini-list
just shows the (synthesized) current flight on its own.
FullRouteTimeline now uses the API's pre-formatted .localTime instead
of the full ISO .local, so 00:30 / 02:00 shows up instead of
2026-04-26T00:30:00+03:00.
useAppSettings.buyTicketMaxHours: parse <n>d as well as <n>h (Angular
ships 330d for buyPeriod.max). Without this the Buy button hides for
any flight more than ~3 days out.
Plumbed sortMode/onSortChange/hideColumnHeaders through DayGroupedFlightList
so the sticky ScheduleColumnHeaders and the inner list stay in sync
(removes 2 TS errors in ScheduleSearchPage).
Per the Суббота/Воскресенье/Понедельник headers added an extra
click and zero information — every FlightsMiniListItem already
carries its own date. Replace the per-day accordion wrapper with a
straight chronological column. Always merge the open flight into
the rendered list (the open flight loads via a separate details
endpoint and may not appear in the [-1, +1] sibling search). Strip
the now-orphan day-header / day-body SCSS rules and rewrite the
unit tests to assert the flat-list behaviour.
Mirrors Angular's CurrentScheduleService.getScheduleType +
compareFlightsByPId: when the [-1, +1] route search returns the
open flight (matched by carrier+number signature, including each
leg of a connecting itinerary), keep only those instances; when
no match exists, fall back to a 1-item list with just the open
flight (Angular's 'default-schedule' branch). Old behaviour
returned the full route search and dumped every unrelated MOW-MMK
option into the rail.
Add e2e regression that loads the SU 6188 + SU 6341 itinerary and
asserts the rail shows only SU 6188 — not SU 6190 / SU 6699 (the
other Sunday MOW-MMK options that used to appear).
Probed the live Angular page and the schedule-details Борт row uses
`<svg><use xlink:href="/assets/img/sprite.svg#company">` — a
stroked side-view jet silhouette — NOT the simpler top-down plane
glyph from toolkit/icons/plane (that one only appears in the row
indicator next to flight times). Port the seven #company paths
from sprite.svg verbatim into the leg-details panel so the icon
matches the legacy app exactly.
The plane and food row icons in ScheduleLegDetails were custom React
SVGs (a cargo-airliner side-view and a knife+fork glyph) that didn't
match the legacy app. Copy the actual paths verbatim from
ClientApp/src/app/toolkit/icons/plane and .../dining so the
React panel shows the same stylised top-view plane and the cloche-
on-base 'Питание на борту' icon Angular ships. Use currentColor on
both fills/strokes so the existing $blue link colour still applies.
Reserve a 36px slot in __icon so the rows line up despite the
plane (19×19) vs dining (34×26) intrinsic-size mismatch.
Angular's flight-details-meal.component.html renders each
Эконом / Комфорт / Бизнес sub-icon under *ngIf=hasEconomyMeal etc —
flights with no meal data show just the cutlery icon and caption
with no class pills. React was hardcoding all three regardless of
data, so SU 6188 (whose API returns meal=[]) showed three meaningless
icons; SU 6341 (meal=[Comfort, Economy, Business]) showed the right
ones by accident.
Read leg.equipment.meal, build a Set<MealType>, render each pill
only when its type is in the set. Add a unit test covering empty,
partial, and full meal data and an e2e regression on the live
MOW→LED→MMK itinerary (test asserts SU 6188 has none, SU 6341 has
all three). The e2e depends on backend data and can flake when the
dev proxy WAF cookie has expired.
API returns daysOfWeek.flight as a string of ISO weekday digits
("1"=Mon.."7"=Sun) where each character is the number of one
operating day, NOT a 7-char position bitmask. E.g. SU 6188's
flight value is "156" → Mon + Fri + Sat operating; SU 6341's is
"1234567" → daily. The old reader treated it as bitmask and only
checked position[i]==='1', so SU 6188 highlighted only Mon and SU
6341 highlighted only Mon — the highlighting looked random
relative to Angular which uses the digit-list semantics.
Walk the input character-by-character, build a Set<weekdayNumber>,
mark badge active when its day-number is in the set. Defends
against non-digit characters and out-of-range digits. Rewrite the
unit tests to match the real wire format and add a regression
case for the SU 6188 "156" pattern.
handleFlightClick previously emitted only the first flight ID even
when the row was a connecting itinerary, so the details page only
showed leg 1 (e.g. SU 6188 Moscow→St-Petersburg) and dropped leg 2
(SU 6341 St-Petersburg→Murmansk). Walk `_childFlightIds` instead,
interleaving each leg's airport codes around its segment so the
output URL is /schedule/{depAir}/{flight1}-{date}/{midAir}/
{flight2}-{date}/{arrAir}?request=… — the splat route already
parses any number of segments and the details page already maps
over flights[], so both cards + the Пересадка transfer bar render
correctly.
Add an e2e that clicks a connecting row, asserts the multi-segment
URL pattern, the two .schedule-details__flight cards, and the
Пересадка bar. The test depends on live backend data so it can be
flaky in environments where the dev proxy cookie has expired.
The Schedule row had been switched to navigate-on-click in commit
a26adad as a forward-looking implementation of TIRREDESIGN-4. Angular
on the live test stand still uses inline-expand (verified 2026-04-23
on flights.test.aeroflot.ru — clicking a row toggles
.flight-list-item.selected and renders schedule-search-result-flight-
body / connecting-flight-body inline). React must not lead Angular —
restore the inline-expand wiring so both stays in lockstep.
Drops the schedule-specific branch in FlightList that disabled
expandable and wired onClick to navigate. The expand-via-onFlightClick-
or-renderExpandedBody rule applies uniformly to Board and Schedule
rows again, exactly like before commit a26adad.
Spec calls for the Schedule list to drop the inline expanded view
entirely — clicking a row should take the user straight to the
flight-details page, with the per-row 'Купить билет' affordance
exposed only on hover.
FlightList: gate inline-expand on whether renderExpandedBody is
provided, not on onFlightClick. When the caller supplies onFlightClick
without a body renderer, wire it to FlightCard.onClick (single-click
navigate). When both are present (Online-Board), keep the existing
expandable + onViewDetails wiring.
DayGroupedFlightList: drop renderScheduleBody/renderExpandedBody
from both FlightList sites (single-day and per-day-group). Schedule
rows now navigate via onFlightClick; the 'Купить билет' link is the
inlineBuyUrl rendered by FlightCard with hover-only CSS.
Add a 2-spec e2e: row click changes URL to /schedule/<segment>?
request=schedule-route-… and the per-row buy link is anchor-tagged
to the SB booking URL on every visible row.
Spec calls out the exact label change for the recent-searches sidebar
on Schedule and Online-Board start pages. RU was the literal 'Вы
искали' (You searched) — switch to 'Ранее искали' (Previously
searched), matching the section heading and the inline 'Ранее искали
в Онлайн-Табло' / 'Ранее искали в Расписании' captions. Other
locales already used 'Previous searches' / 'Search history' wording
and stay unchanged. Add 2-spec e2e seeding sessionStorage with a
valid history item and asserting the new label appears.
ScheduleFilter.computeDisabledDates compared the cursor date in
yyyymmdd form against the schedule /days API output which is
yyyy-MM-dd. Lookups never matched, so every calendar cell ended up
disabled. Add a small dateToIsoYmd helper, switch the comparison
to ISO format, and add an e2e regression that asserts the picker
contains both enabled and disabled cells for a real route.
Verifies the URL-driven time filter (e.g. -14001800 suffix)
restricts the rendered list and updates the slider label, plus the
slider→submit→URL pipeline persists the chosen range. No code
change required for TIRREDESIGN-11 — adding regression tests.
PrimeReact v10's calendar.d.ts does not export CalendarChangeEvent
(uses internal FormEvent<TValue> for onChange instead). My earlier
commit referenced the symbol and the dev bundle threw 'undefined
factory ./src/shared/hooks/useDictionaries.ts' downstream because
ScheduleFilter/ScheduleStartPage failed to load. Fall back to a
narrow inline { value: unknown } parameter type — the handler reads
e.value into a local Date | Date[] anyway.
Verified that React already surfaces the Купить билет and Онлайн
регистрация buttons in the expanded row body via FlightActions when
the per-flight visibility rules pass (canBuyTicket: now within
[dep-72h, dep-2h]; canRegister: registration.status==='InProgress'
and operating carrier in AIRLINES). No code change required for
TIRREDESIGN-10 — adding a regression test to lock the behaviour.
Angular's schedule date-picker is week-granular (TZ §4.1.9.4): one
click anywhere selects the whole calendar week, the panel closes and
the input shows the resulting range. React was using PrimeReact's
plain range-mode (two clicks required), so a single click left the
range half-set and the panel open.
Add snapToWeek() in ScheduleStartPage and ScheduleFilter, route both
outbound + return Calendars through new onSelect handlers that
compute Mon-Sun, commit it as the value, and call cal.hide() via
ref. Enable selectOtherMonths so bleed-in days from the previous /
next month are clickable. Add 3-test e2e spec (week snap from a
mid-week day, snap from a next-month bleed-in day, range placeholder
when empty).
Live audit shows Angular DOES add a third crumb on /onlineboard and
/schedule details pages when the user reached them through ?request=:
- onlineboard-flight → 'Рейс: SU 6188' (carrier+number space-separated)
- onlineboard-route → 'Маршрут: Москва - Санкт-Петербург'
- onlineboard-departure → 'Вылет: Шереметьево' (airport name when IATA is airport-only)
- onlineboard-arrival → 'Прилет: Санкт-Петербург' (city name when IATA is also a city)
- schedule-route → 'Москва - Санкт-Петербург' (no 'Маршрут:' prefix)
Restore the leaf-emit logic, fix RU FLIGHT-NUMBER label to 'Рейс:',
add spaces around the dash in ROUTE/SCHEDULE-ROUTE across all 9
locales, and add useStationDisplayName (city dict first, airport
dict fallback — no parent-city escalation, matches Angular's
getCityOrAirport).
Live audit of flights.test.aeroflot.ru shows the trail never adds a
third 'leaf' crumb — even on details pages reached with a ?request=
context. React was emitting an extra crumb in three places:
ScheduleSearchPage (route heading), ScheduleDetailsPage (back-to-
search leaf), OnlineBoardDetailsPage (back-to-search leaf). Strip
all three; rewrite the affected unit tests to assert the leaf is
absent; add an e2e parity spec covering all six page types.
Covers: full -1/+14 range across 3 pages (16 in-range dates), 5 greyed
out-of-range dates on the last page, right-arrow disabled at boundary,
sibling tabs stay enabled after consecutive clicks.
Angular keeps generating dates past +daysAfter and disables them, so the
user sees where the boundary is. React was emitting blank padding cells
instead. Replace the placeholder <div>s with disabled DayTabButtons
showing the next out-of-range dates.
Previously the 5s default starved several tests during full-suite
parallel runs — most reliably OnlineBoardSearchPage.error's timeout
test and the eslint boundary tests that fork a lint process per check.
Each of those passes in isolation in ≤3s; the 3x headroom keeps them
stable without masking genuine hangs. Individual tests can still
override via the third arg to it().
Wrap useScheduleCalendar's data fetch in a ClientMemoryCache with a
1-hour TTL keyed on date+departure+arrival+connections. Identical
route/date lookups across the session (filter, mini-list day groups,
details card week strip) now share a single response instead of
re-hitting the API.
ScheduleFilter's handleSubmit now calls setScheduleFilter with the
submitted outbound + optional return snapshot. This completes the
cross-section wiring: OnlineBoardFilter already wrote to the store
and both start pages read getBoardFilter/getScheduleFilter for
Table-10 projection on subsystem switch.
The dictionary API returns regions in arbitrary order. CityPickerPopup
now sorts them alphabetically by localized name and pulls the
Russia-and-CIS direction to the front — matching the TZ Table 14
listing order. Detection is loose (substring match on 'Россия' /
'Russia' / 'СНГ' / 'CIS') so minor backend renames still pin
correctly.
New ScheduleFlightsMiniList groups sibling flights by scheduled
departure date into three accordions. [X] (the selected flight's day)
opens by default; adjacent days open only when the user clicks them.
Days without any flights in the loaded context render locked and
dimmed and cannot be expanded, matching TZ §4.1.16.2 R10-R21.
ScheduleDetailsPage swaps the flat FlightsMiniList for this new
component; the OB mini-list remains unchanged since its layout is
per-day-tabs-driven and already matches §4.1.15.2.
- POSTs to https://www.aeroflot.ru/ws2/v.0.0.2/json/meal with the exact
payload shape the TZ documents (origin, destination, airline, number,
flight_datetime UTC, cabin).
- Cabin selection follows the spec: Economy present → economy;
only Business defined → business; skip the call otherwise.
- 3-hour client-side cache keyed by the full payload so repeated opens
of the same flight card don't re-hit the API.
- Ignores is_available_now per TZ; any populated special_meals / meals
array or a truthy available flag surfaces the Special icon in the
MealPanel on top of the class-based icons.
- MealPanel receives an optional specialMealContext; OnlineBoard details
page threads the flight carrier+number through FlightLegs →
FlightDetailsAccordion → MealPanel so the hook has everything it needs.
- Tie return calendar minDate to outbound dateTo so earlier days grey
out in the picker (Table 16: return cannot start before outbound ends;
same week allowed).
- Auto-clear the return range when the user moves outbound forward and
strands the previously-chosen return in an invalid state.
- Clearing outbound via the X button now cascades to the return range.
Rewrote two tests that previously asserted the submit-time error path;
the new proactive clearing makes that path unreachable for this case,
which is closer to the intent of the TZ.
When an OB flight-number search returns results where every flight is
operated by DP (Pobeda) or HZ (Aurora), render a redirect banner with
links to pobeda.aero and flyaurora.ru instead of the flight list.
Detection respects the §4.1.22 fallback table: an SU flight with no
operatingBy resolves via its number range (SU5000-5399 → DP,
SU5400-5799 → HZ), so subsidiary flights show the banner even when
the telegram carrier field is empty.
Translations added across all 9 locales.
gnezim