From 34ea6db8c2745c4c6dc2f8a7098416a7d49c108b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Strandlie?= Date: Tue, 7 Jul 2026 23:32:10 +0200 Subject: [PATCH] refactor: rename situations module to situations-and-notices --- src/components/message-box/index.tsx | 2 +- src/components/tag/index.tsx | 2 +- .../__tests__/stop-place.test.tsx | 0 .../__tests__/utils.test.ts | 0 src/modules/{situations => situations-and-notices}/index.ts | 0 .../situation-message-box.tsx | 0 .../situation-or-notice-icon.tsx | 0 .../situation.module.css | 0 src/modules/{situations => situations-and-notices}/types.ts | 0 src/modules/{situations => situations-and-notices}/utils.ts | 0 src/page-modules/assistant/details/trip-section/index.tsx | 2 +- src/page-modules/assistant/server/journey-planner/index.ts | 2 +- .../trip/trip-pattern/trip-pattern-header/index.tsx | 2 +- src/page-modules/assistant/utils.ts | 2 +- src/page-modules/departures/details/estimated-call-rows.tsx | 2 +- src/page-modules/departures/details/index.tsx | 5 ++++- src/page-modules/departures/nearest-stop-places/index.tsx | 2 +- src/page-modules/departures/stop-place/index.tsx | 2 +- 18 files changed, 13 insertions(+), 10 deletions(-) rename src/modules/{situations => situations-and-notices}/__tests__/stop-place.test.tsx (100%) rename src/modules/{situations => situations-and-notices}/__tests__/utils.test.ts (100%) rename src/modules/{situations => situations-and-notices}/index.ts (100%) rename src/modules/{situations => situations-and-notices}/situation-message-box.tsx (100%) rename src/modules/{situations => situations-and-notices}/situation-or-notice-icon.tsx (100%) rename src/modules/{situations => situations-and-notices}/situation.module.css (100%) rename src/modules/{situations => situations-and-notices}/types.ts (100%) rename src/modules/{situations => situations-and-notices}/utils.ts (100%) diff --git a/src/components/message-box/index.tsx b/src/components/message-box/index.tsx index ac36a4201..b34a16b2f 100644 --- a/src/components/message-box/index.tsx +++ b/src/components/message-box/index.tsx @@ -2,7 +2,7 @@ import { useTranslation } from '@atb/translations'; import { StatusColorName, useTheme } from '@atb/modules/theme'; import { andIf } from '@atb/utils/css'; import { MonoIcon, MonoIconProps } from '@atb/components/icon'; -import { messageTypeToMonoIcon } from '@atb/modules/situations'; +import { messageTypeToMonoIcon } from '@atb/modules/situations-and-notices'; import { Button } from '@atb/components/button'; import dictionary from '@atb/translations/dictionary'; import { Typo } from '@atb/components/typography'; diff --git a/src/components/tag/index.tsx b/src/components/tag/index.tsx index ab3391f51..91f04e092 100644 --- a/src/components/tag/index.tsx +++ b/src/components/tag/index.tsx @@ -1,7 +1,7 @@ import { StatusColorName, useTheme } from '@atb/modules/theme'; import { andIf } from '@atb/utils/css'; import { ColorIcon, MonoIcon, MonoIcons } from '@atb/components/icon'; -import { messageTypeToColorIcon } from '@atb/modules/situations'; +import { messageTypeToColorIcon } from '@atb/modules/situations-and-notices'; import { Typo } from '@atb/components/typography'; import style from './tag.module.css'; diff --git a/src/modules/situations/__tests__/stop-place.test.tsx b/src/modules/situations-and-notices/__tests__/stop-place.test.tsx similarity index 100% rename from src/modules/situations/__tests__/stop-place.test.tsx rename to src/modules/situations-and-notices/__tests__/stop-place.test.tsx diff --git a/src/modules/situations/__tests__/utils.test.ts b/src/modules/situations-and-notices/__tests__/utils.test.ts similarity index 100% rename from src/modules/situations/__tests__/utils.test.ts rename to src/modules/situations-and-notices/__tests__/utils.test.ts diff --git a/src/modules/situations/index.ts b/src/modules/situations-and-notices/index.ts similarity index 100% rename from src/modules/situations/index.ts rename to src/modules/situations-and-notices/index.ts diff --git a/src/modules/situations/situation-message-box.tsx b/src/modules/situations-and-notices/situation-message-box.tsx similarity index 100% rename from src/modules/situations/situation-message-box.tsx rename to src/modules/situations-and-notices/situation-message-box.tsx diff --git a/src/modules/situations/situation-or-notice-icon.tsx b/src/modules/situations-and-notices/situation-or-notice-icon.tsx similarity index 100% rename from src/modules/situations/situation-or-notice-icon.tsx rename to src/modules/situations-and-notices/situation-or-notice-icon.tsx diff --git a/src/modules/situations/situation.module.css b/src/modules/situations-and-notices/situation.module.css similarity index 100% rename from src/modules/situations/situation.module.css rename to src/modules/situations-and-notices/situation.module.css diff --git a/src/modules/situations/types.ts b/src/modules/situations-and-notices/types.ts similarity index 100% rename from src/modules/situations/types.ts rename to src/modules/situations-and-notices/types.ts diff --git a/src/modules/situations/utils.ts b/src/modules/situations-and-notices/utils.ts similarity index 100% rename from src/modules/situations/utils.ts rename to src/modules/situations-and-notices/utils.ts diff --git a/src/page-modules/assistant/details/trip-section/index.tsx b/src/page-modules/assistant/details/trip-section/index.tsx index 6cf98fd17..6efc448ba 100644 --- a/src/page-modules/assistant/details/trip-section/index.tsx +++ b/src/page-modules/assistant/details/trip-section/index.tsx @@ -15,7 +15,7 @@ import { MessageBox } from '@atb/components/message-box'; import { SituationMessageBox, SituationOrNoticeIcon, -} from '@atb/modules/situations'; +} from '@atb/modules/situations-and-notices'; import { PageText, useTranslation } from '@atb/translations'; import { InterchangeDetails, InterchangeSection } from './interchange-section'; import { formatLineName, getPlaceName } from '../utils'; diff --git a/src/page-modules/assistant/server/journey-planner/index.ts b/src/page-modules/assistant/server/journey-planner/index.ts index 36b873141..b4d7572cc 100644 --- a/src/page-modules/assistant/server/journey-planner/index.ts +++ b/src/page-modules/assistant/server/journey-planner/index.ts @@ -22,7 +22,7 @@ import { RefreshLegQuery, RefreshLegQueryVariables, } from '@atb/page-modules/assistant/journey-gql/refresh-leg.generated'; -import { filterNotices } from '@atb/modules/situations'; +import { filterNotices } from '@atb/modules/situations-and-notices'; import { compressToEncodedURIComponent, decompressFromEncodedURIComponent, diff --git a/src/page-modules/assistant/trip/trip-pattern/trip-pattern-header/index.tsx b/src/page-modules/assistant/trip/trip-pattern/trip-pattern-header/index.tsx index bb47c59fe..6591aeb6f 100644 --- a/src/page-modules/assistant/trip/trip-pattern/trip-pattern-header/index.tsx +++ b/src/page-modules/assistant/trip/trip-pattern/trip-pattern-header/index.tsx @@ -4,7 +4,7 @@ import { useTranslation, PageText, TranslateFunction } from '@atb/translations'; import { formatTripDuration } from '@atb/utils/date'; import { flatMap } from 'lodash'; import { RailReplacementBusMessage } from './rail-replacement-bus'; -import { SituationOrNoticeIcon } from '@atb/modules/situations'; +import { SituationOrNoticeIcon } from '@atb/modules/situations-and-notices'; import { isSubModeBoat } from '@atb/modules/transport-mode'; import { ColorIcon } from '@atb/components/icon'; import { Assistant } from '@atb/translations/pages'; diff --git a/src/page-modules/assistant/utils.ts b/src/page-modules/assistant/utils.ts index 234b412d7..378cd3df4 100644 --- a/src/page-modules/assistant/utils.ts +++ b/src/page-modules/assistant/utils.ts @@ -2,7 +2,7 @@ import { searchTimeToQueryString } from '@atb/modules/search-time'; import { GeocoderFeature } from '@atb/modules/geocoder'; import { FromToTripQuery, TripQuery, TripQuerySchema } from './types'; import { TravelSearchFiltersType } from '@atb-as/config-specs'; -import { filterNotices } from '@atb/modules/situations'; +import { filterNotices } from '@atb/modules/situations-and-notices'; import { LegWithDetailsFragment } from './journey-gql/trip-with-details.generated'; import { MEDIUM_WALK_SPEED } from './walk-speed-input'; import { defaultTransferSlack } from './transfer-slack-input'; diff --git a/src/page-modules/departures/details/estimated-call-rows.tsx b/src/page-modules/departures/details/estimated-call-rows.tsx index d4253f691..c646460d8 100644 --- a/src/page-modules/departures/details/estimated-call-rows.tsx +++ b/src/page-modules/departures/details/estimated-call-rows.tsx @@ -13,7 +13,7 @@ import { import { SituationMessageBox, SituationOrNoticeIcon, -} from '@atb/modules/situations'; +} from '@atb/modules/situations-and-notices'; import { formatQuayName, getSituationsToShowForCall } from './utils'; import { DecorationLine, TripRow } from '@atb/modules/trip-details'; import { DepartureTime } from '@atb/components/departure-time'; diff --git a/src/page-modules/departures/details/index.tsx b/src/page-modules/departures/details/index.tsx index fe750e410..ef74e49da 100644 --- a/src/page-modules/departures/details/index.tsx +++ b/src/page-modules/departures/details/index.tsx @@ -4,7 +4,10 @@ import LineChip from '@atb/components/line-chip'; import { Map } from '@atb/components/map'; import { MessageBox } from '@atb/components/message-box'; import { Typo } from '@atb/components/typography'; -import { SituationMessageBox, filterNotices } from '@atb/modules/situations'; +import { + SituationMessageBox, + filterNotices, +} from '@atb/modules/situations-and-notices'; import { useRealtimeText } from '@atb/modules/trip-details'; import { PageText, useTranslation } from '@atb/translations'; import dictionary from '@atb/translations/dictionary'; diff --git a/src/page-modules/departures/nearest-stop-places/index.tsx b/src/page-modules/departures/nearest-stop-places/index.tsx index 6cf501ad5..05a0cf399 100644 --- a/src/page-modules/departures/nearest-stop-places/index.tsx +++ b/src/page-modules/departures/nearest-stop-places/index.tsx @@ -7,7 +7,7 @@ import { useRouter } from 'next/router'; import VenueIcon from '@atb/components/venue-icon'; import { PageText, useTranslation } from '@atb/translations'; import EmptyMessage from '@atb/components/empty-message'; -import { SituationOrNoticeIcon } from '@atb/modules/situations'; +import { SituationOrNoticeIcon } from '@atb/modules/situations-and-notices'; import ScreenReaderOnly from '@atb/components/screen-reader-only'; import { OpenGraphDescription, diff --git a/src/page-modules/departures/stop-place/index.tsx b/src/page-modules/departures/stop-place/index.tsx index f33311ca2..f25ae5cb3 100644 --- a/src/page-modules/departures/stop-place/index.tsx +++ b/src/page-modules/departures/stop-place/index.tsx @@ -13,7 +13,7 @@ import { isSituationValidAtDate, SituationMessageBox, SituationOrNoticeIcon, -} from '@atb/modules/situations'; +} from '@atb/modules/situations-and-notices'; import { PageText, useTranslation } from '@atb/translations'; import { Departures } from '@atb/translations/pages'; import { and, andIf } from '@atb/utils/css';