fix: Fixed wrong empty array for submodes

Author: strandlie

src/modules/transport-mode/filter/index.ts

@@ -1,6 +1,3 @@
 export { default as TransportModeFilter } from './filter';
 
-export {
-  getAllTransportModesFromFilterOptions,
-  parseFilterQuery,
-} from './utils';
+export { parseFilterQuery } from './utils';

src/modules/transport-mode/filter/utils.ts

@@ -1,25 +1,7 @@
-import { uniq } from 'lodash';
-import type { NewTransportModeGroup } from '../types';
-import { getTransportModeFilter } from '@atb/modules/firebase/transport-mode-filter';
-
 export function parseFilterQuery(
   filterQuery: string | string[] | undefined,
 ): string[] | null {
   if (!filterQuery) return null;
 
   return filterQuery.toString().split(',');
 }
-
-export async function getAllTransportModesFromFilterOptions(
-  filterOptions: string[] | null,
-): Promise<NewTransportModeGroup[] | undefined> {
-  const transportModeFilter = await getTransportModeFilter();
-
-  if (!transportModeFilter) return;
-
-  const transportModes: NewTransportModeGroup[] = transportModeFilter
-    .filter((option) => !filterOptions || filterOptions.includes(option.id))
-    .flatMap((option) => option.modes);
-
-  return uniq(transportModes);
-}

src/modules/transport-mode/icon/index.tsx

@@ -1,4 +1,3 @@
-import { TransportModeGroup } from '../types';
 import MonoIcon, { MonoIconProps } from '@atb/components/icon/mono-icon';
 import { ContrastColor, TransportColors, useTheme } from '@atb/modules/theme';
 import { useTranslation } from '@atb/translations';

src/modules/transport-mode/index.ts

@@ -1,8 +1,6 @@
 export {
   type TransportModeType,
   type TransportSubmodeType,
-  type TransportModeGroup,
-  type NewTransportModeGroup,
   transportModeSchema,
   transportSubmodeSchema,
 } from './types';

src/modules/transport-mode/types.ts

@@ -1,9 +1,4 @@
 import { z } from 'zod';
