Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
200 commits
Select commit Hold shift + click to select a range
e53025e
fix(GtfsFilter): improve labeling of feeds in filter that have not be…
landonreed Mar 31, 2017
6bdd8fd
fix(FareRulesForm): allow fare rules to have route, from/to, and/or c…
landonreed Mar 31, 2017
a419089
fix(FeedVersionNavigator): hide management functions on public view
landonreed Mar 31, 2017
d32784b
fix(alerts): prevent user from creating new alert until alerts loaded
landonreed Mar 31, 2017
900ed75
refactor(alerts): refactor alert actions
landonreed Mar 31, 2017
c68fb80
fix(signs): fix reducer for signs; refactor so that sign creation dis…
landonreed Mar 31, 2017
2e7921a
refactor(activeProject): create selector for activeProject
landonreed Apr 3, 2017
394fe5e
refactor(signs/alerts): use standard fetchProjects action and new sel…
landonreed Apr 3, 2017
df47dfc
refactor(common): simplify mapDispatchToProps
landonreed Apr 3, 2017
c99d2ca
refactor(common): refactor consts to functions
landonreed Apr 3, 2017
614e7e2
style(FareRulesForm): prefer const
landonreed Apr 3, 2017
167b3e3
fix(reducer): check feedSource is not null before setting id
landonreed Apr 3, 2017
849645d
fix(status): add missing cases for signs/alerts
landonreed Apr 3, 2017
f80b897
fix(FeedVersion): disable edit buttons and alphabetize props
landonreed Apr 3, 2017
9455fd3
fix(reducer): check project is not null before setting active proejct id
landonreed Apr 3, 2017
5fff5b9
fix(reducer): add revoke_token action case for testing
landonreed Apr 3, 2017
da37a95
revoke token action
landonreed Apr 3, 2017
2d782cc
style(ActiveFeedVersionNavigator): remove commented code
landonreed Apr 3, 2017
4c8e4b2
refactor(action/snapshot): handle error if loadFeedVersion fails
landonreed Apr 3, 2017
3cad2b5
style(lint): fix lint
landonreed Mar 23, 2017
71c033e
fix(EditorMap): fix tripPatterns for display of route alignments
landonreed Apr 4, 2017
ef07c1c
refactor(selector): finish work on new selectors
landonreed Apr 4, 2017
6d76b3d
refactor(status): add handleFetchError func
landonreed Apr 4, 2017
93a9d60
refactor(signs): use selectors in signs module
landonreed Apr 4, 2017
2bdec1d
refactor(EditableTextField): refactor component, clean up functions
landonreed Apr 5, 2017
cbaa20a
fix(EditorFeedSourcePanel): fix dom nesting warnings, resort snapshot…
landonreed Apr 5, 2017
87f95df
fix(FeedVersionViewer): fix key warning on version list and size of b…
landonreed Apr 5, 2017
de55208
fix(i18n): update messages for EditorFeedSourcePanel
landonreed Apr 5, 2017
e01cd91
refactor(FeedVersionValidation): refactor validation summary table
landonreed Apr 5, 2017
ce513de
fix(AlertsList): make sort and feed filter controlled components
landonreed Apr 5, 2017
d8bf19c
fix(FeedVersionReport): fix momentjs display of minutes
landonreed Apr 5, 2017
bce0447
feat(secureFetch): handle bad server responses with error message
landonreed Apr 6, 2017
e265350
refactor(secureFetch): delete previous definition of secureFetch
landonreed Apr 6, 2017
8a0ecab
refactor(mount): refactor app to use woonerf mount
landonreed Apr 6, 2017
5d1c7d2
Merge pull request #5 from catalogueglobal/handle-bad-response
Apr 6, 2017
aa7f3ac
refactor(store): build store with woonerf
evansiroky Apr 6, 2017
6069ceb
Merge pull request #7 from catalogueglobal/use-woonerf-mount
Apr 7, 2017
c923b93
refactor(config): move config initialization to util function
landonreed Apr 7, 2017
344c74f
refactor(container): refactor mapDispatchToProps
landonreed Apr 14, 2017
a3e1eb3
fix(gtfs.yml): clean up route helpContent
landonreed Apr 14, 2017
a14c77d
fix(config): add useS3Storage prop to config (for handling feed downl…
landonreed Apr 14, 2017
7914213
refactor(EditorInput): factor out ZoneSelect and ColorField; refactor…
landonreed Apr 14, 2017
4fbf989
refactor(EditorMap): refactor stop map components
landonreed Apr 14, 2017
660fe91
refactor(gtfsplus): refactor gtfsplus for mapDispatch changes
landonreed Apr 14, 2017
b11d6dd
refactor(UserSettings): add org placeholder
landonreed Apr 14, 2017
5522c9c
style(EditableTextField): add whitespace
landonreed Apr 14, 2017
ebdc6b7
feat(editor validation): enhance validation report for editor entities
landonreed Apr 14, 2017
69d72c6
refactor(Auth0Manager): refactor, remove logs
landonreed Apr 14, 2017
ab3236d
refactor(EditorFeedSourcePanel): sort snapshots from newest to oldest…
landonreed Apr 14, 2017
fbb60b4
fix(gtfsFilter): check for null feedIds response, clean up mapDispatch
landonreed Apr 14, 2017
aeebe89
fix(style): refactor GtfsFilter so that dropdown scrolls, and add add…
landonreed Apr 14, 2017
1ada05a
refactor(FeedInfoPanel): anon func fixes
landonreed Apr 14, 2017
843b4df
refactor(EditShape): move editSettings into separate component
landonreed Apr 14, 2017
7d34380
style(reporter): destructure this.props, simplify mapDispatchToProps
landonreed Apr 15, 2017
d494c08
refactor(FeedVersionNavigator): update gtfsPlusDataRequested for chan…
landonreed Apr 15, 2017
e9db803
style(manager-components): add new lines, remove old commented code
landonreed Apr 15, 2017
09a0b78
refactor(FareRules): refactor fare rules form
landonreed Apr 15, 2017
c2771cc
fix(editor-reducer): sort trip patterns on receive
landonreed Apr 15, 2017
123f910
refactor(scheduleException): refactor exception dates into separate c…
landonreed Apr 15, 2017
ad81e57
refactor(pattern-editor): fix anon functions, clean up component appe…
landonreed Apr 17, 2017
3939eee
refactor(editor-reducer): rename edit setting for clarity
landonreed Apr 17, 2017
0b4315e
style(lint): fix build
landonreed Apr 17, 2017
2ddabc9
style(lint): fix build
landonreed Apr 17, 2017
0b5e112
fix(actions): fix bad find/replace for secureFetch
landonreed Apr 17, 2017
ee3fd2b
fix(actions): fix path for common actions
landonreed Apr 17, 2017
f523008
fix(ControlPoint): fix remove control point and remove stop bug
landonreed Apr 19, 2017
60476f1
fix(project-reducer): check isochrone features before mapping
landonreed Apr 20, 2017
0f7e6d8
refactor(FeedVersionReport): refactor large component into smaller files
landonreed Apr 20, 2017
2a307fb
refactor(editor-components): factor out anon functions
landonreed Apr 21, 2017
08b1a01
fix(ActiveGtfsEditor): fix removeControlPoint, simplify dispatchToProps
landonreed Apr 21, 2017
5b51464
style(EditorMap): alphabetize things
landonreed Apr 21, 2017
103ddfb
refactor(editor-pattern): refactor pattern entity editor panels
landonreed Apr 21, 2017
a08e95d
refactor(admin): refactor user admin components, add OptionButton com…
landonreed Apr 21, 2017
99d432c
refactor(components): fix inline functions
landonreed Apr 21, 2017
c6b0da0
style(active): make editSettings func call more clear
landonreed Apr 21, 2017
90c058a
fix(secureFetch): do not throw generic error on 3** status
landonreed Apr 24, 2017
d32a08d
docs(README): include link to dev docs
landonreed Apr 25, 2017
a948b93
refactor(admin): refactor org/user admin; remove inline funcs
landonreed Apr 26, 2017
117abe8
refactor(timetable): refactor editor timetable, remove inline funcs
landonreed Apr 26, 2017
308ae64
refactor(gtfsplus): remove inline funcs
landonreed Apr 26, 2017
0e8ce2d
chore(config): remove module-specific config props
landonreed Apr 26, 2017
116ec9a
chore(actions-user): remove logs
landonreed Apr 26, 2017
ca23a54
refactor(alerts): simplify active alert actions, remove inline funcs
landonreed Apr 26, 2017
0ecdefb
refactor(components): fix inline functions
landonreed Apr 26, 2017
38e233b
refactor(EditorInput): move input props to constant
landonreed Apr 26, 2017
9fb6232
refactor(editor-components): fix inline functions
landonreed Apr 26, 2017
6a1595d
feat(editor-map): add tooltips, refactor inline functions
landonreed Apr 27, 2017
e0b49a2
fix(app): fix inline functions (and keep routes from being re-rendered)
landonreed Apr 27, 2017
e6fc074
style(alerts): fix lint
landonreed Apr 27, 2017
028cfbd
refactor(FeedVersionNavigator): move vars to container props
landonreed Apr 27, 2017
9df4839
fix(UserAccount): fix map func
landonreed Apr 27, 2017
cc14351
style(EntityList): fix lint
landonreed Apr 27, 2017
ba2c0be
Revert "style(EntityList): fix lint"
landonreed Apr 27, 2017
2483058
style(EntityList): fix lint
landonreed Apr 27, 2017
04342eb
fix(FeedSourceSettings): fix missing tab in FeedSourceViewer
landonreed Apr 28, 2017
e057ac8
style(FeedSource): fix lint, fix arrow func
landonreed Apr 28, 2017
21b3365
fix(editor-validation): fix dropdown, date, day of week validation
landonreed Apr 28, 2017
675ca8b
fix(EditorInput): fix react warnings on unknown inputType prop
landonreed Apr 28, 2017
adf1605
fix(EditorInput): fix validation state for dropdown
landonreed Apr 28, 2017
4368a45
fix(EditSchedulePanel): use OptionButton
landonreed Apr 28, 2017
2c9b2f1
fix(feed-download): use aws api to download feeds directly from s3
landonreed Mar 23, 2017
2052ede
Merge pull request #4 from catalogueglobal/feed-download-fix
May 3, 2017
979f644
refactor(editor): change api path for all editor actions
landonreed Apr 5, 2017
5fc6b2d
Merge pull request #6 from catalogueglobal/check-editor-permissions
May 3, 2017
b5f75c6
fix(snapshot): add feedId to all action URLs
landonreed May 4, 2017
8b0f1ec
fix(EditorInput): fix format of date field in EditorInput and Excepti…
landonreed May 4, 2017
7159a9f
fix(trip): change delete to bulk delete by joined IDs
landonreed May 4, 2017
b67987f
refactor(tripPattern): refactor action for new error handling
landonreed May 4, 2017
9085047
fix(editor): set status fields on create new route
landonreed May 4, 2017
ac6aaf6
refactor(editor-selector): use selector for entityList and validation…
landonreed May 4, 2017
f3c483b
refactor(editor): use error and list selectors in editor components
landonreed May 4, 2017
60fa7d5
refactor(gtfs.yml): change order of route fields, add scheduleexcepti…
landonreed May 4, 2017
2915a0e
style(common): clean up sidebar components + propTypes
landonreed May 4, 2017
abcc699
style(editor-reducer): clean up variable names
landonreed May 4, 2017
272cfbc
remove stop popup (renamed)
landonreed May 4, 2017
be0b643
refactor(pattern-editor): change panel style, fix inline functions
landonreed May 4, 2017
b74d76e
refactor(editor-components): fix icons variable name change, more upd…
landonreed May 4, 2017
44868fe
refactor(ScheduleExceptionForm): fix validation for selector use, add…
landonreed May 4, 2017
f4d5287
fix(fixes for schedule exception validation):
landonreed May 4, 2017
99182aa
fix(FeedVersionDetails): fix off by one error on feed dates
landonreed May 4, 2017
4799aac
refactor(PatternStopsLayer): change PatternStopPopup name
landonreed May 4, 2017
e323295
refactor(DirectionIcon): refactor marker into class
landonreed May 4, 2017
c555af5
fix(FeedInfoPanel): fix gtfsIcons var name
landonreed May 4, 2017
5d9cfeb
style(TripPatternListControls): fix lint
landonreed May 4, 2017
3254988
fix(FeedVersionDetails): fix date label to use moment for new start/e…
landonreed May 5, 2017
7abc86f
refactor(components): remove hanging lines and more inline functions
landonreed May 9, 2017
59292f4
refactor(editor-map): inline functions and set active stop action
landonreed May 9, 2017
789307f
refactor(deployment-actions): clean up action results
landonreed May 9, 2017
0ccfb55
style delete button with text-danger
landonreed May 9, 2017
ec4af99
refactor(FeedSource): fix inline funcs and hanging lines
landonreed May 9, 2017
5beea4e
refactor(FeedVersion): fix inline funcs and hanging lines
landonreed May 9, 2017
85cad3a
refactor(manager-components): refactor inline funcs and hanging lines
landonreed May 9, 2017
0c67a7f
fix hanging line
landonreed May 9, 2017
f9d42fa
style(lint): fix linting errors
landonreed May 9, 2017
5337109
fix(EntityList): fix proptypes, add Immutable import
landonreed May 9, 2017
5d7b8b8
fix(package.json): add immutable
landonreed May 9, 2017
a9994c1
refactor(FeedVersionViewer): change text for version buttons
landonreed May 9, 2017
df40ba9
refactor(FeedVersionViewer): fix text on feed version button
landonreed May 9, 2017
b0f81bb
fix(ExternalPropertiesTable): fix action parameters and props for upd…
landonreed May 10, 2017
eb1c030
docs(users): add password reset instructions
landonreed May 22, 2017
d258f9c
docs(users): add note about email going to spam
landonreed May 22, 2017
4f869c1
fix(agency): add agency_email field
landonreed May 23, 2017
b963e6a
fix(trips): fix editor api url for delete trips
landonreed May 24, 2017
5b70275
fix(tripPattern): fix new trip pattern reducer (missing dot)
landonreed May 25, 2017
a7c8753
refactor(ActiveGtfsEditor): simplify dispatchToProps
landonreed May 25, 2017
c019918
refactor(editor-actions): move generateProps out of action
landonreed May 25, 2017
6455f3d
style(FeedInfoPanel): move props to single line
landonreed May 25, 2017
d9d86cb
refactor(CreateSnapshotModal): remove warning style from cancel button
landonreed May 25, 2017
689e59c
fix(EditorMap): clean up console logs, add tooltip to patterns overlay
landonreed May 25, 2017
fad4d69
fix(Pattern): fix new pattern bug, fix issue with drag/drop and stop …
landonreed May 26, 2017
095f20c
fix(HeaderCell): fix upating of active status
landonreed May 26, 2017
eb45598
fix(TimetableGrid): fix updating of row header cells when toggle all …
landonreed May 26, 2017
7550f6c
chore(EditableCell): remove logs
landonreed May 26, 2017
2eed843
style(TimetableGrid): fix lint
landonreed May 26, 2017
4b7853a
docs(managing-users): add user permissions examples
landonreed May 26, 2017
255ac98
fix(gtfs-filter): fix bug where feeds are not registered in API on fi…
landonreed May 30, 2017
e4b9c34
fix(gtfs-search): fix bad filtering of gtfs-api results due to stop_c…
landonreed May 30, 2017
8944deb
fix(gtfs-plus-actions): fix version fetch after publish
landonreed May 30, 2017
84b6233
feat(GtfsPlusField): remove case sensitivity for GTFS+ fields
landonreed May 30, 2017
42fddc5
fix(DeploymentViewer): fix deployment name change
landonreed May 31, 2017
5e53d7f
fix(DeploymentsPanel): re-add updateDeployment func for name change i…
landonreed May 31, 2017
c129348
fix(PatternStopsLayer): fix undefined patternStop
landonreed Jun 6, 2017
966e6fa
fix(TimetableHeader): move offsetRows to action/reducer; initial work…
landonreed Jun 7, 2017
ad2afce
feat(alerts): add character limit to alert title and description fields
landonreed Jun 7, 2017
6aa6d70
fix(ProjectsList): fix project creation/name change
landonreed Jun 12, 2017
d77323d
test(seedData): add script to seed data
landonreed Jun 15, 2017
0513ea1
fix(follw-streets): fix add extendPatternToPoint to account for follo…
landonreed Jun 15, 2017
3b79c2e
fix(settings): prevent access to settings for non-managers
landonreed Jun 21, 2017
3340197
fix(user-mgmt): if datatools permissions not found, set error message
landonreed Jun 21, 2017
5e98908
fix(settings): disable feed source settings tab for non-managers
landonreed Jun 21, 2017
352008f
fix(EditorFeedSourcePanel): disable buttons based on user permissions
landonreed Jun 22, 2017
b632710
add project to ActiveEditorFeedSourcePanel
landonreed Jun 22, 2017
e2722a8
fix(gtfs-api): use post method for long variable lists in graphql que…
landonreed Jun 30, 2017
35b4dbd
fix(editor fields): fix wheelchairBoarding for stops and routes
landonreed Jul 6, 2017
acee5b1
fix(EditShapePanel): fix drawing pattern geometry when not following …
landonreed Jul 6, 2017
426992b
feat(JobMonitor): add clear completed button
landonreed Jul 10, 2017
f2cfe84
feat(StatusModal): add optional action handler/prop for status modal
landonreed Jul 10, 2017
729a05c
fix(modules): use objectPath when accessing MTC props to avoid undefi…
landonreed Jul 10, 2017
19c60cc
feat(alerts-reducer): filter out TRAMS alerts for MTC
landonreed Jul 10, 2017
406e115
fix(editor-stops): fix deletion of pattern stop when shape is null
landonreed Jul 11, 2017
2e50fef
feat(deployment-settings): refactor + add elevationBucket and updaters
landonreed Jul 18, 2017
6d8d3be
fix(deployment-settings): add updater file, gbfs, and sort sourceTypes
landonreed Jul 18, 2017
45f483d
fix(deployment-settings): fix check for edits, remove console.log
landonreed Jul 18, 2017
b30e2b8
refactor(deployment-settings): refactor OtpServers/Updaters into Coll…
landonreed Jul 19, 2017
80738d5
fix(status): add second arg for error message action
landonreed Jul 21, 2017
faf9f74
add missing arg to errorMessage
landonreed Jul 21, 2017
8010af4
fix(FeedSourceTable): fix calendar expiration
evansiroky Aug 11, 2017
7e6622c
refactor(FeedSourceTable): remove unneeded code
evansiroky Aug 11, 2017
ef864a7
fix(deployments): fix message display
evansiroky Aug 11, 2017
88d26cd
test(flow): first adding of flow typings
evansiroky Aug 21, 2017
1a60200
test(flow): Add flow typing to lib/common/util
evansiroky Aug 21, 2017
0a61930
test(flow): more flow typing in util files
evansiroky Aug 23, 2017
3eea0e0
test(flow): more flow typing
evansiroky Aug 25, 2017
5874f5a
Merge pull request #16 from catalogueglobal/deployment-message-fix
evansiroky Aug 25, 2017
911eb99
Merge pull request #15 from catalogueglobal/feedsourcetable-calendar-fix
evansiroky Aug 25, 2017
fd6af9d
Merge branch 'dev' into flow
evansiroky Aug 25, 2017
13146f9
test(flow): flow typing for lib/editor/util files
evansiroky Aug 25, 2017
99b8c03
test(flow): add flow types for remaining util files
evansiroky Aug 26, 2017
641ef23
test(flow): increasing flow coverage in util files
evansiroky Aug 28, 2017
8e4b25b
test(jest): fix failing test and linting warning
evansiroky Aug 28, 2017
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
Prev Previous commit
Next Next commit
fix(modules): use objectPath when accessing MTC props to avoid undefi…
…ned erros
  • Loading branch information
landonreed committed Jul 10, 2017
commit 729a05c2a8f77ed89901551e76a62fa2a37e4ca0
12 changes: 10 additions & 2 deletions lib/common/util/modules.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
import objectPath from 'object-path'

import { getConfigProperty } from './config'

export const getFeed = (feeds, id) => {
// console.log(feeds, id)
// TODO: move use_extension to extension enabled??
const useMtc = getConfigProperty('modules.gtfsapi.use_extension') === 'mtc'
const feed = feeds ? feeds.find(f => useMtc ? f.externalProperties.MTC.AgencyId === id : f.id === id) : null
const feed = feeds
? feeds.find(f => useMtc ? objectPath.get(f, 'externalProperties.MTC.AgencyId') === id : f.id === id)
: null
return feed
}

export const getFeedId = (feed) => {
const useMtc = getConfigProperty('modules.gtfsapi.use_extension') === 'mtc'
return !feed ? null : useMtc ? feed.externalProperties.MTC.AgencyId : feed.id
return !feed
? null
: useMtc
? objectPath.get(feed, 'externalProperties.MTC.AgencyId')
: feed.id
}

export const getAlertsUrl = () => {
Expand Down