Merge branch 'print-trip-heading-attribute' of https://github.com/nikkisato/otp-ui into pr/910

Author: amy-corson-ibigroup

.github/workflows/node-ci.yml

@@ -19,6 +19,8 @@ jobs:
         run: pnpm run lint:js
       - name: Lint styles
         run: pnpm run lint:styles
+      - name: Build packages
+        run: pnpm run build:cjs && pnpm run build:esm
       - name: i18n check (en-US, fr only)
         run: pnpm run check:i18n-en-fr
       - name: Type check

package.json

@@ -103,12 +103,11 @@
     "check:i18n-all": "node packages/scripts/lib/run-validate-i18n.js packages/**/src packages/**/i18n",
     "check:i18n-en-fr": "node packages/scripts/lib/run-validate-i18n.js packages/**/src packages/**/i18n/en-US.yml packages/**/i18n/fr.yml",
     "clean": "git clean -Xdf",
-    "prepublish": "pnpm build:cjs && pnpm build:esm",
+    "prepublish": "pnpm typescript && pnpm build:cjs && pnpm build:esm",
     "check-eslint-config": "eslint --print-config jestconfig.js | eslint-config-prettier-check",
     "coverage": "jest --coverage",
     "deploy-storybook": "storybook-to-ghpages",
     "dev": "storybook dev -p 5555",
-    "postinstall": "pnpm prepublish",
     "build-storybook": "storybook build",
     "lint:js": "eslint . --ext .js,.jsx,.ts,.tsx --ignore-pattern esm --ignore-pattern lib --ignore-pattern node_modules --ignore-pattern storybook-static --quiet",
     "lint:graphql": "eslint . --ext .graphql --ignore-pattern esm --ignore-pattern lib --ignore-pattern node_modules --ignore-pattern storybook-static",

packages/core-utils/README.md