-import {
-  TransportModeType as NewTransportModeType,
-  TransportSubmodeType as NewTransportSubmodeType,
-} from '@atb-as/config-specs';
-import { TransportMode as GraphQlTransportModeType } from '@atb/modules/graphql-types';
 
 export const transportModeSchema = z.union([
   z.literal('air'),
@@ -146,13 +141,3 @@ export const transportSubmodeSchema = z.union([
 ]);
 
 export type TransportSubmodeType = z.infer<typeof transportSubmodeSchema>;
-
-export type TransportModeGroup = {
-  transportMode: TransportModeType;
-  transportSubModes?: TransportSubmodeType[];
-};
-
-export type NewTransportModeGroup = {
-  transportMode: NewTransportModeType;
-  transportSubModes?: NewTransportSubmodeType[];
-};

src/modules/transport-mode/utils.ts

@@ -1,6 +1,5 @@
 import { ComponentText } from '@atb/translations';
 import {
-  TransportModeGroup,
   transportModeSchema,
   TransportModeType,
   transportSubmodeSchema,
@@ -21,13 +20,6 @@ export function transportModeToTranslatedString(
   }
   return text;
 }
-export function severalTransportModesToTranslatedStrings(
-  modes: TransportModeGroup[],
-) {
-  return modes
-    .filter((mode) => !!mode.transportMode) // Remove the ! from mode.transportMode! below if this line is removed
-    .map((mode) => ComponentText.TransportMode.modes[mode.transportMode!]);
-}
 
 export function isTransportModeType(a: any): a is TransportModeType {
   return transportModeSchema.safeParse(a).success;

src/page-modules/assistant/server/journey-planner/index.ts

@@ -46,21 +46,10 @@ import {
   TripsNonTransitDocument,
 } from '@atb/page-modules/assistant/journey-gql/non-transit-trip.generated';
 import { MEDIUM_WALK_SPEED } from '@atb/page-modules/assistant/walk-speed-input';
-import { NewTransportModeGroup } from '@atb/modules/transport-mode';
 import {
   StreetMode,
-  TransportMode,
   TransportModes,
-  TransportSubmode,
 } from '@atb/modules/graphql-types/journeyplanner-types_v3.generated.ts';
-import { enumFromString } from '@atb/utils/enum-from-string.ts';
-import { isDefined } from '@atb/utils/presence.ts';
-
-type AssertSameEnum<T1, T2> = T1 extends T2
-  ? T2 extends T1
-    ? true
-    : never
-  : never;
 
 type JourneyModes = {
   accessMode: StreetMode;

src/page-modules/assistant/server/journey-planner/mappers.ts

@@ -1,31 +1,41 @@
-import { NewTransportModeGroup } from '@atb/modules/transport-mode';
 import {
   TransportMode,
   TransportModes,
   TransportSubmode,
 } from '@atb/modules/graphql-types/journeyplanner-types_v3.generated.ts';
 import { enumFromString } from '@atb/utils/enum-from-string.ts';
 import { isDefined } from '@atb/utils/presence.ts';
+import { getTransportModeFilter } from '@atb/modules/firebase/transport-mode-filter.ts';
+import { uniq } from 'lodash';
 
 /**
  * Maps from TransportModeType in config-specs (used in the UI)
  * to JourneyPlanner v3 TransportModes (used in the GraphQL call)
  *
  * These are almost the same, except for the "unknown" value
  */
-export function mapToJourneyPlannerTransportModes(
-  groups?: NewTransportModeGroup[],
-): TransportModes[] {
-  return (
-    groups?.map((transportModeGroup) => ({
-      transportMode: enumFromString(
-        TransportMode,
-        transportModeGroup.transportMode,
-      ),
-      transportSubModes:
-        transportModeGroup.transportSubModes
-          ?.map((subMode) => enumFromString(TransportSubmode, subMode))
-          .filter(isDefined) ?? [],
-    })) ?? []
+export async function mapToJourneyPlannerTransportModes(
+  filterOptions?: string[] | null,
+): Promise<TransportModes[]> {
+  const transportModeFilters = await getTransportModeFilter();
+  if (!transportModeFilters) return [];
+
+  const filters = transportModeFilters.filter(
+    (option) => !filterOptions || filterOptions.includes(option.id),
   );
+
+  const transportModes =
+    filters
+      .flatMap((option) => option.modes)
+      .map((transportModeGroup) => ({
+        transportMode: enumFromString(
+          TransportMode,
+          transportModeGroup.transportMode,
+        ),
+        transportSubModes: transportModeGroup.transportSubModes
+          ?.map((subMode) => enumFromString(TransportSubmode, subMode))
+          .filter(isDefined),
+      })) ?? [];
+
+  return uniq(transportModes);
 }

src/pages/api/assistant/trip.ts

@@ -1,5 +1,4 @@
 import { errorResultAsJson, tryResult } from '@atb/modules/api-server';
-import { getAllTransportModesFromFilterOptions } from '@atb/modules/transport-mode';
 import {
   fetchFromToTripQuery,
   type TripApiReturnType,
@@ -24,9 +23,7 @@ export default handlerWithAssistantClient<TripApiReturnType>({
     }
 
     const journeyPlannerTransportModes =
-      await getAllTransportModesFromFilterOptions(
-        tripQuery.transportModeFilter,
-      ).then(mapToJourneyPlannerTransportModes);
+      await mapToJourneyPlannerTransportModes(tripQuery.transportModeFilter);
 
     return tryResult(req, res, async () => {
       const result = await client.trip({

src/utils/env.ts

@@ -19,6 +19,7 @@ export const getServiceUrl = (
   serviceKey: string,
   required: boolean = false,
 ): string => {
+  console.log('Getting service URL for env', getEnv());
   if (getEnv() === 'dev') return API_BASE_URL ?? '';
   // Don't use internal services in Vercel for preview branches
   if (process.env.VERCEL === '1') return API_BASE_URL ?? '';