Skip to content

Patch release #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2020
Merged

Patch release #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a9c1c6
fix(mobile): fix results screen when planning trip
landonreed Oct 8, 2020
15edca1
refactor(types): change pending from bool -> number
landonreed Oct 8, 2020
0fd5e35
Merge pull request #251 from opentripplanner/fix-mobile-results
landonreed Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/components/mobile/results-screen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import MobileNavigationBar from './navigation-bar'
import { MobileScreens, setMobileScreen } from '../../actions/ui'
import { setUseRealtimeResponse } from '../../actions/narrative'
import { clearActiveSearch } from '../../actions/form'
import { getActiveSearch, getRealtimeEffects } from '../../util/state'
import { getActiveItineraries, getActiveSearch, getRealtimeEffects } from '../../util/state'

const LocationContainer = styled.div`
font-weight: 300;
Expand Down Expand Up @@ -235,17 +235,15 @@ const mapStateToProps = (state, ownProps) => {
: useRealtime ? activeSearch.response : activeSearch.nonRealtimeResponse

const realtimeEffects = getRealtimeEffects(state.otp)

const itineraries = getActiveItineraries(state.otp)
return {
query: state.otp.currentQuery,
realtimeEffects,
error: response && response.error,
resultCount:
response
? activeSearch.query.routingType === 'ITINERARY'
? response.plan
? response.plan.itineraries.length
: 0
? itineraries.length
: response.otp.profile.length
: null,
useRealtime,
Expand Down
6 changes: 2 additions & 4 deletions lib/components/narrative/itinerary-carousel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ItineraryCarousel extends Component {
state = {}
static propTypes = {
itineraries: PropTypes.array,
pending: PropTypes.bool,
pending: PropTypes.number,
activeItinerary: PropTypes.number,
hideHeader: PropTypes.bool,
itineraryClass: PropTypes.func,
Expand Down Expand Up @@ -102,9 +102,7 @@ class ItineraryCarousel extends Component {

const mapStateToProps = (state, ownProps) => {
const activeSearch = getActiveSearch(state.otp)
const itineraries = activeSearch && activeSearch.response && activeSearch.response.plan
? getActiveItineraries(state.otp)
: null
const itineraries = getActiveItineraries(state.otp)

return {
itineraries,
Expand Down
2 changes: 1 addition & 1 deletion lib/components/narrative/narrative-itineraries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class NarrativeItineraries extends Component {
static propTypes = {
itineraries: PropTypes.array,
itineraryClass: PropTypes.func,
pending: PropTypes.bool,
pending: PropTypes.number,
activeItinerary: PropTypes.number,
setActiveItinerary: PropTypes.func,
setActiveLeg: PropTypes.func,
Expand Down
2 changes: 1 addition & 1 deletion lib/components/narrative/tabbed-itineraries.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class TabbedItineraries extends Component {
static propTypes = {
itineraries: PropTypes.array,
itineraryClass: PropTypes.func,
pending: PropTypes.bool,
pending: PropTypes.number,
activeItinerary: PropTypes.number,
setActiveItinerary: PropTypes.func,
setActiveLeg: PropTypes.func,
Expand Down