Fare Table comaptibility with OTP2 FareProduct API #612

daniel-heppner-ibigroup · 2023-07-03T20:01:56Z

No description provided.

BREAKING CHANGE: Removes old getTransitFare() function

Fare data is now stored on the legs themselves, so it’s not necessary to pass it around on its own

BREAKING CHANGE: removes support for REST data in FareTable

…legs

…cts-table

…ducts-table

…able

miles-grant-ibigroup · 2023-07-10T17:51:29Z

Because of some internal dependency complications, we had to undo this change. We instead will have to merge all this first and then create a follow up PR that removes depending on alpha versions

binh-dam-ibigroup · 2023-07-10T17:58:24Z

Please first create two separate PRs for these packages:

types

core-utils

The types PR should contain a breaking change commit.

binh-dam-ibigroup · 2023-07-10T18:05:40Z

Because of some internal dependency complications, we had to undo this change. We instead will have to merge all this first and then create a follow up PR that removes depending on alpha versions

Ok. Still needs a breaking change to the types package.

BREAKING CHANGE: Removes support for older OTP1/REST legs

daniel-heppner-ibigroup · 2023-07-10T18:51:49Z

Because of some internal dependency complications, we had to undo this change. We instead will have to merge all this first and then create a follow up PR that removes depending on alpha versions

Ok. Still needs a breaking change to the types package.

Great point, I cherry picked my breaking change commit over to this PR now for types.

binh-dam-ibigroup

See comment for types and core-utils packages (more comments to come)

packages/types/src/index.ts

packages/core-utils/src/__tests__/__snapshots__/itinerary.js.snap

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

binh-dam-ibigroup

Needs a few more breaking change commits and some cleanup. Also, fares are no longer shown for the regular transit legs and for http://localhost:5555/?path=/story/tripdetails--fare-components-itinerary&globals=locale:en-US and http://localhost:5555/?path=/story/itinerarybody-otp-react-redux--individual-leg-fare-components&globals=locale:en-US, so either the fares should be shown, or the story title/contents should be updated.

binh-dam-ibigroup · 2023-07-10T19:01:35Z

packages/itinerary-body/src/ItineraryBody/index.tsx

