Skip to content

fix: Don't show trip-specific alerts on the line diagram #2922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joshlarson merged 3 commits into from
Feb 3, 2026
Merged

fix: Don't show trip-specific alerts on the line diagram #2922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3f6834
refactor: Move `isTripSpecific` definition into `alert.ts`
joshlarson Feb 2, 2026
8887127
fix: Don't show trip-specific alerts on the line diagram
joshlarson Feb 2, 2026
bbd566c
Merge branch 'main' into jdl/fix/dont-show-train-specific-alerts-on-l…
joshlarson Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/ts/models/alert.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,16 @@ export const isInNextXDays = (
return days === 0 ? isCurrentLifecycle(alert) && isInARange : isInARange;
};

export const isTripSpecific = ({ informed_entity }: Alert): boolean => {
const nonNullEntities = informed_entity.trip?.filter(item => item !== null);

if (nonNullEntities === undefined) {
return false;
}

return nonNullEntities.length > 0;
};

export const isActiveDiversion = (alert: Alert): boolean =>
isDiversion(alert) && isInNextXDays(alert, 0);

Expand Down
3 changes: 2 additions & 1 deletion assets/ts/schedule/components/SchedulePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { StoreProps } from "../store/ScheduleStore";
import { isFerryRoute, isSubwayRoute } from "../../models/route";
import HoursOfOperation from "./HoursOfOperation";
import useDirectionChangeEvent from "../../hooks/useDirectionChangeEvent";
import { isTripSpecific } from "../../models/alert";

const updateURL = (origin: SelectedOrigin, direction?: DirectionId): void => {
/* istanbul ignore else */
Expand Down Expand Up @@ -165,7 +166,7 @@ const getDirectionAndMap = (
mapData={mapData}
staticMapData={staticMapData}
stopTree={maybeStopTree}
alerts={alerts}
alerts={alerts.filter(alert => !isTripSpecific(alert))}
busVariantId={busVariantId}
/>
);
Expand Down
12 changes: 1 addition & 11 deletions assets/ts/stop/components/StopPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useRoutes } from "../../hooks/useRoute";
import Loading from "../../components/Loading";
import { useAlertsByRoute, useAlertsByStop } from "../../hooks/useAlerts";
import DeparturesAndMap from "./DeparturesAndMap";
import { routeWideAlerts } from "../../models/alert";
import { isTripSpecific, routeWideAlerts } from "../../models/alert";
import { FetchStatus } from "../../helpers/use-fetch";
import { Alert } from "../../__v3api";
import { GroupedRoutePatterns } from "../../models/route-patterns";
Expand All @@ -21,16 +21,6 @@ const isDeparturesAndMapAlertEffect = ({ effect }: Alert): boolean =>
"suspension"
].includes(effect);

const isTripSpecific = ({ informed_entity }: Alert): boolean => {
const nonNullEntities = informed_entity.trip?.filter(item => item !== null);

if (nonNullEntities === undefined) {
return false;
}

return nonNullEntities.length > 0;
};

const isDeparturesAndMapAlert = (alert: Alert): boolean =>
isDeparturesAndMapAlertEffect(alert) && !isTripSpecific(alert);

Expand Down