gnezim/flights_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tighten filter validation per TZ 4.1.9.3 + 4.1.9.4

Browse Source
This commit is contained in:
Anton
2026-04-21 21:50:46 +03:00
parent d173159018
commit c509131649
13 changed files with 329 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/features/online-board/components/OnlineBoardFilter.test.tsx
+77
View File
@@ -239,3 +239,80 @@ describe("OnlineBoardFilter – time slider 1h minimum gap per TZ §4.1.9 Tables
expect(value?.textContent).toBe("23:00 — 24:00");
});
});
describe("OnlineBoardFilter – flight-number validation per TZ §4.1.9.3", () => {
beforeEach(() => {
vi.clearAllMocks();
});
it("4.1.9.3-R: '38' submits as SU0038 in URL", () => {
render(<OnlineBoardFilter initialTab="flight" initialDate="20260601" />);
fireEvent.change(screen.getByTestId("flight-number-input"), {
target: { value: "38" },
});
fireEvent.submit(screen.getByTestId("search-form"));
// navigate should be called with a URL containing SU0038
expect(mockNavigate).toHaveBeenCalled();
const url = mockNavigate.mock.calls[0]![0] as string;
expect(url).toMatch(/SU0038/);
});
it("4.1.9.3-R: '383' submits as SU0383 in URL", () => {
render(<OnlineBoardFilter initialTab="flight" initialDate="20260601" />);
fireEvent.change(screen.getByTestId("flight-number-input"), {
target: { value: "383" },
});
fireEvent.submit(screen.getByTestId("search-form"));
expect(mockNavigate).toHaveBeenCalled();
const url = mockNavigate.mock.calls[0]![0] as string;
expect(url).toMatch(/SU0383/);
});
it("4.1.9.3-R: '1234' submits as SU1234 (no padding needed)", () => {
render(<OnlineBoardFilter initialTab="flight" initialDate="20260601" />);
fireEvent.change(screen.getByTestId("flight-number-input"), {
target: { value: "1234" },
});
fireEvent.submit(screen.getByTestId("search-form"));
expect(mockNavigate).toHaveBeenCalled();
const url = mockNavigate.mock.calls[0]![0] as string;
expect(url).toMatch(/SU1234/);
});
it("4.1.9.3-R: letters in flight number show error and block submit", () => {
render(<OnlineBoardFilter initialTab="flight" />);
fireEvent.change(screen.getByTestId("flight-number-input"), {
target: { value: "abc" },
});
fireEvent.submit(screen.getByTestId("search-form"));
expect(screen.queryByTestId("flight-number-error")).toBeTruthy();
expect(mockNavigate).not.toHaveBeenCalled();
});
it("4.1.9.3-R: 5-digit flight number shows error and blocks submit", () => {
render(<OnlineBoardFilter initialTab="flight" />);
fireEvent.change(screen.getByTestId("flight-number-input"), {
target: { value: "12345" },
});
fireEvent.submit(screen.getByTestId("search-form"));
expect(screen.queryByTestId("flight-number-error")).toBeTruthy();
expect(mockNavigate).not.toHaveBeenCalled();
});
it("4.1.9.3-R: board calendar max date is +14 days from today", () => {
const today = new Date();
today.setHours(0, 0, 0, 0);
const expected = new Date(today);
expected.setDate(today.getDate() + 14);
// We verify the +14 window by checking that the component renders
// without error when an initialDate 14 days out is supplied.
const dateStr = [
expected.getFullYear(),
String(expected.getMonth() + 1).padStart(2, "0"),
String(expected.getDate()).padStart(2, "0"),
].join("");
expect(() =>
render(<OnlineBoardFilter initialTab="flight" initialDate={dateStr} />),
).not.toThrow();
});
});
src/features/online-board/components/OnlineBoardFilter.tsx
+17 -10
View File
@@ -43,18 +43,28 @@ function dateToYyyymmdd(value: Date): string {
return `${y}${m}${d}`;
}
/** Validates a flight number string (3-4 digits + optional letter suffix) */
/**
* Validates a flight number string per TZ §4.1.9.3:
* - Must be 1-4 digits only (no letters, no spaces).
* - Error message: "только из цифр и не должен быть длиннее 4-х символов".
* Shorter inputs (1-3 digits) are valid; they get zero-padded at submit time.
*/
function validateFlightNumber(value: string): string | null {
if (!value.trim()) {
return "BOARD.FLIGHT_NUMBER-ERROR-EMPTY";
}
const reg = /^\d{3,4}[A-Za-z]?$/;
if (!reg.test(value.trim()) || value.trim().length > 5) {
const reg = /^\d{1,4}$/;
if (!reg.test(value.trim())) {
return "BOARD.FLIGHT_NUMBER-ERROR-ONLY-NUMBER";
}
return null;
}
/** Zero-pads a 1-3 digit flight number to 4 digits per TZ §4.1.9.3 (e.g. "38" → "0038"). */
function padFlightNumber(value: string): string {
return value.trim().padStart(4, "0");
}
export interface OnlineBoardFilterProps {
/** Pre-populate filter from URL params on search results pages */
initialDeparture?: string;
@@ -81,10 +91,7 @@ function yyyymmddToDate(yyyymmdd: string): Date {
return new Date(y, m, d);
}
// Mirrors Angular AppSettings.boardSearchFrom (1 day back) and
// boardSearchTo (7 days forward). Keeps the board-filter calendar to the
// same ±1/+7 window Angular enforces, so users can't pick a date outside
// the available online-board range.
// TZ §4.1.9.3 Table 11/12: board calendar window is -1/+14 days from today.
function getBoardMinDate(): Date {
const d = new Date();
d.setHours(0, 0, 0, 0);
@@ -95,7 +102,7 @@ function getBoardMinDate(): Date {
function getBoardMaxDate(): Date {
const d = new Date();
d.setHours(0, 0, 0, 0);
d.setDate(d.getDate() + 7);
d.setDate(d.getDate() + 14);
return d;
}
@@ -228,9 +235,9 @@ export const OnlineBoardFilter: FC<OnlineBoardFilterProps> = ({
// Empty date defaults to today, matching Angular's behaviour when
// the placeholder ДД.ММ.ГГГГ is left untouched.
const dateParam = dateToYyyymmdd(flightDate ?? new Date());
const cleaned = flightNumber.trim().replace(/\s+/g, "");
const carrier = "SU";
const num = cleaned;
// TZ §4.1.9.3: zero-pad to 4 digits (38 → 0038, 383 → 0383).
const num = padFlightNumber(flightNumber);
if (!num) return;
// TZ §4.1.8: persist filter snapshot for cross-section hydration.
src/features/schedule/components/ScheduleFilter.test.tsx
+141
View File
@@ -228,3 +228,144 @@ describe("ScheduleFilter – time slider 1h minimum gap per TZ §4.1.9 Table 14"
expect(value?.textContent).toBe("12:00 — 13:00");
});
});
describe("ScheduleFilter – validation per TZ §4.1.9.4", () => {
beforeEach(() => {
vi.clearAllMocks();
_sliderOnChange = null;
_sliderOnChanges.length = 0;
});
// -------------------------------------------------------------------------
// §4.1.9.4 range ≤ 7 days
// -------------------------------------------------------------------------
it("4.1.9.4-R: outbound range > 7 days shows validation error + blocks submit", () => {
render(
<ScheduleFilter
initialDeparture="SVO"
initialArrival="LED"
initialDateFrom="20260601"
initialDateTo="20260611"
/>,
);
fireEvent.submit(screen.getByTestId("search-form"));
expect(screen.queryByTestId("schedule-range-error")).toBeTruthy();
expect(mockNavigate).not.toHaveBeenCalled();
});
it("4.1.9.4-R: outbound range exactly 7 days passes validation", () => {
render(
<ScheduleFilter
initialDeparture="SVO"
initialArrival="LED"
initialDateFrom="20260601"
initialDateTo="20260608"
/>,
);
fireEvent.submit(screen.getByTestId("search-form"));
expect(screen.queryByTestId("schedule-range-error")).toBeNull();
expect(mockNavigate).toHaveBeenCalled();
});
it("4.1.9.4-R: range error clears when user picks a new date range", () => {
render(
<ScheduleFilter
initialDeparture="SVO"
initialArrival="LED"
initialDateFrom="20260601"
initialDateTo="20260611"
/>,
);
fireEvent.submit(screen.getByTestId("search-form"));
expect(screen.queryByTestId("schedule-range-error")).toBeTruthy();
// Simulate the Calendar onChange (stub fires the onChange prop)
const calInput = screen.getByTestId("schedule-date-input");
fireEvent.change(calInput, { target: {} });
// The error is cleared on the Calendar's onChange in ScheduleFilter —
// but the stub doesn't call onChange. Instead clear via the X button.
const clearBtn = screen.queryByTestId("schedule-date-clear");
if (clearBtn) {
fireEvent.click(clearBtn);
expect(screen.queryByTestId("schedule-range-error")).toBeNull();
}
});
// -------------------------------------------------------------------------
// §4.1.9.4 return date must be >= outbound dateTo
// -------------------------------------------------------------------------
it("4.1.9.4-R: return date before outbound dateTo shows error + blocks submit", () => {
render(
<ScheduleFilter
initialDeparture="SVO"
initialArrival="LED"
initialDateFrom="20260601"
initialDateTo="20260607"
initialReturnFlights={true}
initialReturnDateFrom="20260603"
initialReturnDateTo="20260610"
/>,
);
fireEvent.submit(screen.getByTestId("search-form"));
expect(screen.queryByTestId("schedule-return-before-outbound-error")).toBeTruthy();
expect(mockNavigate).not.toHaveBeenCalled();
});
it("4.1.9.4-R: return date equal to outbound dateTo passes validation", () => {
render(
<ScheduleFilter
initialDeparture="SVO"
initialArrival="LED"
initialDateFrom="20260601"
initialDateTo="20260607"
initialReturnFlights={true}
initialReturnDateFrom="20260607"
initialReturnDateTo="20260614"
/>,
);
fireEvent.submit(screen.getByTestId("search-form"));
expect(screen.queryByTestId("schedule-return-before-outbound-error")).toBeNull();
expect(mockNavigate).toHaveBeenCalled();
});
it("4.1.9.4-R: return date after outbound dateTo passes validation", () => {
render(
<ScheduleFilter
initialDeparture="SVO"
initialArrival="LED"
initialDateFrom="20260601"
initialDateTo="20260607"
initialReturnFlights={true}
initialReturnDateFrom="20260608"
initialReturnDateTo="20260614"
/>,
);
fireEvent.submit(screen.getByTestId("search-form"));
expect(screen.queryByTestId("schedule-return-before-outbound-error")).toBeNull();
expect(mockNavigate).toHaveBeenCalled();
});
it("4.1.9.4-R: return error clears after user clears the return date range", () => {
render(
<ScheduleFilter
initialDeparture="SVO"
initialArrival="LED"
initialDateFrom="20260601"
initialDateTo="20260607"
initialReturnFlights={true}
initialReturnDateFrom="20260603"
initialReturnDateTo="20260610"
/>,
);
fireEvent.submit(screen.getByTestId("search-form"));
expect(screen.queryByTestId("schedule-return-before-outbound-error")).toBeTruthy();
const clearBtn = screen.queryByTestId("schedule-return-date-clear");
if (clearBtn) {
fireEvent.click(clearBtn);
expect(screen.queryByTestId("schedule-return-before-outbound-error")).toBeNull();
}
});
});
src/features/schedule/components/ScheduleFilter.tsx
+65 -6
View File
@@ -128,6 +128,10 @@ export const ScheduleFilter: FC<ScheduleFilterProps> = ({
// error shown below the arrival input when the user submits with
// departure === arrival. Cleared whenever either city changes.
const [sameCitiesError, setSameCitiesError] = useState<string | null>(null);
// TZ §4.1.9.4: outbound range must be ≤ 7 days.
const [rangeError, setRangeError] = useState<string | null>(null);
// TZ §4.1.9.4: return week must not start before outbound dateTo.
const [returnBeforeOutboundError, setReturnBeforeOutboundError] = useState<string | null>(null);
const scheduleMinDate = useRef(getScheduleMinDate()).current;
const scheduleMaxDate = useRef(getScheduleMaxDate()).current;
@@ -166,6 +170,33 @@ export const ScheduleFilter: FC<ScheduleFilterProps> = ({
}
setSameCitiesError(null);
// TZ §4.1.9.4: outbound range must be ≤ 7 days.
if (dateRange[0] && dateRange[1]) {
const diffMs = dateRange[1].getTime() - dateRange[0].getTime();
const diffDays = Math.round(diffMs / 86_400_000);
if (diffDays > 7) {
setRangeError("SHARED.SCHEDULE-RANGE-MAX-7-DAYS");
return;
}
}
setRangeError(null);
// TZ §4.1.9.4: return week must not start before outbound dateTo.
if (returnFlights && returnDateRange[0] && dateRange[1]) {
const retFrom = returnDateRange[0];
const outTo = dateRange[1];
// retFrom must be >= outTo (same week or later)
const retFromDay = new Date(retFrom);
retFromDay.setHours(0, 0, 0, 0);
const outToDay = new Date(outTo);
outToDay.setHours(0, 0, 0, 0);
if (retFromDay.getTime() < outToDay.getTime()) {
setReturnBeforeOutboundError("SHARED.RETURN-DATE-BEFORE-OUTBOUND");
return;
}
}
setReturnBeforeOutboundError(null);
// Default to current week if no range provided.
const now = new Date();
const day = now.getDay();
@@ -307,7 +338,10 @@ export const ScheduleFilter: FC<ScheduleFilterProps> = ({
<div className="calendar-input-wrapper">
<Calendar
value={dateRange}
onChange={(e) => setDateRange((e.value as (Date | null)[]) ?? [null, null])}
onChange={(e) => {
setDateRange((e.value as (Date | null)[]) ?? [null, null]);
if (rangeError) setRangeError(null);
}}
selectionMode="range"
minDate={scheduleMinDate}
maxDate={scheduleMaxDate}
@@ -326,12 +360,24 @@ export const ScheduleFilter: FC<ScheduleFilterProps> = ({
className="calendar-clear-btn"
aria-label={t("SHARED.A11Y-CLEAR")}
data-testid="schedule-date-clear"
onClick={() => setDateRange([null, null])}
onClick={() => {
setDateRange([null, null]);
setRangeError(null);
}}
>
&times;
</button>
)}
</div>
{rangeError && (
<div
className="validation-tooltip"
data-testid="schedule-range-error"
role="alert"
>
{t(rangeError)}
</div>
)}
</div>
<div className="wrapper--time-selector compact-view" data-testid="time-selector">
@@ -399,11 +445,12 @@ export const ScheduleFilter: FC<ScheduleFilterProps> = ({
<div className="calendar-input-wrapper">
<Calendar
value={returnDateRange}
onChange={(e) =>
onChange={(e) => {
setReturnDateRange(
(e.value as (Date | null)[]) ?? [null, null],
)
}
);
if (returnBeforeOutboundError) setReturnBeforeOutboundError(null);
}}
selectionMode="range"
minDate={scheduleMinDate}
maxDate={scheduleMaxDate}
@@ -421,12 +468,24 @@ export const ScheduleFilter: FC<ScheduleFilterProps> = ({
className="calendar-clear-btn"
aria-label={t("SHARED.A11Y-CLEAR")}
data-testid="schedule-return-date-clear"
onClick={() => setReturnDateRange([null, null])}
onClick={() => {
setReturnDateRange([null, null]);
setReturnBeforeOutboundError(null);
}}
>
&times;
</button>
)}
</div>
{returnBeforeOutboundError && (
<div
className="validation-tooltip"
data-testid="schedule-return-before-outbound-error"
role="alert"
>
{t(returnBeforeOutboundError)}
</div>
)}
</div>
<div className="wrapper--time-selector compact-view" data-testid="return-time-selector">
src/i18n/locales/de/common.json
+3 -1
View File
@@ -395,7 +395,9 @@
"A11Y-PREV-LEGS": "Previous legs",
"A11Y-NEXT-LEGS": "Next legs",
"BOARDING-START": "Start time",
"BOARDING-END": "End time"
"BOARDING-END": "End time",
"SCHEDULE-RANGE-MAX-7-DAYS": "",
"RETURN-DATE-BEFORE-OUTBOUND": ""
},
"WARNING": {
"IFLY_HIGHLIGHT": "Bitte beachten Sie:",
src/i18n/locales/en/common.json
+4 -2
View File
@@ -22,7 +22,7 @@
"FLIGHT_NUMBER": "Flight number",
"FLIGHT_NUMBER-ERROR-BIG": "Incorrect flight number. The flight number may not be longer than 4 digits",
"FLIGHT_NUMBER-ERROR-EMPTY": "Specify flight number",
"FLIGHT_NUMBER-ERROR-ONLY-NUMBER": "Incorrect flight number. The flight number must consist of 3–4 digits and may include a single Latin letter suffix at the end.",
"FLIGHT_NUMBER-ERROR-ONLY-NUMBER": "Incorrect flight number. The flight number may only consist of digits and must not exceed 4 characters.",
"GPS-BUTTON": "Detect my location",
"GPS-HELP": "Enable geolocation in your browser to detect the city automatically. Geolocation will not work if any anonymizers are enabled.",
"NOT-FOUND-LOCATION": "You are seeing this page because we could not access your current location. \nAllow the app to access your location to view flights to your destination.",
@@ -434,7 +434,9 @@
"A11Y-PREV-LEGS": "Previous legs",
"A11Y-NEXT-LEGS": "Next legs",
"BOARDING-START": "Start time",
"BOARDING-END": "End time"
"BOARDING-END": "End time",
"SCHEDULE-RANGE-MAX-7-DAYS": "Please check the dates. The date range cannot exceed 7 days.",
"RETURN-DATE-BEFORE-OUTBOUND": "Please check the dates. The return date must be after the outbound date."
},
"WARNING": {
"IFLY_HIGHLIGHT": "Please note:",
src/i18n/locales/es/common.json
+3 -1
View File
@@ -395,7 +395,9 @@
"A11Y-PREV-LEGS": "Previous legs",
"A11Y-NEXT-LEGS": "Next legs",
"BOARDING-START": "Start time",
"BOARDING-END": "End time"
"BOARDING-END": "End time",
"SCHEDULE-RANGE-MAX-7-DAYS": "",
"RETURN-DATE-BEFORE-OUTBOUND": ""
},
"WARNING": {
"IFLY_HIGHLIGHT": "Nota:",
src/i18n/locales/fr/common.json
+3 -1
View File
@@ -395,7 +395,9 @@
"A11Y-PREV-LEGS": "Previous legs",
"A11Y-NEXT-LEGS": "Next legs",
"BOARDING-START": "Start time",
"BOARDING-END": "End time"
"BOARDING-END": "End time",
"SCHEDULE-RANGE-MAX-7-DAYS": "",
"RETURN-DATE-BEFORE-OUTBOUND": ""
},
"WARNING": {
"IFLY_HIGHLIGHT": "Remarque:",
src/i18n/locales/it/common.json
+3 -1
View File
@@ -395,7 +395,9 @@
"A11Y-PREV-LEGS": "Previous legs",
"A11Y-NEXT-LEGS": "Next legs",
"BOARDING-START": "Start time",
"BOARDING-END": "End time"
"BOARDING-END": "End time",
"SCHEDULE-RANGE-MAX-7-DAYS": "",
"RETURN-DATE-BEFORE-OUTBOUND": ""
},
"WARNING": {
"IFLY_HIGHLIGHT": "Attenzione:",
src/i18n/locales/ja/common.json
+3 -1
View File
@@ -395,7 +395,9 @@
"A11Y-PREV-LEGS": "Previous legs",
"A11Y-NEXT-LEGS": "Next legs",
"BOARDING-START": "Start time",
"BOARDING-END": "End time"
"BOARDING-END": "End time",
"SCHEDULE-RANGE-MAX-7-DAYS": "",
"RETURN-DATE-BEFORE-OUTBOUND": ""
},
"WARNING": {
"IFLY_HIGHLIGHT": "ご注意:",
src/i18n/locales/ko/common.json
+3 -1
View File
@@ -395,7 +395,9 @@
"A11Y-PREV-LEGS": "Previous legs",
"A11Y-NEXT-LEGS": "Next legs",
"BOARDING-START": "Start time",
"BOARDING-END": "End time"
"BOARDING-END": "End time",
"SCHEDULE-RANGE-MAX-7-DAYS": "",
"RETURN-DATE-BEFORE-OUTBOUND": ""
},
"WARNING": {
"IFLY_HIGHLIGHT": "참고:",
src/i18n/locales/ru/common.json
+4 -2
View File
@@ -22,7 +22,7 @@
"FLIGHT_NUMBER": "Номер рейса",
"FLIGHT_NUMBER-ERROR-BIG": "Неверно указан номер рейса. Номер рейса не должен быть длиннее 4-х символов",
"FLIGHT_NUMBER-ERROR-EMPTY": "Укажите номер рейса",
"FLIGHT_NUMBER-ERROR-ONLY-NUMBER": "Неверно указан номер рейса. Номер рейса должен состоять из 3-4 цифр и может содержать в конце одну латинскую букву-суффикс.",
"FLIGHT_NUMBER-ERROR-ONLY-NUMBER": "Неверно указан номер рейса. Номер рейса может состоять только из цифр и не должен быть длиннее 4-х символов.",
"GPS-BUTTON": "Определить мое местоположение",
"GPS-HELP": "Для автоматического определения города разрешите браузеру доступ к геолокации. Определение может не работать при включенных анонимайзерах.",
"NOT-FOUND-LOCATION": "Мы не смогли определить Ваше месторасположение — поэтому Вы видите эту страницу. \nРазрешите определение месторасположения — сразу будет открыта страница рейсов в ваш город.",
@@ -434,7 +434,9 @@
"A11Y-PREV-LEGS": "Предыдущие сегменты",
"A11Y-NEXT-LEGS": "Следующие сегменты",
"BOARDING-START": "Время начала",
"BOARDING-END": "Время окончания"
"BOARDING-END": "Время окончания",
"SCHEDULE-RANGE-MAX-7-DAYS": "Проверьте заполнение. Диапазон дат не может превышать 7 дней.",
"RETURN-DATE-BEFORE-OUTBOUND": "Проверьте заполнение. Дата обратного рейса должна быть позже даты рейса туда."
},
"SMOKE": {
"HEADING": "Страница проверки"
src/i18n/locales/zh/common.json
+3 -1
View File
@@ -395,7 +395,9 @@
"A11Y-PREV-LEGS": "Previous legs",
"A11Y-NEXT-LEGS": "Next legs",
"BOARDING-START": "Start time",
"BOARDING-END": "End time"
"BOARDING-END": "End time",
"SCHEDULE-RANGE-MAX-7-DAYS": "",
"RETURN-DATE-BEFORE-OUTBOUND": ""
},
"WARNING": {
"IFLY_HIGHLIGHT": "请注意:",