@@ -35,7 +35,6 @@ const ItineraryBody = ({
  showElevationProfile,
  showLegIcon,
  showMapButtonColumn = true,
-  showRouteFares,


There should be a breaking change commit to the itinerary-body package.

Also remove this prop from packages/itinerary-body/src/types.ts.

removed and breaking change added in 48bdcc4.

packages/itinerary-body/src/TransitLegBody/index.tsx

binh-dam-ibigroup · 2023-07-10T19:06:34Z

packages/itinerary-body/src/TransitLegBody/index.tsx

@@ -150,7 +140,8 @@ class TransitLegBody extends Component<Props, State> {
      timeZone,
      TransitLegSubheader,
      TransitLegSummary,
-      transitOperator
+      transitOperator,
+      defaultFareSelector


Sort props.

binh-dam-ibigroup · 2023-07-10T19:20:19Z

packages/itinerary-body/src/TransitLegBody/index.tsx

                  </S.TransitLegExpandedBody>
                </AnimateHeight>
-
+                {legCost && (


Was there a request for moving the fare out of the expanding section?

No, that was a mistake.

I did some work to fix the fares displaying in the itinerary body. Lots of prop drilling, we should return to clean this up.

Also includes breaking change for itinerary-body.

packages/trip-details/src/index.tsx

packages/trip-details/src/types.ts

binh-dam-ibigroup · 2023-07-10T19:59:11Z

packages/trip-details/src/types.ts

 export interface TransitFareProps {
-  fareKey: string;
+  headerKey: string;
+  fareMediumId: string


Sort props. There should be a breaking change commit for the trips-detail package for the props removed.

packages/trip-details/src/types.ts

packages/trip-details/src/utils.tsx

…or prop BREAKING CHANGE: Removes unused showRouteFares

BREAKING CHANGE: Removes types associated with old REST API

binh-dam-ibigroup

Much cleaner now. See the few more items. Thanks for the changes!

packages/itinerary-body/src/ItineraryBody/place-row.tsx

packages/itinerary-body/src/stories/OtpRrItineraryBody.story.tsx

packages/trip-details/src/TripDetails.story.tsx

daniel-heppner-ibigroup added 24 commits June 8, 2023 23:45

feat(core-utils): adds function for converting GQL response to REST

b7cfc5a

fix(core-utils): convert fare functions to consume GQL data

bb3b334

BREAKING CHANGE: Removes old getTransitFare() function

feat(itinerary-body): removes REST style fare data

c456013

Fare data is now stored on the legs themselves, so it’s not necessary to pass it around on its own

test(itinerary-body): add new mock

96eae08

test(core-utils): add new mock

e941d67

feat(trip-details): convert FareTable to use Fare Product data

97d46a8

BREAKING CHANGE: removes support for REST data in FareTable

test: add test for getlegfare

2a95a93

feat(types): Remove old fare info, add GraphQL style FareProducts to …

d102510

…legs

Merge branch 'gql-transition/fare-product-types' into otp2-fare-produ…

8848676

…cts-table

refactor(itinerary-body): re-add showRouteFares

c7b7cad

fix(core-utils): adds new FareProducts API to query

0ca75a4

refactor(itinerary-body): update legprodct mock

7a5652f

undo some regressions

1113b6b

Merge branch 'gql-transition/add-fareproducts-to-query' into fare-pro…

1575424

…ducts-table

Merge branch 'gql-transition/fare-product-types' into fare-products-t…

93f257f

…able

Merge branch 'fare-products-table' into otp2-fare-products-table

f842f87

Merge branch 'master' into otp2-fare-products-table

ce6c90a

fix(core-utils): correct bug with argument order

6ee769c

fix(trip-details): bug fixes

0a1ba98

fix(trip-details): fix fare product table bug

a9befc9

fix(i18n): add correct translations

4c1ed6e

fix(trip-details): fix crash

a5232ec

fix(core-utils): hide undefined fare legs instead of returning 0

ff007f3

refactor(trip-details): add story with invalidkey

0122ca5

daniel-heppner-ibigroup added the on hold label Jul 3, 2023

daniel-heppner-ibigroup added 5 commits July 3, 2023 13:37

deps(trip-details): use latest core-utils

d5f1340

Merge branch 'master' into otp2-fare-products-table

118d5fe

fix spelling

fa21a13

fix types issue

099920c

i18n: clean up files

077dbdb

binh-dam-ibigroup assigned daniel-heppner-ibigroup and unassigned binh-dam-ibigroup Jul 10, 2023

miles-grant-ibigroup assigned binh-dam-ibigroup and unassigned daniel-heppner-ibigroup Jul 10, 2023

refactor(types): generate commit

b8e2ae9

BREAKING CHANGE: Removes support for older OTP1/REST legs

binh-dam-ibigroup reviewed Jul 10, 2023

View reviewed changes

binh-dam-ibigroup requested changes Jul 10, 2023

View reviewed changes

binh-dam-ibigroup assigned daniel-heppner-ibigroup and unassigned binh-dam-ibigroup Jul 10, 2023

daniel-heppner-ibigroup added 6 commits July 10, 2023 16:22

refactor(types): pr comments

33cad91

i18n: improve french text

94a3bb6

address pr comments

c765371

remove old story

0b2f9db

fix(itinerary-body): remove unused prop and add new defaultFareSelect…

48bdcc4

…or prop BREAKING CHANGE: Removes unused showRouteFares

test: fix itinerary test

63eb193

daniel-heppner-ibigroup assigned binh-dam-ibigroup and unassigned daniel-heppner-ibigroup Jul 11, 2023

daniel-heppner-ibigroup added 3 commits July 11, 2023 11:06

fix(trip-details): remove unused types

eccaf39

BREAKING CHANGE: Removes types associated with old REST API

refactor: remove unused stories

73c71fa

chore: update snapshots

aa85e51

binh-dam-ibigroup approved these changes Jul 12, 2023

View reviewed changes

binh-dam-ibigroup assigned daniel-heppner-ibigroup and unassigned binh-dam-ibigroup Jul 12, 2023

chore: sort props

f4601e7

daniel-heppner-ibigroup merged commit 638a8e8 into opentripplanner:master Jul 12, 2023
2 checks passed

daniel-heppner-ibigroup deleted the otp2-fare-products-table branch July 12, 2023 23:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fare Table comaptibility with OTP2 FareProduct API #612

Fare Table comaptibility with OTP2 FareProduct API #612

daniel-heppner-ibigroup commented Jul 3, 2023

miles-grant-ibigroup commented Jul 10, 2023

binh-dam-ibigroup commented Jul 10, 2023

binh-dam-ibigroup commented Jul 10, 2023

daniel-heppner-ibigroup commented Jul 10, 2023

binh-dam-ibigroup left a comment

binh-dam-ibigroup left a comment

binh-dam-ibigroup Jul 10, 2023

binh-dam-ibigroup Jul 10, 2023

daniel-heppner-ibigroup Jul 11, 2023

binh-dam-ibigroup Jul 10, 2023

binh-dam-ibigroup Jul 10, 2023

daniel-heppner-ibigroup Jul 11, 2023

daniel-heppner-ibigroup Jul 11, 2023

daniel-heppner-ibigroup Jul 11, 2023

binh-dam-ibigroup Jul 10, 2023

binh-dam-ibigroup left a comment

Fare Table comaptibility with OTP2 FareProduct API #612

Fare Table comaptibility with OTP2 FareProduct API #612

Conversation

daniel-heppner-ibigroup commented Jul 3, 2023

miles-grant-ibigroup commented Jul 10, 2023

binh-dam-ibigroup commented Jul 10, 2023

binh-dam-ibigroup commented Jul 10, 2023

daniel-heppner-ibigroup commented Jul 10, 2023

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

binh-dam-ibigroup left a comment

Choose a reason for hiding this comment