From 3fa8ea115a1ad604befe44ef11b8983cdf2268ec Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Fri, 30 Jun 2023 16:18:56 -0700 Subject: [PATCH 01/19] deps: upgrade core utils --- package.json | 2 +- yarn.lock | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c6e17a6f9..1ba0e168f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@bugsnag/js": "^7.17.0", "@bugsnag/plugin-react": "^7.17.0", "@opentripplanner/base-map": "^3.0.13", - "@opentripplanner/core-utils": "^9.0.0-alpha.34", + "@opentripplanner/core-utils": "^9.0.0-alpha.35", "@opentripplanner/endpoints-overlay": "^2.0.7", "@opentripplanner/from-to-location-picker": "^2.1.7", "@opentripplanner/geocoder": "^1.4.1", diff --git a/yarn.lock b/yarn.lock index 9378bba5f..08277fc9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2413,7 +2413,7 @@ lodash.isequal "^4.5.0" qs "^6.9.1" -"@opentripplanner/core-utils@^9.0.0-alpha.33", "@opentripplanner/core-utils@^9.0.0-alpha.34": +"@opentripplanner/core-utils@^9.0.0-alpha.33": version "9.0.0-alpha.34" resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.0-alpha.34.tgz#63075efb6dd1bf8ba05e27b087c89d3f56827b22" integrity sha512-jELEvn3diXd149ueIiBO0XxoZerl2+r3d31yZV7teao9yKcjOcTAnLph/FYj/3WdHTBi4iPBOZurgWJDpauL1g== @@ -2432,6 +2432,25 @@ lodash.isequal "^4.5.0" qs "^6.9.1" +"@opentripplanner/core-utils@^9.0.0-alpha.35": + version "9.0.0-alpha.35" + resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.0-alpha.35.tgz#01088543813f9b753aa1f2df46913e63521339a2" + integrity sha512-dD0UczbLVxZCJPQnNbNL4h3Z/biKWaPfybMdF576w8mRZpEkvPQbmMZFvqb40B/Que8bU7Z0Wy9XW9lhHybcWg== + dependencies: + "@conveyal/lonlat" "^1.4.1" + "@mapbox/polyline" "^1.1.0" + "@opentripplanner/geocoder" "^1.4.0" + "@styled-icons/foundation" "^10.34.0" + "@turf/along" "^6.0.1" + bowser "^2.7.0" + chroma-js "^2.4.2" + date-fns "^2.28.0" + date-fns-tz "^1.2.2" + graphql "^16.6.0" + lodash.clonedeep "^4.5.0" + lodash.isequal "^4.5.0" + qs "^6.9.1" + "@opentripplanner/endpoints-overlay@^2.0.7": version "2.0.7" resolved "https://registry.yarnpkg.com/@opentripplanner/endpoints-overlay/-/endpoints-overlay-2.0.7.tgz#7f31c69728ec8148a94100e5d645a538151bd4b2" From 044d257b6f26680349c5598a48f8c2e23a04f20b Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Fri, 14 Jul 2023 14:07:15 -0700 Subject: [PATCH 02/19] update to non alpha --- yarn.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/yarn.lock b/yarn.lock index 08277fc9f..c4eb1b4af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2413,10 +2413,10 @@ lodash.isequal "^4.5.0" qs "^6.9.1" -"@opentripplanner/core-utils@^9.0.0-alpha.33": - version "9.0.0-alpha.34" - resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.0-alpha.34.tgz#63075efb6dd1bf8ba05e27b087c89d3f56827b22" - integrity sha512-jELEvn3diXd149ueIiBO0XxoZerl2+r3d31yZV7teao9yKcjOcTAnLph/FYj/3WdHTBi4iPBOZurgWJDpauL1g== +"@opentripplanner/core-utils@^9.0.0-alpha.35": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.0.tgz#8f9d2b581ef937a99ef54c410661fa9a4c871eda" + integrity sha512-+3ezqmtlKojQVV7aku3EjvxFjuWEKeZxriyvLuNvGn4BFqr61MFKzLB5aDTh1AYRtfax0p2n64sUQ6BuvSBCKQ== dependencies: "@conveyal/lonlat" "^1.4.1" "@mapbox/polyline" "^1.1.0" @@ -2432,10 +2432,10 @@ lodash.isequal "^4.5.0" qs "^6.9.1" -"@opentripplanner/core-utils@^9.0.0-alpha.35": - version "9.0.0-alpha.35" - resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.0-alpha.35.tgz#01088543813f9b753aa1f2df46913e63521339a2" - integrity sha512-dD0UczbLVxZCJPQnNbNL4h3Z/biKWaPfybMdF576w8mRZpEkvPQbmMZFvqb40B/Que8bU7Z0Wy9XW9lhHybcWg== +"@opentripplanner/core-utils@^9.0.0-alpha.36": + version "9.0.0-alpha.37" + resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.0-alpha.37.tgz#6172dc3ae917363d97b1ba661de3feb86bb197e5" + integrity sha512-khL6tOVniB9lEahcCcQ5PpaJ7JxJxL0qaITroFtKCN+fK4CUaKH7KTGvc33xX6K+u/VueJUuuPHvGkokBDLK+A== dependencies: "@conveyal/lonlat" "^1.4.1" "@mapbox/polyline" "^1.1.0" @@ -2678,11 +2678,11 @@ lodash.isequal "^4.5.0" "@opentripplanner/trip-details@^5.0.0-alpha.6": - version "5.0.0-alpha.6" - resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.0-alpha.6.tgz#3c9d3716e6fc6f42718ce14ca1c5f724fb965f3f" - integrity sha512-nQRL1gda0o6+x76PoKY9n5I3LtAwjoMpSzg5dNP6xF/bGGUCfwFp7aQxmQhOFIi7R9NStdts1d8ubzdqqsSJBQ== + version "5.0.0" + resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.0.tgz#9b422e2eba3b63f6a9bde2bb457220459da7f866" + integrity sha512-RHOsaDVBpRHPRBaladU7oIi6UwDSvYzER57j2RfmmGHriwPdp1yOJZXH6qT3NtlRpeERtVkF5/ZzAHYzF90UUQ== dependencies: - "@opentripplanner/core-utils" "^9.0.0-alpha.33" + "@opentripplanner/core-utils" "^9.0.0-alpha.36" "@styled-icons/fa-solid" "^10.34.0" flat "^5.0.2" react-animate-height "^3.0.4" @@ -2713,9 +2713,9 @@ "@opentripplanner/core-utils" "^8.2.1" "@opentripplanner/types@^6.0.0-alpha.8": - version "6.0.0-alpha.8" - resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.0.0-alpha.8.tgz#92a13c09b8be55ec83eba1d405bac5a791bba9d2" - integrity sha512-38YX9HJiYg/FonohTPrPdBoHV3Wff8GOgz/QgWMU7iiKdgDZvneYU3jJosuoAL3k035DCbA0NL4ngR7VyTbJmA== + version "6.0.0" + resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.0.0.tgz#3dabebd404c88030f4191f08c7692d72ca2e3c8d" + integrity sha512-mwwj2WzkdCoG2KUYaR/4I2JkcuXr1fFUJpP4nk10YbRgzyGtGLaGIdiTXNYpwgk/5//pMHQ5Qa6psWrHpqRm1A== "@opentripplanner/vehicle-rental-overlay@^2.1.1": version "2.1.1" From d3da7b53c125976e6f3723bedc8c409dbd2bb92f Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Mon, 17 Jul 2023 12:47:29 -0700 Subject: [PATCH 03/19] deps: upate core utils --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ba0e168f..db46d1b6f 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@bugsnag/js": "^7.17.0", "@bugsnag/plugin-react": "^7.17.0", "@opentripplanner/base-map": "^3.0.13", - "@opentripplanner/core-utils": "^9.0.0-alpha.35", + "@opentripplanner/core-utils": "^9.0.1", "@opentripplanner/endpoints-overlay": "^2.0.7", "@opentripplanner/from-to-location-picker": "^2.1.7", "@opentripplanner/geocoder": "^1.4.1", From 43dbdbd1cca48bbb055547e3275bd12ead52d6a3 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Mon, 17 Jul 2023 16:20:58 -0700 Subject: [PATCH 04/19] feat: update for new fares --- example-config.yml | 2 +- .../narrative/default/default-itinerary.js | 17 +++--- .../narrative/metro/metro-itinerary.tsx | 55 +++++++++---------- lib/util/state.js | 25 ++++++--- package.json | 4 +- yarn.lock | 47 ++++++++++++++-- 6 files changed, 97 insertions(+), 53 deletions(-) diff --git a/example-config.yml b/example-config.yml index 7e1a771a2..b256d8085 100644 --- a/example-config.yml +++ b/example-config.yml @@ -318,7 +318,7 @@ itinerary: # electronicRegular: "SmartCard Fare" # student: "Student Fare" # One fare will always be shown by default - #defaultFareKey: electronicRegular + defaultFareType: { mediumId: null, riderCategoryId: null } # The following settings must be set to these values to use the new # "Metro" UI. The settings can be used without the Metro UI, but diff --git a/lib/components/narrative/default/default-itinerary.js b/lib/components/narrative/default/default-itinerary.js index ce1f684db..d25d37705 100644 --- a/lib/components/narrative/default/default-itinerary.js +++ b/lib/components/narrative/default/default-itinerary.js @@ -115,20 +115,19 @@ const ITINERARY_ATTRIBUTES = [ { id: 'cost', order: 2, - render: (itinerary, options, defaultFareKey = 'regular') => { - const fareInCents = getTotalFare( - itinerary, - options.configCosts, - defaultFareKey + render: (itinerary, options, defaultFareType = {}) => { + const fare = getTotalFare(itinerary, options.configCosts, defaultFareType) + const { currency } = coreUtils.itinerary.getItineraryCost( + itinerary.legs, + defaultFareType.mediumId, + defaultFareType.riderCategoryId ) - const fareCurrency = itinerary.fare?.fare?.regular?.currency?.currencyCode - const fare = fareInCents === null ? null : fareInCents / 100 - if (fare === null || fare < 0) + if (fare === null || fare === undefined || fare < 0) return return ( - - {transitFare === null || transitFare < 0 ? ( - - ) : ( - // TODO: re-implement TNC fares for metro UI? - - )} - + { + // Hide the fare information entirely if the defaultFareType isn't specified. + defaultFareType && ( + + {transitFare === null || + transitFare === undefined || + transitFare < 0 ? ( + + ) : ( + // TODO: re-implement TNC fares for metro UI? + + )} + + ) + } { arrivesAt: state.otp.filter.sort.type === 'ARRIVALTIME', co2Config: state.otp.config.co2, configCosts: state.otp.config.itinerary?.costs, - // The configured (ambient) currency is needed for rendering the cost - // of itineraries whether they include a fare or not, in which case - // we show $0.00 or its equivalent in the configured currency and selected locale. - currency: state.otp.config.localization?.currency || 'USD', - defaultFareKey: state.otp.config.itinerary?.defaultFareKey, + defaultFareType: state.otp.config.itinerary?.defaultFareType, enableDot: !state.otp.config.itinerary?.disableMetroSeperatorDot, // @ts-expect-error TODO: type activeSearch pending: activeSearch ? Boolean(activeSearch.pending) : false, diff --git a/lib/util/state.js b/lib/util/state.js index 83a29c4ae..4398ec916 100644 --- a/lib/util/state.js +++ b/lib/util/state.js @@ -45,16 +45,22 @@ function getDriveTime(itinerary) { /** * Parses OTP itinerary fare object and returns fares along with overridden currency */ -export function getFare(itinerary, defaultFareKey, currency) { +export function getFare(itinerary, defaultFareType) { const { maxTNCFare, minTNCFare } = coreUtils.itinerary.calculateTncFares(itinerary) - const transitFares = itinerary.fare?.fare - const transitFare = - (transitFares?.[defaultFareKey] || transitFares?.regular)?.cents || null - const fareCurrency = transitFare?.currency?.symbol || currency + const itineraryCost = coreUtils.itinerary.getItineraryCost( + itinerary?.legs, + defaultFareType?.mediumId || null, + defaultFareType?.riderCategoryId || null + ) - return { fareCurrency, maxTNCFare, minTNCFare, transitFare } + return { + fareCurrency: itineraryCost?.currency.code, + maxTNCFare, + minTNCFare, + transitFare: itineraryCost?.amount + } } /** @@ -78,10 +84,13 @@ const DEFAULT_COSTS = { export function getTotalFare( itinerary, configCosts = {}, - defaultFareKey = 'regular' + defaultFareType = { mediumId: null, riderCategoryId: null } ) { // Get TNC fares. - const { maxTNCFare, transitFare } = getFare(itinerary, defaultFareKey) + const { fareCurrency, maxTNCFare, transitFare } = getFare( + itinerary, + defaultFareType + ) // Start with default cost values. const costs = DEFAULT_COSTS // If config contains values to override defaults, apply those. diff --git a/package.json b/package.json index db46d1b6f..cb8f6e4d9 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,13 @@ "@bugsnag/js": "^7.17.0", "@bugsnag/plugin-react": "^7.17.0", "@opentripplanner/base-map": "^3.0.13", - "@opentripplanner/core-utils": "^9.0.1", + "@opentripplanner/core-utils": "^10.0.0-alpha.2", "@opentripplanner/endpoints-overlay": "^2.0.7", "@opentripplanner/from-to-location-picker": "^2.1.7", "@opentripplanner/geocoder": "^1.4.1", "@opentripplanner/humanize-distance": "^1.2.0", "@opentripplanner/icons": "^2.0.3", - "@opentripplanner/itinerary-body": "^4.2.0-alpha.3", + "@opentripplanner/itinerary-body": "^5.0.1", "@opentripplanner/location-field": "^2.0.4", "@opentripplanner/location-icon": "^1.4.1", "@opentripplanner/map-popup": "^2.0.4", diff --git a/yarn.lock b/yarn.lock index c4eb1b4af..6ee98bdaa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2394,6 +2394,25 @@ maplibre-gl "^2.1.9" react-map-gl "^7.0.15" +"@opentripplanner/core-utils@^10.0.0-alpha.2": + version "10.0.0-alpha.2" + resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-10.0.0-alpha.2.tgz#42f14c1c44fdf7eee0652c53023f56461447a898" + integrity sha512-R6Nc34qYEOcYOx5lyGnpnwW7pPQHjypP+Qq5gJ5xB0mkx6ZnaTrCbRXBISc+/+/OR7/PrhOp1PqWktckWkVBng== + dependencies: + "@conveyal/lonlat" "^1.4.1" + "@mapbox/polyline" "^1.1.0" + "@opentripplanner/geocoder" "^1.4.1" + "@styled-icons/foundation" "^10.34.0" + "@turf/along" "^6.0.1" + bowser "^2.7.0" + chroma-js "^2.4.2" + date-fns "^2.28.0" + date-fns-tz "^1.2.2" + graphql "^16.6.0" + lodash.clonedeep "^4.5.0" + lodash.isequal "^4.5.0" + qs "^6.9.1" + "@opentripplanner/core-utils@^8.1.1", "@opentripplanner/core-utils@^8.2.1": version "8.3.2" resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-8.3.2.tgz#5095dd3ae8493e478b3f599353c6804b35f1e1dd" @@ -2413,14 +2432,14 @@ lodash.isequal "^4.5.0" qs "^6.9.1" -"@opentripplanner/core-utils@^9.0.0-alpha.35": - version "9.0.0" - resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.0.tgz#8f9d2b581ef937a99ef54c410661fa9a4c871eda" - integrity sha512-+3ezqmtlKojQVV7aku3EjvxFjuWEKeZxriyvLuNvGn4BFqr61MFKzLB5aDTh1AYRtfax0p2n64sUQ6BuvSBCKQ== +"@opentripplanner/core-utils@^9.0.0": + version "9.0.1" + resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.1.tgz#c2311aba760cb055d4271f3edc59dea887bac090" + integrity sha512-XFju+JXPmO9A2LyPs6Sg9en0hbLRp/xq6Ob3qQGhrjFvGIYmvWjsmGREKisLZcA+KKMLCCFAULXcBty0CEXgrQ== dependencies: "@conveyal/lonlat" "^1.4.1" "@mapbox/polyline" "^1.1.0" - "@opentripplanner/geocoder" "^1.4.0" + "@opentripplanner/geocoder" "^1.4.1" "@styled-icons/foundation" "^10.34.0" "@turf/along" "^6.0.1" bowser "^2.7.0" @@ -2547,6 +2566,24 @@ react-resize-detector "^4.2.1" string-similarity "^4.0.4" +"@opentripplanner/itinerary-body@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-5.0.1.tgz#2a28f38f29ccf0103d8d7f3631fbffa2d901c83b" + integrity sha512-zBfqe6BOBT5q9S67avooCPx8GkUvSwVRmhD4JQNmgQYs+DELEwaLZFuDe5nzKLW1ir4Rtnld2NZUAv5vaT6jvw== + dependencies: + "@opentripplanner/core-utils" "^9.0.0" + "@opentripplanner/humanize-distance" "^1.2.0" + "@opentripplanner/icons" "^2.0.3" + "@opentripplanner/location-icon" "^1.4.1" + "@styled-icons/fa-solid" "^10.34.0" + "@styled-icons/foundation" "^10.34.0" + date-fns "^2.28.0" + date-fns-tz "^1.2.2" + flat "^5.0.2" + react-animate-height "^3.0.4" + react-resize-detector "^4.2.1" + string-similarity "^4.0.4" + "@opentripplanner/location-field@^2.0.4": version "2.0.4" resolved "https://registry.yarnpkg.com/@opentripplanner/location-field/-/location-field-2.0.4.tgz#67a4ae7bbfa6d557096f0f0913fe47d2dd81eeb4" From 1bf1a34a7d3db9644d275150ae14fb9077d74b82 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Mon, 17 Jul 2023 16:30:19 -0700 Subject: [PATCH 05/19] fix some type errors --- lib/components/narrative/line-itin/itin-summary.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/components/narrative/line-itin/itin-summary.tsx b/lib/components/narrative/line-itin/itin-summary.tsx index f941e5945..079990c46 100644 --- a/lib/components/narrative/line-itin/itin-summary.tsx +++ b/lib/components/narrative/line-itin/itin-summary.tsx @@ -90,17 +90,16 @@ export class ItinerarySummary extends Component { } render(): JSX.Element { - const { currency, defaultFareKey, itinerary } = this.props + const { defaultFareKey, itinerary } = this.props const { LegIcon } = this.context const { fareCurrency, maxTNCFare, minTNCFare, transitFare } = getFare( itinerary, - defaultFareKey, - currency + defaultFareKey ) - const minTotalFare = minTNCFare * 100 + transitFare - const maxTotalFare = maxTNCFare * 100 + transitFare + const minTotalFare = minTNCFare * 100 + (transitFare || 0) + const maxTotalFare = maxTNCFare * 100 + (transitFare || 0) const { endTime, startTime } = itinerary From 599c075eb643891588b8df133b0c14434ac01eea Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Mon, 17 Jul 2023 16:30:42 -0700 Subject: [PATCH 06/19] remove unneeded currency prop --- lib/components/narrative/line-itin/itin-summary.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/components/narrative/line-itin/itin-summary.tsx b/lib/components/narrative/line-itin/itin-summary.tsx index 079990c46..b2c382e5d 100644 --- a/lib/components/narrative/line-itin/itin-summary.tsx +++ b/lib/components/narrative/line-itin/itin-summary.tsx @@ -238,7 +238,6 @@ function getRouteColorForBadge(leg: Leg): string { const mapStateToProps = (state: any) => { return { - currency: state.otp.config.localization?.currency || 'USD', defaultFareKey: state.otp.config.itinerary?.defaultFareKey } } From 4f1801350466a1f2e92dca8a82e75255e5e335bb Mon Sep 17 00:00:00 2001 From: miles-grant-ibigroup Date: Tue, 18 Jul 2023 15:00:46 -0400 Subject: [PATCH 07/19] chore(percy): repair --- percy/percy.test.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/percy/percy.test.js b/percy/percy.test.js index 4e866d454..48a58e879 100644 --- a/percy/percy.test.js +++ b/percy/percy.test.js @@ -272,7 +272,7 @@ test('OTP-RR', async () => { // Plan a trip await page.goto( - `http://localhost:${MOCK_SERVER_PORT}/#/?ui_activeSearch=5rzujqghc&ui_activeItinerary=0&fromPlace=Opus Music Store%2C Decatur%2C GA%3A%3A33.77505%2C-84.300178&toPlace=Five Points Station (MARTA Stop ID 908981)%3A%3A33.753837%2C-84.391397&date=2023-04-28&time=09%3A58&arriveBy=false&mode=WALK%2CBUS%2CSUBWAY%2CTRAM%2CFLEX_EGRESS%2CFLEX_ACCESS%2CFLEX_DIRECT&showIntermediateStops=true&maxWalkDistance=1207&optimize=QUICK&walkSpeed=1.34&ignoreRealtimeUpdates=true&wheelchair=true&numItineraries=3&otherThanPreferredRoutesPenalty=900` + `http://localhost:${MOCK_SERVER_PORT}/#/?ui_activeSearch=5rzujqghc&ui_activeItinerary=0&fromPlace=Opus Music Store%2C Decatur%2C GA%3A%3A33.77505%2C-84.300178&toPlace=Five Points Station (MARTA Stop ID 908981)%3A%3A33.753837%2C-84.391397&date=2023-07-28&time=09%3A58&arriveBy=false&mode=WALK%2CBUS%2CSUBWAY%2CTRAM%2CFLEX_EGRESS%2CFLEX_ACCESS%2CFLEX_DIRECT&showIntermediateStops=true&maxWalkDistance=1207&optimize=QUICK&walkSpeed=1.34&ignoreRealtimeUpdates=true&wheelchair=true&numItineraries=3&otherThanPreferredRoutesPenalty=900` ) await page.waitForNavigation({ waitUntil: 'networkidle2' }) await page.waitForSelector('.option.metro-itin') @@ -337,9 +337,7 @@ test('OTP-RR', async () => { // Open Trip Viewer await page.waitForTimeout(2000) - const [tripViewerButton] = await page.$x( - "//button[contains(., 'Trip Viewer')]" - ) + const [tripViewerButton] = await page.$x("//a[contains(., 'Trip Viewer')]") // If the trip viewer button didn't appear, perhaps we need to click the itinerary again if (!tripViewerButton) { From 47ca0e62a942a5a70156c316a554e337fb1fd111 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Tue, 18 Jul 2023 12:27:52 -0700 Subject: [PATCH 08/19] i18n: fix missing i18n label --- i18n/en-US.yml | 1 + i18n/i18n-exceptions.json | 3 --- lib/components/narrative/default/default-itinerary.js | 4 +++- lib/components/narrative/metro/metro-itinerary.tsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/i18n/en-US.yml b/i18n/en-US.yml index 6de6da15c..359d6c5ec 100644 --- a/i18n/en-US.yml +++ b/i18n/en-US.yml @@ -102,6 +102,7 @@ common: "yes": "Yes" itineraryDescriptions: calories: "{calories, number} Cal" + fareUnknown: No fare information. noItineraryToDisplay: No itinerary to display. relativeCo2: | {co2} {isMore, select, true {more} other {less} } CO₂ than driving alone diff --git a/i18n/i18n-exceptions.json b/i18n/i18n-exceptions.json index 71455f432..db534b0e4 100644 --- a/i18n/i18n-exceptions.json +++ b/i18n/i18n-exceptions.json @@ -1,7 +1,4 @@ { - "ignoredIds": [ - "otpUi.TripDetails.transitFareUnknown" - ], "groups": { "components.OTP2ErrorRenderer.*.body": [ "LOCATION_NOT_FOUND", diff --git a/lib/components/narrative/default/default-itinerary.js b/lib/components/narrative/default/default-itinerary.js index d25d37705..2d44e64b6 100644 --- a/lib/components/narrative/default/default-itinerary.js +++ b/lib/components/narrative/default/default-itinerary.js @@ -123,7 +123,9 @@ const ITINERARY_ATTRIBUTES = [ defaultFareType.riderCategoryId ) if (fare === null || fare === undefined || fare < 0) - return + return ( + + ) return ( + ) : ( // TODO: re-implement TNC fares for metro UI? Date: Tue, 18 Jul 2023 16:20:38 -0400 Subject: [PATCH 09/19] chore(lang): correct strings --- i18n/en-US.yml | 2 +- i18n/fr.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n/en-US.yml b/i18n/en-US.yml index 359d6c5ec..8aad1bcab 100644 --- a/i18n/en-US.yml +++ b/i18n/en-US.yml @@ -102,7 +102,7 @@ common: "yes": "Yes" itineraryDescriptions: calories: "{calories, number} Cal" - fareUnknown: No fare information. + fareUnknown: No fare information noItineraryToDisplay: No itinerary to display. relativeCo2: | {co2} {isMore, select, true {more} other {less} } CO₂ than driving alone diff --git a/i18n/fr.yml b/i18n/fr.yml index 2b7204081..8115c09cf 100644 --- a/i18n/fr.yml +++ b/i18n/fr.yml @@ -109,6 +109,7 @@ common: "yes": Oui itineraryDescriptions: calories: "{calories, number} kcal" + fareUnknown: TODO TRANSLATE noItineraryToDisplay: Aucun trajet à afficher. relativeCo2: | {co2} de CO₂ en {isMore, select, true {plus} other {moins} } qu'en voiture From 2f59875e282aed67a957b620256e689539c2151c Mon Sep 17 00:00:00 2001 From: Daniel Heppner <92878779+daniel-heppner-ibigroup@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:46:56 -0700 Subject: [PATCH 10/19] Update i18n/fr.yml Co-authored-by: binh-dam-ibigroup <56846598+binh-dam-ibigroup@users.noreply.github.com> --- i18n/fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/fr.yml b/i18n/fr.yml index 8115c09cf..235f56363 100644 --- a/i18n/fr.yml +++ b/i18n/fr.yml @@ -109,7 +109,7 @@ common: "yes": Oui itineraryDescriptions: calories: "{calories, number} kcal" - fareUnknown: TODO TRANSLATE + fareUnknown: Tarif inconnu noItineraryToDisplay: Aucun trajet à afficher. relativeCo2: | {co2} de CO₂ en {isMore, select, true {plus} other {moins} } qu'en voiture From b8667d9a33425b09a170a4b6a58a5712dd303ef8 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Wed, 19 Jul 2023 14:18:16 -0700 Subject: [PATCH 11/19] remove unneeded currency setting --- example-config.yml | 5 ----- lib/components/narrative/default/default-itinerary.js | 8 +------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/example-config.yml b/example-config.yml index 217581e78..7ac9b11ff 100644 --- a/example-config.yml +++ b/example-config.yml @@ -544,11 +544,6 @@ itinerary: ### Localization section to provide language/locale settings #localization: -# # An ambient currency should be defined here (defaults to USD). -# # In some components such as DefaultItinerary, we display a cost element -# # that falls back to $0.00 (or its equivalent in the configured ambient currency -# # and in the user-selected locale) if no fare or currency info is available. -# currency: 'USD' # defaultLocale: 'en-US' ### If using OTP Middleware, you can define the optional phone number options below. diff --git a/lib/components/narrative/default/default-itinerary.js b/lib/components/narrative/default/default-itinerary.js index 2d44e64b6..11216aae9 100644 --- a/lib/components/narrative/default/default-itinerary.js +++ b/lib/components/narrative/default/default-itinerary.js @@ -129,7 +129,7 @@ const ITINERARY_ATTRIBUTES = [ return ( { state.otp.config.accessibilityScore?.gradationMap, co2Config: state.otp.config.co2, configCosts: state.otp.config.itinerary?.costs, - // The configured (ambient) currency is needed for rendering the cost - // of itineraries whether they include a fare or not, in which case - // we show $0.00 or its equivalent in the configured currency and selected locale. - currency: state.otp.config.localization?.currency || 'USD', defaultFareKey: state.otp.config.itinerary?.defaultFareKey } } From db622d35ac2ccd659ea8ceef62cbf0dea2b1de41 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Wed, 19 Jul 2023 15:16:12 -0700 Subject: [PATCH 12/19] rename fareKey to fareType --- lib/components/narrative/default/default-itinerary.js | 11 +++++++---- lib/util/state.js | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/components/narrative/default/default-itinerary.js b/lib/components/narrative/default/default-itinerary.js index 11216aae9..844d321e5 100644 --- a/lib/components/narrative/default/default-itinerary.js +++ b/lib/components/narrative/default/default-itinerary.js @@ -115,7 +115,7 @@ const ITINERARY_ATTRIBUTES = [ { id: 'cost', order: 2, - render: (itinerary, options, defaultFareType = {}) => { + render: (itinerary, options, defaultFareType) => { const fare = getTotalFare(itinerary, options.configCosts, defaultFareType) const { currency } = coreUtils.itinerary.getItineraryCost( itinerary.legs, @@ -242,7 +242,7 @@ class DefaultItinerary extends NarrativeItinerary { active, co2Config, configCosts, - defaultFareKey, + defaultFareType, expanded, intl, itinerary, @@ -285,7 +285,7 @@ class DefaultItinerary extends NarrativeItinerary { return attribute.render( itinerary, itineraryAttributeOptions, - defaultFareKey + defaultFareType ) } @@ -390,7 +390,10 @@ const mapStateToProps = (state, ownProps) => { state.otp.config.accessibilityScore?.gradationMap, co2Config: state.otp.config.co2, configCosts: state.otp.config.itinerary?.costs, - defaultFareKey: state.otp.config.itinerary?.defaultFareKey + defaultFareType: state.otp.config.itinerary?.defaultFareType || { + mediumId: null, + riderCategoryId: null + } } } diff --git a/lib/util/state.js b/lib/util/state.js index 4398ec916..1d2f35f15 100644 --- a/lib/util/state.js +++ b/lib/util/state.js @@ -155,7 +155,7 @@ function calculateItineraryCost(itinerary, config = {}) { getTotalFare( itinerary, config.itinerary?.costs, - config.itinerary?.defaultFareKey + config.itinerary?.defaultFareType ) * weights.fareFactor + itinerary.duration * weights.durationFactor + From 1d806f9258036f59a1281f9f6ca2170dd568f8e5 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Wed, 19 Jul 2023 15:21:26 -0700 Subject: [PATCH 13/19] address PR feedback --- lib/components/narrative/default/default-itinerary.js | 10 ++++++---- lib/components/narrative/line-itin/itin-summary.tsx | 8 ++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/components/narrative/default/default-itinerary.js b/lib/components/narrative/default/default-itinerary.js index 844d321e5..4429df28e 100644 --- a/lib/components/narrative/default/default-itinerary.js +++ b/lib/components/narrative/default/default-itinerary.js @@ -117,15 +117,17 @@ const ITINERARY_ATTRIBUTES = [ order: 2, render: (itinerary, options, defaultFareType) => { const fare = getTotalFare(itinerary, options.configCosts, defaultFareType) + if (fare === null || fare === undefined || fare < 0) { + return ( + + ) + } + const { currency } = coreUtils.itinerary.getItineraryCost( itinerary.legs, defaultFareType.mediumId, defaultFareType.riderCategoryId ) - if (fare === null || fare === undefined || fare < 0) - return ( - - ) return ( ` type Props = { currency?: string - defaultFareKey: string + defaultFareType: string itinerary: Itinerary onClick: () => void } @@ -90,12 +90,12 @@ export class ItinerarySummary extends Component { } render(): JSX.Element { - const { defaultFareKey, itinerary } = this.props + const { defaultFareType, itinerary } = this.props const { LegIcon } = this.context const { fareCurrency, maxTNCFare, minTNCFare, transitFare } = getFare( itinerary, - defaultFareKey + defaultFareType ) const minTotalFare = minTNCFare * 100 + (transitFare || 0) @@ -238,7 +238,7 @@ function getRouteColorForBadge(leg: Leg): string { const mapStateToProps = (state: any) => { return { - defaultFareKey: state.otp.config.itinerary?.defaultFareKey + defaultFareType: state.otp.config.itinerary?.defaultFareType } } From f390f45f411b16d032fc60a045a66e1fb0043d41 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Wed, 19 Jul 2023 16:20:14 -0700 Subject: [PATCH 14/19] remove filter on defaultFareType --- .../narrative/metro/metro-itinerary.tsx | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/lib/components/narrative/metro/metro-itinerary.tsx b/lib/components/narrative/metro/metro-itinerary.tsx index 66fb2f881..636377e99 100644 --- a/lib/components/narrative/metro/metro-itinerary.tsx +++ b/lib/components/narrative/metro/metro-itinerary.tsx @@ -387,25 +387,23 @@ class MetroItinerary extends NarrativeItinerary { { // Hide the fare information entirely if the defaultFareType isn't specified. - defaultFareType && ( - - {transitFare === null || - transitFare === undefined || - transitFare < 0 ? ( - - ) : ( - // TODO: re-implement TNC fares for metro UI? - - )} - - ) + + {transitFare === null || + transitFare === undefined || + transitFare < 0 ? ( + + ) : ( + // TODO: re-implement TNC fares for metro UI? + + )} + } Date: Thu, 20 Jul 2023 16:10:43 -0700 Subject: [PATCH 15/19] update trip-details to version that supports null values --- .../narrative/connected-trip-details.js | 5 ++++- package.json | 2 +- yarn.lock | 20 +++++++++---------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/components/narrative/connected-trip-details.js b/lib/components/narrative/connected-trip-details.js index d8ab853c0..8affe6ef8 100644 --- a/lib/components/narrative/connected-trip-details.js +++ b/lib/components/narrative/connected-trip-details.js @@ -16,7 +16,10 @@ const mapStateToProps = (state) => { const { co2, itinerary } = state.otp.config return { co2Config: co2, - defaultFareType: itinerary?.defaultFareType || undefined, + defaultFareType: itinerary?.defaultFareType || { + mediumId: null, + riderCategoryId: null + }, displayCalories: typeof itinerary?.displayCalories === 'boolean' ? itinerary?.displayCalories diff --git a/package.json b/package.json index cb8f6e4d9..76cae1fc1 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@opentripplanner/stops-overlay": "^5.1.0", "@opentripplanner/transit-vehicle-overlay": "^4.0.4", "@opentripplanner/transitive-overlay": "^3.0.13", - "@opentripplanner/trip-details": "^5.0.0-alpha.6", + "@opentripplanner/trip-details": "^5.0.1-alpha.2", "@opentripplanner/trip-form": "^3.1.1", "@opentripplanner/trip-viewer-overlay": "^2.0.5", "@opentripplanner/vehicle-rental-overlay": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index 6ee98bdaa..737deac39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2451,14 +2451,14 @@ lodash.isequal "^4.5.0" qs "^6.9.1" -"@opentripplanner/core-utils@^9.0.0-alpha.36": - version "9.0.0-alpha.37" - resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.0-alpha.37.tgz#6172dc3ae917363d97b1ba661de3feb86bb197e5" - integrity sha512-khL6tOVniB9lEahcCcQ5PpaJ7JxJxL0qaITroFtKCN+fK4CUaKH7KTGvc33xX6K+u/VueJUuuPHvGkokBDLK+A== +"@opentripplanner/core-utils@^9.0.2": + version "9.0.2" + resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.2.tgz#a2fdce7ae99533de623f1fe9266b60068cc02f76" + integrity sha512-xNNxbInolf4V2IzR2IXiPRsnxRqRMHf9qTc6n4k3dfHO4tVXFakk9frD4t6i+XgboXLhgQqn1ZMQaGsp8N9Xjw== dependencies: "@conveyal/lonlat" "^1.4.1" "@mapbox/polyline" "^1.1.0" - "@opentripplanner/geocoder" "^1.4.0" + "@opentripplanner/geocoder" "^1.4.1" "@styled-icons/foundation" "^10.34.0" "@turf/along" "^6.0.1" bowser "^2.7.0" @@ -2714,12 +2714,12 @@ "@turf/midpoint" "^6.5.0" lodash.isequal "^4.5.0" -"@opentripplanner/trip-details@^5.0.0-alpha.6": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.0.tgz#9b422e2eba3b63f6a9bde2bb457220459da7f866" - integrity sha512-RHOsaDVBpRHPRBaladU7oIi6UwDSvYzER57j2RfmmGHriwPdp1yOJZXH6qT3NtlRpeERtVkF5/ZzAHYzF90UUQ== +"@opentripplanner/trip-details@^5.0.1-alpha.2": + version "5.0.1-alpha.2" + resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.1-alpha.2.tgz#3764b4b0deb100d30d09c365ec22bd0cd8dc26c9" + integrity sha512-aVe6d6QyN0iS3FMkzmdsEO3mXhgiM9bzcqdmi0HCcXxO41y35RKe/iL+QfBzxT5rdgtp9shPHdFMCp3ihQBzbA== dependencies: - "@opentripplanner/core-utils" "^9.0.0-alpha.36" + "@opentripplanner/core-utils" "^9.0.2" "@styled-icons/fa-solid" "^10.34.0" flat "^5.0.2" react-animate-height "^3.0.4" From 96089eeb25a0cc5f686e15b67a02f19d3a3b5776 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Fri, 21 Jul 2023 14:02:04 -0700 Subject: [PATCH 16/19] deps: update core-utils to non alpha --- package.json | 2 +- yarn.lock | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/package.json b/package.json index 54015349a..008f27d61 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@bugsnag/js": "^7.17.0", "@bugsnag/plugin-react": "^7.17.0", "@opentripplanner/base-map": "^3.0.13", - "@opentripplanner/core-utils": "^10.0.0-alpha.2", + "@opentripplanner/core-utils": "^9.0.2", "@opentripplanner/endpoints-overlay": "^2.0.7", "@opentripplanner/from-to-location-picker": "^2.1.7", "@opentripplanner/geocoder": "^1.4.1", diff --git a/yarn.lock b/yarn.lock index 0b49c0fe1..862068067 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2394,25 +2394,6 @@ maplibre-gl "^2.1.9" react-map-gl "^7.0.15" -"@opentripplanner/core-utils@^10.0.0-alpha.2": - version "10.0.0-alpha.2" - resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-10.0.0-alpha.2.tgz#42f14c1c44fdf7eee0652c53023f56461447a898" - integrity sha512-R6Nc34qYEOcYOx5lyGnpnwW7pPQHjypP+Qq5gJ5xB0mkx6ZnaTrCbRXBISc+/+/OR7/PrhOp1PqWktckWkVBng== - dependencies: - "@conveyal/lonlat" "^1.4.1" - "@mapbox/polyline" "^1.1.0" - "@opentripplanner/geocoder" "^1.4.1" - "@styled-icons/foundation" "^10.34.0" - "@turf/along" "^6.0.1" - bowser "^2.7.0" - chroma-js "^2.4.2" - date-fns "^2.28.0" - date-fns-tz "^1.2.2" - graphql "^16.6.0" - lodash.clonedeep "^4.5.0" - lodash.isequal "^4.5.0" - qs "^6.9.1" - "@opentripplanner/core-utils@^8.1.1", "@opentripplanner/core-utils@^8.2.1": version "8.3.2" resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-8.3.2.tgz#5095dd3ae8493e478b3f599353c6804b35f1e1dd" From 46bce112c6fdd237a66224260a681df24305b75b Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Fri, 21 Jul 2023 15:26:05 -0700 Subject: [PATCH 17/19] deps: replace alpha version of trip details --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 008f27d61..efdb4d509 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "@opentripplanner/stops-overlay": "^5.1.0", "@opentripplanner/transit-vehicle-overlay": "^4.0.4", "@opentripplanner/transitive-overlay": "^3.0.13", - "@opentripplanner/trip-details": "^5.0.1-alpha.2", + "@opentripplanner/trip-details": "^5.0.1", "@opentripplanner/trip-form": "^3.1.1", "@opentripplanner/trip-viewer-overlay": "^2.0.5", "@opentripplanner/vehicle-rental-overlay": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index 862068067..dd8f73c7f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2666,10 +2666,10 @@ "@turf/midpoint" "^6.5.0" lodash.isequal "^4.5.0" -"@opentripplanner/trip-details@^5.0.1-alpha.2": - version "5.0.1-alpha.2" - resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.1-alpha.2.tgz#3764b4b0deb100d30d09c365ec22bd0cd8dc26c9" - integrity sha512-aVe6d6QyN0iS3FMkzmdsEO3mXhgiM9bzcqdmi0HCcXxO41y35RKe/iL+QfBzxT5rdgtp9shPHdFMCp3ihQBzbA== +"@opentripplanner/trip-details@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.1.tgz#d49acbb26dd5ae73eedf52d1bed90ab47ffe235b" + integrity sha512-SDuscOFkhjhfipojh1kz2VExDAdwKbV6ZRW23y6B/jsva2DxFVNwvTNP1eCrmUBX9mPxd74fXSCnjUKezWXqRg== dependencies: "@opentripplanner/core-utils" "^9.0.2" "@styled-icons/fa-solid" "^10.34.0" From 694b4e6fd8c75401388967a10602be374de6705b Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 27 Jul 2023 12:09:54 -0700 Subject: [PATCH 18/19] deps: update trip details --- package.json | 4 ++-- yarn.lock | 31 +++++++++++++++++++++++++------ 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index efdb4d509..2b9717f9b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@bugsnag/js": "^7.17.0", "@bugsnag/plugin-react": "^7.17.0", "@opentripplanner/base-map": "^3.0.13", - "@opentripplanner/core-utils": "^9.0.2", + "@opentripplanner/core-utils": "^9.0.3", "@opentripplanner/endpoints-overlay": "^2.0.7", "@opentripplanner/from-to-location-picker": "^2.1.7", "@opentripplanner/geocoder": "^1.4.1", @@ -56,7 +56,7 @@ "@opentripplanner/stops-overlay": "^5.1.0", "@opentripplanner/transit-vehicle-overlay": "^4.0.4", "@opentripplanner/transitive-overlay": "^3.0.13", - "@opentripplanner/trip-details": "^5.0.1", + "@opentripplanner/trip-details": "^5.0.2", "@opentripplanner/trip-form": "^3.1.1", "@opentripplanner/trip-viewer-overlay": "^2.0.5", "@opentripplanner/vehicle-rental-overlay": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index dd8f73c7f..95e5fc663 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2413,7 +2413,7 @@ lodash.isequal "^4.5.0" qs "^6.9.1" -"@opentripplanner/core-utils@^9.0.0", "@opentripplanner/core-utils@^9.0.2": +"@opentripplanner/core-utils@^9.0.0": version "9.0.2" resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.2.tgz#a2fdce7ae99533de623f1fe9266b60068cc02f76" integrity sha512-xNNxbInolf4V2IzR2IXiPRsnxRqRMHf9qTc6n4k3dfHO4tVXFakk9frD4t6i+XgboXLhgQqn1ZMQaGsp8N9Xjw== @@ -2432,6 +2432,25 @@ lodash.isequal "^4.5.0" qs "^6.9.1" +"@opentripplanner/core-utils@^9.0.3": + version "9.0.3" + resolved "https://registry.yarnpkg.com/@opentripplanner/core-utils/-/core-utils-9.0.3.tgz#c1ebdcc3ad5999fb28427102c9be7d7268f6bd37" + integrity sha512-8P3Bi41jF7z18P/soo6lEw+nrqarsyGMAxivsF1/kMJdRo4wnakp0zcrVZjDXTxoR6LPtj6Kkuxv3JQFO9jKiw== + dependencies: + "@conveyal/lonlat" "^1.4.1" + "@mapbox/polyline" "^1.1.0" + "@opentripplanner/geocoder" "^1.4.1" + "@styled-icons/foundation" "^10.34.0" + "@turf/along" "^6.0.1" + bowser "^2.7.0" + chroma-js "^2.4.2" + date-fns "^2.28.0" + date-fns-tz "^1.2.2" + graphql "^16.6.0" + lodash.clonedeep "^4.5.0" + lodash.isequal "^4.5.0" + qs "^6.9.1" + "@opentripplanner/endpoints-overlay@^2.0.7": version "2.0.7" resolved "https://registry.yarnpkg.com/@opentripplanner/endpoints-overlay/-/endpoints-overlay-2.0.7.tgz#7f31c69728ec8148a94100e5d645a538151bd4b2" @@ -2666,12 +2685,12 @@ "@turf/midpoint" "^6.5.0" lodash.isequal "^4.5.0" -"@opentripplanner/trip-details@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.1.tgz#d49acbb26dd5ae73eedf52d1bed90ab47ffe235b" - integrity sha512-SDuscOFkhjhfipojh1kz2VExDAdwKbV6ZRW23y6B/jsva2DxFVNwvTNP1eCrmUBX9mPxd74fXSCnjUKezWXqRg== +"@opentripplanner/trip-details@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@opentripplanner/trip-details/-/trip-details-5.0.2.tgz#46e5c27c4ac6b1f12b638b5c361882358aa6cdc0" + integrity sha512-yeWokJdnka0bW67yHxnvHg2w3L+qQJaaSmZjvnut8AOVAUc2wzUGMshwpU5hcUYpNkVCwNuSUjR1fIZ4rGaoGw== dependencies: - "@opentripplanner/core-utils" "^9.0.2" + "@opentripplanner/core-utils" "^9.0.3" "@styled-icons/fa-solid" "^10.34.0" flat "^5.0.2" react-animate-height "^3.0.4" From f4f2e649d6e5552db55ac83d3614c97e2c8c26fe Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 27 Jul 2023 18:36:32 -0700 Subject: [PATCH 19/19] deps: update types --- package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2b9717f9b..e2007e840 100644 --- a/package.json +++ b/package.json @@ -131,7 +131,7 @@ "@craco/craco": "^6.3.0", "@jackwilsdon/craco-use-babelrc": "^1.0.0", "@opentripplanner/scripts": "^1.2.0", - "@opentripplanner/types": "^6.0.0-alpha.8", + "@opentripplanner/types": "^6.0.0", "@percy/cli": "^1.20.3", "@percy/puppeteer": "^2.0.2", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1", diff --git a/yarn.lock b/yarn.lock index 95e5fc663..d4067ffc5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2720,7 +2720,7 @@ "@opentripplanner/base-map" "^3.0.11" "@opentripplanner/core-utils" "^8.2.1" -"@opentripplanner/types@^6.0.0-alpha.8": +"@opentripplanner/types@^6.0.0": version "6.0.0" resolved "https://registry.yarnpkg.com/@opentripplanner/types/-/types-6.0.0.tgz#3dabebd404c88030f4191f08c7692d72ca2e3c8d" integrity sha512-mwwj2WzkdCoG2KUYaR/4I2JkcuXr1fFUJpP4nk10YbRgzyGtGLaGIdiTXNYpwgk/5//pMHQ5Qa6psWrHpqRm1A==