@@ -7,5 +7,6 @@ This package depends on the [date-fns library](https://date-fns.org), which reli
 ## Usage
 
 ```
+
 TBD
 ```

packages/core-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentripplanner/core-utils",
-  "version": "14.3.1",
+  "version": "14.3.3",
   "description": "Core functionality that is shared among numerous UI components",
   "engines": {
     "node": ">=13"

packages/core-utils/src/__tests__/itinerary.ts

@@ -1,8 +1,9 @@
 import { ElevationProfile } from "@opentripplanner/types";
 import {
   calculateTncFares,
+  descope,
   getCompanyFromLeg,
-  getDisplayedStopId,
+  getDisplayedStopCode,
   getElevationProfile,
   getItineraryCost,
   getLegCost,
@@ -31,6 +32,30 @@ const basePlace = {
 };
 
 describe("util > itinerary", () => {
+  describe("descope", () => {
+    it("should return the descope'd part for standard scoped strings", () => {
+      expect(descope("agency:cash")).toBe("cash");
+      expect(descope("foo:bar")).toBe("bar");
+    });
+
+    it("should return the input if it is not scoped", () => {
+      expect(descope("cash")).toBe("cash");
+      expect(descope("")).toBe("");
+    });
+
+    it("should only return the segment after the first ':'", () => {
+      expect(descope("aaaa:bbbb:cccc")).toBe("bbbb:cccc");
+      expect(descope(":value")).toBe("value");
+      expect(descope("value:")).toBe("");
+      expect(descope(":")).toBe("");
+    });
+
+    it("should handle null and undefined", () => {
+      expect(descope(null)).toBeNull();
+      expect(descope(undefined)).toBeUndefined();
+    });
+  });
+
   describe("getElevationProfile", () => {
     it("should work with REST legacy data and GraphQL elevationProfile", () => {
       const legacyOutput = getElevationProfile(
@@ -89,47 +114,35 @@ describe("util > itinerary", () => {
     });
   });
 
-  describe("getDisplayedStopId", () => {
+  describe("getDisplayedStopCode", () => {
     it("should return the stop code if one is provided", () => {
       const place = {
         ...basePlace,
         stopCode: "code123",
         stopId: "xagency:id123"
       };
-      expect(getDisplayedStopId(place)).toEqual("code123");
+      expect(getDisplayedStopCode(place)).toEqual("code123");
       const stop = {
         ...basePlace,
         code: "code123",
         id: "xagency:id123"
       };
-      expect(getDisplayedStopId(stop)).toEqual("code123");
+      expect(getDisplayedStopCode(stop)).toEqual("code123");
     });
-    it("should return the id part of stopId it contains and agencyId (and no stopCode is provided)", () => {
+    it("should return undefined if id is present and no stopCode is provided", () => {
       const place = {
         ...basePlace,
         stopId: "xagency:id123"
       };
-      expect(getDisplayedStopId(place)).toEqual("id123");
+      expect(getDisplayedStopCode(place)).toBeFalsy();
       const stop = {
         ...basePlace,
         id: "xagency:id123"
       };
-      expect(getDisplayedStopId(stop)).toEqual("id123");
-    });
-    it("should return the whole stopId it does not contain an agency part (and no stopCode is provided)", () => {
-      const place = {
-        ...basePlace,
-        stopId: "wholeid123"
-      };
-      expect(getDisplayedStopId(place)).toEqual("wholeid123");
-      const stop = {
-        ...basePlace,
-        stopId: "wholeid123"
-      };
-      expect(getDisplayedStopId(stop)).toEqual("wholeid123");
+      expect(getDisplayedStopCode(stop)).toBeFalsy();
     });
-    it("should return null if stopId is null (and no stopCode is provided)", () => {
-      expect(getDisplayedStopId(basePlace)).toBeFalsy();
+    it("should return undefined if stopId is null (and no stopCode is provided)", () => {
+      expect(getDisplayedStopCode(basePlace)).toBeFalsy();
     });
   });
 

packages/core-utils/src/itinerary.ts

@@ -595,28 +595,31 @@ export function calculateEmissions(
 }
 
 /**
- * Returns the user-facing stop id to display for a stop or place, using the following priority:
- * 1. stop code,
- * 2. stop id without the agency id portion, if stop id contains an agency portion,
- * 3. stop id, whether null or not (this is the fallback case).
+ * Returns the user-facing stop code to display for a stop or place
  */
-export function getDisplayedStopId(placeOrStop: Place | Stop): string {
-  let stopId;
-  let stopCode;
+export function getDisplayedStopCode(
+  placeOrStop: Place | Stop
+): string | undefined {
   if ("stopId" in placeOrStop) {
-    ({ stopCode, stopId } = placeOrStop);
-  } else if ("id" in placeOrStop) {
-    ({ code: stopCode, id: stopId } = placeOrStop);
+    return placeOrStop.stopCode ?? undefined;
   }
-  return stopCode || stopId?.split(":")[1] || stopId;
+  if ("id" in placeOrStop) {
+    return placeOrStop.code ?? undefined;
+  }
+  return undefined;
 }
 
 /**
  * Removes the first part of the OTP standard scope (":"), if it is present
+ * If it's null or undefined, return the original value.
  * @param item String that is potentially scoped with `:` character
  * @returns    descoped string
  */
-export const descope = (item: string): string => item?.split(":")?.[1];
+export const descope = (item?: string | null): string | null | undefined => {
+  if (!item) return item;
+  const index = item.indexOf(":");
+  return index === -1 ? item : item.substring(index + 1);
+};
 
 export type ExtendedMoney = Money & { originalAmount?: number };
 
@@ -638,8 +641,8 @@ export const zeroDollars = (currency: Currency): Money => ({
  */
 export function getLegCost(
   leg: Leg,
-  mediumId: string | null,
-  riderCategoryId: string | null,
+  mediumId?: string | null,
+  riderCategoryId?: string | null,
   seenFareIds?: string[]
 ): {
   alternateFareProducts?: AppliedFareProduct[];
@@ -662,6 +665,7 @@ export function getLegCost(
 
       const productMediaId =
         descope(product?.medium?.id) || product?.medium?.id || null;
+
       return (
         productRiderCategoryId === riderCategoryId &&
         productMediaId === mediumId &&
@@ -709,8 +713,8 @@ export function getLegCost(
  */
 export function getItineraryCost(
   legs: Leg[],
-  mediumId: string | string[] | null,
-  riderCategoryId: string | string[] | null
+  mediumId?: string | string[] | null,
+  riderCategoryId?: string | string[] | null
 ): Money | undefined {
   // TODO: Better input type handling
   if (Array.isArray(mediumId) || Array.isArray(riderCategoryId)) {
@@ -772,7 +776,7 @@ export function getItineraryCost(
   );
 }
 
-const pickupDropoffTypeToOtp1 = otp2Type => {
+const pickupDropoffTypeToOtp1 = (otp2Type: string): string | null => {
   switch (otp2Type) {
     case "COORDINATE_WITH_DRIVER":
       return "coordinateWithDriver";

packages/geocoder/README.md

@@ -1,5 +1,6 @@
 ## Usage
 
 ```
+
 TBD
 ```

packages/geocoder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentripplanner/geocoder",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Geocoding tools for multiple geocoding providers",
   "main": "lib/index.js",
   "module": "esm/index.js",

packages/icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentripplanner/icons",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "Icons for otp-ui",
   "main": "lib/index.js",
   "module": "esm/index.js",

packages/icons/src/trimet-leg-icon.jsx

@@ -8,7 +8,7 @@ import BiketownIcon from "./companies/biketown-icon";
 const { getLegRouteLongName } = coreUtils.itinerary;
 
 const TriMetLegIcon = ({ leg, ...props }) => {
-  // Custom TriMet icon logic.
+  // Custom TriMet icon logic
   const routeLongName = getLegRouteLongName(leg);
   if (routeLongName && routeLongName.startsWith("Portland Streetcar")) {
     return <TriMetModeIcon mode="STREETCAR" {...props} />;