Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
316 commits
Select commit Hold shift + click to select a range
195e228
refactor: repair patternStop and patternLocation adding to pattern
miles-grant-ibigroup Jan 26, 2022
570a930
refactor: repair active pattern halt count
miles-grant-ibigroup Jan 26, 2022
e5171da
refactor(TimetableEditor): Refactor constructNewRow to account for pa…
philip-cline Jan 28, 2022
163742b
refactor(TimetableEditor, LocationsLayer): Resolve saving timetable i…
philip-cline Jan 28, 2022
3712080
refactor: address pr comments
miles-grant-ibigroup Feb 2, 2022
e1ecd75
refactor: clean up
miles-grant-ibigroup Feb 2, 2022
4133291
refactor(EditSchedulePanel, TimetableEditor): Allow timetable editing…
philip-cline Feb 2, 2022
242d5cd
refactor: address pr comments
miles-grant-ibigroup Feb 2, 2022
ad2625f
Merge branch 'flex-polygon-editor' of github.com:ibi-group/datatools-…
miles-grant-ibigroup Feb 2, 2022
d3b5055
refactor: begin type repair
miles-grant-ibigroup Feb 2, 2022
dadf298
refactor(util/location): remove unused method
miles-grant-ibigroup Feb 3, 2022
8df2199
refactor: address pr comments
miles-grant-ibigroup Feb 4, 2022
0773bc1
chore: fix flow errors
miles-grant-ibigroup Feb 4, 2022
2103761
refactor: add mergePatternHaltsOfPattern
miles-grant-ibigroup Feb 4, 2022
e0da305
refactor(LocationsLayer): repair location editing by reverting pr sug…
miles-grant-ibigroup Feb 4, 2022
6825815
refactor: address pr comments
miles-grant-ibigroup Feb 4, 2022
24cdb74
refactor: address pr comments
miles-grant-ibigroup Feb 4, 2022
3670352
refactor: address pr comments
miles-grant-ibigroup Feb 8, 2022
2a9e2ff
refactor: allow flex checkbox to be unchecked if flex features removed
miles-grant-ibigroup Feb 10, 2022
b87b92e
refactor(FeedSourceTableRow): add notice of flex data
miles-grant-ibigroup Feb 11, 2022
373648d
refactor(i18n/english): update flex string
miles-grant-ibigroup Feb 11, 2022
75477d2
refactor: remove shape_dist_traveled from pattern location
miles-grant-ibigroup Feb 25, 2022
51823d0
refactor: fully remove shape_dist_traveled from patternLocation
miles-grant-ibigroup Feb 25, 2022
8671b16
refactor(LocationsLayer): Correct typo in polyline saving
philip-cline Mar 11, 2022
6208fe3
refactor(PatternLocationMarker): Add stop sequence icon to locations …
philip-cline Mar 16, 2022
3809235
refactor: clarify flex checkbox message
miles-grant-ibigroup Mar 17, 2022
6cd7558
refactor(LocationsLayer): only offer new polyshape when allowed
miles-grant-ibigroup Mar 17, 2022
a971d81
refactor(LocationsLayer): Fix deleting a location through EditControl
philip-cline Mar 17, 2022
a6b9250
Merge branch 'flex-polygon-editor' into react-17-flex
miles-grant-ibigroup Mar 23, 2022
9e7c67b
refactor: update react-leaflet-draw
miles-grant-ibigroup Mar 23, 2022
f6dfe24
refactor: temporary flow fix
miles-grant-ibigroup Mar 24, 2022
8808f1f
Merge branch 'react-17' into react-17-flex
miles-grant-ibigroup Apr 13, 2022
66a136a
Merge branch 'dev' into react-17-flex
miles-grant-ibigroup Apr 13, 2022
3ced98c
Merge branch 'react-17' into react-17-flex
miles-grant-ibigroup May 3, 2022
e9ce6da
Merge pull request #750 from ibi-group/react-17
miles-grant-ibigroup May 13, 2022
00dcba5
Merge branch 'dev-flex' into react-17-flex
miles-grant-ibigroup May 13, 2022
2fb70ec
refactor(PolygonWithLabel): Update PolgyonWithLabel to render properl…
philip-cline May 19, 2022
44f4767
refactor: address pr feedback
miles-grant-ibigroup Jun 16, 2022
be8fed6
refactor: address pr feedback
miles-grant-ibigroup Jun 16, 2022
82f9e87
Merge branch 'dev' into flex-polygon-editor
miles-grant-ibigroup Jun 16, 2022
bc4f883
Merge pull request #754 from ibi-group/flex-polygon-editor
miles-grant-ibigroup Jun 20, 2022
5efb46c
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Jun 23, 2022
5988b4a
refactor: add location groups structure
miles-grant-ibigroup Jun 24, 2022
d224d94
refactor(location groups): support viewing location group list
miles-grant-ibigroup Jun 28, 2022
f2855c2
refactor(location groups): support viewing location group list
miles-grant-ibigroup Jun 28, 2022
fb87137
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Jul 1, 2022
3e30af9
Merge branch 'dev-flex' into add-location-groups
miles-grant-ibigroup Jul 1, 2022
63ec76a
refactor: support multiple location_id
miles-grant-ibigroup Jul 1, 2022
293505a
refactor: store location group location_ids as csv
miles-grant-ibigroup Jul 11, 2022
8766f47
refactor: add types
miles-grant-ibigroup Jul 11, 2022
58a85df
refactor: show location group contents on map
miles-grant-ibigroup Jul 12, 2022
b1f4b2b
refactor: support deleting halts from location group
miles-grant-ibigroup Jul 12, 2022
732f3c8
refactor: correct flow types
miles-grant-ibigroup Jul 13, 2022
61c1e53
refactor(location groups editor): prettier trash icon
miles-grant-ibigroup Jul 13, 2022
ac888fb
refactor(location groups editor): improve name representation
miles-grant-ibigroup Jul 13, 2022
391ea02
refactor: correct flow types
miles-grant-ibigroup Jul 13, 2022
f091dfe
refactor(location groups editor): improve name representation
miles-grant-ibigroup Jul 13, 2022
e0764c9
refactor: first attempts at adding location groups to patterns
miles-grant-ibigroup Jul 14, 2022
94d877e
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Jul 14, 2022
47f244a
feat: add pattern location group support
miles-grant-ibigroup Jul 20, 2022
dc543ab
refactor: show location groups on map
miles-grant-ibigroup Jul 22, 2022
c529bdf
refactor: correct location_group types
miles-grant-ibigroup Jul 22, 2022
b6580a5
refactor: support clicking on a map location group
miles-grant-ibigroup Jul 25, 2022
51c3436
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Jul 25, 2022
5be93d9
Merge branch 'multi-graphhopper-repair' into multi-graphhopper-repair…
miles-grant-ibigroup Jul 25, 2022
d660d5c
fix: correct coordIsOutOfBounds behavior (flex specific fixes)
miles-grant-ibigroup Jul 25, 2022
87e8292
Merge branch 'multi-graphhopper-repair' into multi-graphhopper-repair…
miles-grant-ibigroup Jul 25, 2022
b882eed
refactor: remove redundant code
miles-grant-ibigroup Jul 25, 2022
d16abb7
Merge branch 'dev-flex' into add-location-groups
miles-grant-ibigroup Jul 25, 2022
2de6393
Merge branch 'multi-graphhopper-repair' into multi-graphhopper-repair…
miles-grant-ibigroup Jul 26, 2022
a0287aa
Merge branch 'dev' into multi-graphhopper-repair-flex
miles-grant-ibigroup Jul 26, 2022
ed0f8f6
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Jul 26, 2022
a73dfef
refactor(timetable editor): support pattern location groups
miles-grant-ibigroup Jul 26, 2022
ecc79b5
refactor: add comment highlighting strange behavior
miles-grant-ibigroup Jul 27, 2022
cf827d9
Merge pull request #827 from ibi-group/multi-graphhopper-repair-flex
miles-grant-ibigroup Jul 29, 2022
a4f44d9
refactor(LocationGroupsEditor): redesign stop/location list
miles-grant-ibigroup Jul 29, 2022
09ce2ad
refactor: address pr feedback
miles-grant-ibigroup Aug 2, 2022
2811cf1
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Aug 5, 2022
b23ba7d
Merge branch 'dev-flex' into add-location-groups
miles-grant-ibigroup Aug 5, 2022
d7a507d
refactor: address pr feedback
miles-grant-ibigroup Aug 5, 2022
e1fca07
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Aug 10, 2022
25b9245
fix: don't assign shapeId to pattern until stops are added
miles-grant-ibigroup Aug 12, 2022
b9f27da
fix: only assign pickup/dropoff values by default for stops
miles-grant-ibigroup Aug 12, 2022
90f6d0c
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Aug 12, 2022
5649ce1
ci: attempt to repair e2e tests (blind)
miles-grant-ibigroup Aug 12, 2022
0806fdf
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Aug 15, 2022
8f88a90
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Aug 15, 2022
5109107
Merge pull request #836 from ibi-group/fix-initial-values
miles-grant-ibigroup Aug 15, 2022
448c963
fix: don't send departureTime of zero for locations or location groups
miles-grant-ibigroup Aug 15, 2022
da86f88
Merge branch 'dev-flex' into add-location-groups
miles-grant-ibigroup Aug 16, 2022
3f7ab6d
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Aug 22, 2022
70c9c18
Merge branch 'dev-flex' into add-location-groups
miles-grant-ibigroup Aug 22, 2022
eb4fe7d
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Aug 29, 2022
ca3070c
refactor: non-invalid location/location group pickup/dropoff type def…
miles-grant-ibigroup Sep 8, 2022
395acdf
refactor: complete type updates
miles-grant-ibigroup Sep 12, 2022
ef90d06
Merge pull request #812 from ibi-group/add-location-groups
miles-grant-ibigroup Sep 12, 2022
537f099
fix: show stop code in location groups list
miles-grant-ibigroup Sep 14, 2022
10b2673
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Sep 15, 2022
9f6ee8a
chore: remove outdated patch
miles-grant-ibigroup Sep 15, 2022
28243de
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Sep 16, 2022
a420a11
Merge branch 'dev-flex' into dont-ship-departuretime-zero
miles-grant-ibigroup Sep 16, 2022
147ad53
Merge branch 'dev-flex' into location-groups-show-stop-code
miles-grant-ibigroup Sep 16, 2022
51340b0
Merge pull request #838 from ibi-group/dont-ship-departuretime-zero
miles-grant-ibigroup Sep 20, 2022
44905f9
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Sep 26, 2022
0433064
Merge pull request #854 from ibi-group/location-groups-show-stop-code
miles-grant-ibigroup Sep 27, 2022
66328da
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Sep 27, 2022
6b4a03c
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Sep 29, 2022
8e4a07f
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Oct 18, 2022
7b5e144
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Nov 11, 2022
cc6cc38
fix(ProjectFeedListToolbar): ban flex merges
miles-grant-ibigroup Nov 11, 2022
b77ad57
chore: lint
miles-grant-ibigroup Nov 11, 2022
4a7f6fa
refactor(i18n): remove polish language
miles-grant-ibigroup Nov 14, 2022
9988947
refactor(i18n/german): add german flex translations
miles-grant-ibigroup Nov 14, 2022
7fd0e5a
Merge pull request #871 from ibi-group/ban-flex-merge
miles-grant-ibigroup Nov 14, 2022
2b4ac63
fix(StopsLayer): Stop rendering all stops on menu open
philip-cline Nov 15, 2022
cd59af0
refactor(docker-compose): Adjust sleep time to see if fixes CI loadin…
philip-cline Nov 15, 2022
247262f
fix: ban/allow transformations correctly for flex files
miles-grant-ibigroup Nov 16, 2022
336155c
ci(e2e): temporarily correct datatools server build
miles-grant-ibigroup Nov 17, 2022
fee15ab
refactor: address pr feedback
miles-grant-ibigroup Nov 18, 2022
d72cf1c
refactor(docker-compose): reset sleep time, it didnt fix anything
philip-cline Nov 18, 2022
637a414
Bugfix: Delete Polygon from Store
amy-corson-ibigroup Nov 21, 2022
ca7678a
Merge pull request #874 from ibi-group/fix-stops-layer-rendering
philip-cline Nov 23, 2022
6b9dd4a
Feat: Zoom to Flex Trip Pattern
amy-corson-ibigroup Nov 23, 2022
24a70bb
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Nov 23, 2022
f4d11b9
flow error fixes
amy-corson-ibigroup Nov 23, 2022
9271c83
refactor: incorporate review feedback + flatMap
amy-corson-ibigroup Nov 29, 2022
ee19b8d
fix(AddPatternStopDropdown): Allow duplicate locations in patterns
philip-cline Nov 29, 2022
3a7bf9f
Merge pull request #881 from ibi-group/allow-duplicate-locations-in-p…
philip-cline Nov 30, 2022
63d7f57
fix: addresses additional bug
amy-corson-ibigroup Nov 30, 2022
aee831f
refactor: include PR feedback
amy-corson-ibigroup Dec 1, 2022
1ffcf4e
Merge pull request #879 from ibi-group/bugfix-polygon-delete
amy-corson-ibigroup Dec 1, 2022
7fb2eed
Merge pull request #877 from ibi-group/flex-transformations
miles-grant-ibigroup Dec 2, 2022
f6bc419
refactor: remove mapDispatchToProps
amy-corson-ibigroup Dec 2, 2022
c0bec84
Merge pull request #880 from ibi-group/feat-zoom-to-flex-route
amy-corson-ibigroup Dec 2, 2022
969a3ef
fix(timetable): allow duplicate flex stoptimes in timetable
philip-cline Dec 7, 2022
8c8923d
refactor(timetable): address pr comment
philip-cline Dec 7, 2022
aeb4c62
refactor(timetable selector): make isFlexStopTime independent fn
philip-cline Dec 15, 2022
e88c0e1
Merge pull request #884 from ibi-group/allow-duplicate-locations-in-t…
philip-cline Dec 15, 2022
2aba97d
fix(TripPatternList): Include flex locations/location groups in summa…
binh-dam-ibigroup Dec 16, 2022
52eaae8
fix(editor/util/map): Change default pickup/dropoff type for new flex…
binh-dam-ibigroup Dec 16, 2022
520c905
fix(PatternStopCard): Reinstate pickup/dropoff selector defaulting to…
binh-dam-ibigroup Dec 16, 2022
e06758f
improvement(PatternStopCard): Remove invalid pickup/dropoff dropdown …
binh-dam-ibigroup Dec 16, 2022
787e31c
Merge pull request #888 from ibi-group/fix-flex-stop-count
binh-dam-ibigroup Dec 19, 2022
88d32d5
fix(PatternStopCard): Reinstate at-stop and continuous pickup/dropoff…
binh-dam-ibigroup Dec 20, 2022
c8dc4a3
refactor(PatternStopCard): Remove redundant check for location[group].
binh-dam-ibigroup Jan 3, 2023
ec085e5
Merge pull request #889 from ibi-group/default-flex-pickup-dropoff-types
binh-dam-ibigroup Jan 3, 2023
2ba8ed4
disable normalize stops when locations are present
amy-corson-ibigroup Jan 6, 2023
0d7e02d
refactor: include location groups
amy-corson-ibigroup Jan 10, 2023
e752a1f
Merge branch 'dev' into dev-flex
miles-grant-ibigroup Jan 11, 2023
fb9b541
refactor: create util for location check
amy-corson-ibigroup Jan 27, 2023
e490950
Merge pull request #894 from ibi-group/disable-normalize-stop-time
amy-corson-ibigroup Jan 30, 2023
94e7989
chore(deps): bump json5 from 2.1.0 to 2.2.3
dependabot[bot] Jan 3, 2023
17e7a3f
fix: don’t fetch data twice
miles-grant-ibigroup Jan 11, 2023
77df1de
revert: don’t do new check unless we need to
miles-grant-ibigroup Jan 11, 2023
51b27db
refactor: only avoid fetching if project is entirely fetched
miles-grant-ibigroup Jan 11, 2023
f194d0f
fix(TimetableEditor): Populate pickup/dropoff type and booking field …
binh-dam-ibigroup Feb 7, 2023
689f94f
refactor(Latest dev changes): Merge dev into dev flex
philip-cline Feb 13, 2023
5c6fbdd
refactor(PatternStopCard): fix flow issues
philip-cline Feb 14, 2023
67ad389
Merge pull request #909 from ibi-group/merge-dev-into-dev-flex
miles-grant-ibigroup Feb 16, 2023
48d6719
Merge branch 'dev-flex' into populate-pickup-fields-flex
philip-cline Feb 16, 2023
14e843d
merge ci fix
philip-cline Feb 16, 2023
fafa302
chore(merge dev): merge dev into dev-flex
philip-cline Mar 2, 2023
81e75e4
Merge branch 'dev-flex' into populate-pickup-fields-flex
philip-cline Mar 2, 2023
17c3ba7
Merge pull request #906 from ibi-group/populate-pickup-fields-flex
philip-cline Mar 3, 2023
0ddb174
feat(flex): Add stop headsigns for flex
philip-cline Mar 8, 2023
9a20d78
feat(remove polylines): remove polyline editing (for now..?)
philip-cline Mar 10, 2023
fe6deb7
fix(flex travel times): don't increment cumulativeTravelTime for an i…
philip-cline Mar 14, 2023
9c70d4c
refactor(flow): reinstate flowfixmes
philip-cline Mar 14, 2023
a806875
Merge pull request #928 from ibi-group/remove-polylines
philip-cline Mar 14, 2023
a914e42
Merge pull request #925 from ibi-group/add-stop-headsigns-flex
philip-cline Mar 14, 2023
e75153f
refactor(TimetableEditor): move id check into method
philip-cline Mar 15, 2023
896890a
refactor(TimetableEditor): add null type to method
philip-cline Mar 15, 2023
4d1f6cc
Merge pull request #930 from ibi-group/handle-intra-zonal-travel-time
philip-cline Mar 22, 2023
bd9c31a
fix(Locations Editing): add location_id to location shapes
philip-cline Apr 3, 2023
aaf328f
refactor(LocationsLayer): add explanatory comment
philip-cline Apr 4, 2023
286a754
Merge pull request #936 from ibi-group/fix-location-editing-regression
philip-cline Apr 4, 2023
95cdcd3
fix: don’t draw points on drag
miles-grant-ibigroup Apr 12, 2023
565e64c
chore: lint
miles-grant-ibigroup Apr 12, 2023
d5977aa
PriorNoticeLastTime accept Time instead of Number
amy-corson-ibigroup Apr 19, 2023
a7f9de6
fix: flow
amy-corson-ibigroup Apr 19, 2023
97525ab
refactor(EditorMap): move leaflet prototype change outside component
philip-cline Apr 24, 2023
8c54ef4
Merge pull request #940 from ibi-group/fix-draw-on-drag
philip-cline Apr 24, 2023
040db50
Merge pull request #942 from ibi-group/prior-notice-time-field
philip-cline Apr 26, 2023
77fc19a
fix(gtfs fields): add underscore to drop off window fields
philip-cline May 12, 2023
6d49e51
refactor(flex windows): fix capitalization
philip-cline May 16, 2023
422fa01
feat(BookingRules): redesign BR menu
philip-cline Jul 4, 2023
17b1ff8
refactor(BookingRules): Update validation for BookingRules
philip-cline Jul 12, 2023
ecd8c39
refactor(BookingRules): add duration input for flex fields
philip-cline Jul 13, 2023
2fec2e4
refactor(BookingRules): make flow happy
philip-cline Jul 13, 2023
87c2f84
refactor(validation): respond to PR comments
philip-cline Aug 4, 2023
3bf7d14
refactor: Address flow type errors.
binh-dam-ibigroup Aug 7, 2023
9773b7b
refactor(GTFSEntitySelect): sort props
philip-cline Aug 8, 2023
26b4858
refactor(HourMinuteInput): remove component name in method
philip-cline Aug 23, 2023
f3e3261
fix(PatternStopCard): fix flex duration inputs
philip-cline Jul 13, 2023
685fa6b
refactor(PatternStopCard): sort props
philip-cline Aug 3, 2023
afc3491
feat(StopTimeNormalization): bring back st normalization
philip-cline Aug 18, 2023
cf8e2ab
refactor(NormalizeStopTimesModal): add flow fixme
philip-cline Aug 23, 2023
9dc2584
refactor(NormalizeStopTimesModal): use better display names
philip-cline Aug 24, 2023
28ed609
refactor(NormalizeStopTimesModal): add todo
philip-cline Aug 25, 2023
0e2586c
allow stop times with same times for flex
miles-grant-ibigroup Feb 16, 2024
9c034ee
prevent crash
miles-grant-ibigroup Mar 28, 2024
3e51751
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup Apr 4, 2024
9b2f113
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup May 15, 2024
aabc35b
resolve schema update crashes
miles-grant-ibigroup May 15, 2024
fc342df
match server data structure
miles-grant-ibigroup May 15, 2024
de5f50d
clean up pattern card
miles-grant-ibigroup May 15, 2024
c54b3a2
first attempt at implementing new location groups
miles-grant-ibigroup May 17, 2024
c56c2bb
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup May 21, 2024
95b1fb9
Merge branch 'dev-flex-2024' into location-group-may-2024
miles-grant-ibigroup May 21, 2024
10d4ff4
remove unitary `stop_id`, re-unite patternStops
miles-grant-ibigroup Jul 11, 2024
a0800cd
lint
miles-grant-ibigroup Jul 11, 2024
a0e16c2
fix pattern stop adding
miles-grant-ibigroup Jul 18, 2024
d8d8ef5
fix pattern stop location map rendering
miles-grant-ibigroup Jul 18, 2024
bf947a6
correctly label stops/locations
miles-grant-ibigroup Aug 2, 2024
6fa434f
fix pattern stop reordering
miles-grant-ibigroup Aug 7, 2024
71b16ea
correctly handle adding non-stops to pattern
miles-grant-ibigroup Aug 8, 2024
9ff7ee9
correct stopStrategies patternStop pushing
miles-grant-ibigroup Aug 16, 2024
2c78875
send `pattern_id` along with every pattern stop
miles-grant-ibigroup Sep 12, 2024
0c34d0d
Merge branch 'dev' into pattern-location-groups-july-2024
miles-grant-ibigroup Sep 17, 2024
0ad1da4
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup Sep 17, 2024
e5ec45b
inital flow type fixes
daniel-heppner-ibigroup Oct 16, 2024
b705a1a
correct flow issues (non location group)
miles-grant-ibigroup Jan 3, 2025
ee6429c
fix tests
miles-grant-ibigroup Jan 3, 2025
4dae31a
use new `GtfsLocation` where previously `GtfsLocationGroup` was used
miles-grant-ibigroup Jan 3, 2025
04ffe0b
add missing polish
miles-grant-ibigroup Jan 3, 2025
b6f2a91
address pr feedback
miles-grant-ibigroup Feb 7, 2025
6b56a71
address pr comments
miles-grant-ibigroup Feb 10, 2025
535730c
Merge pull request #1017 from ibi-group/pattern-location-groups-july-…
miles-grant-ibigroup Feb 19, 2025
7ec1529
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup Feb 27, 2025
ba9ae93
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup Jun 16, 2025
4fe53d8
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup Aug 13, 2025
521f1af
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup Oct 28, 2025
c0fa5a4
Merge branch 'dev' into dev-flex-2026
binh-dam-ibigroup Jan 28, 2026
52ca9ee
Merge branch 'dev' into dev-flex-2026
binh-dam-ibigroup Jan 28, 2026
f8245ef
fix(CreateFeedSource): Remove duplicate UI field.
binh-dam-ibigroup Jan 29, 2026
57466a9
Merge pull request #1050 from ibi-group/dev-flex-2026
binh-dam-ibigroup Feb 2, 2026
d2c890e
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup May 28, 2026
c4498c4
repair merge
miles-grant-ibigroup Jun 3, 2026
a7b0ca2
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup Aug 3, 2026
658d2ea
remove temporary dev-flex patch
miles-grant-ibigroup Sep 1, 2026
5e55543
address pr feedback
miles-grant-ibigroup Sep 14, 2026
b1a9ed4
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup Sep 28, 2026
76937dd
repair types
miles-grant-ibigroup Sep 28, 2026
3d5bf4b
does this repair the tests
miles-grant-ibigroup Sep 29, 2026
48e0cdb
further project id expectation tweaking
miles-grant-ibigroup Sep 29, 2026
f092168
Revert "further project id expectation tweaking"
miles-grant-ibigroup Sep 29, 2026
30a1c2f
Revert "does this repair the tests"
miles-grant-ibigroup Sep 29, 2026
fad9dad
test to see if test is broken or harness is broken
miles-grant-ibigroup Sep 29, 2026
1846ba3
Merge branch 'dev' into dev-flex-2024
miles-grant-ibigroup Oct 1, 2026
5eb60e4
lint
miles-grant-ibigroup Oct 1, 2026
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
21 changes: 13 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
# CHANGELOG
----------------------

---

## Next
* Support German language and add initial translations.

- Support German language and add initial translations.

## Former
* Fix timetable previous stop time checks from checking text columns.
* Add feature allowing routing to avoid highways.
* Support Polish language and add initial translations.
* Fix bug displaying null continuous_pickup as '0'.
* Add route type selector with new extended GTFS route types.
* Fix bug to update continuous_pickup/dropoff values correctly.

- Fix timetable previous stop time checks from checking text columns.
- Add feature allowing routing to avoid highways.
- ~Support Polish language and add initial translations.~
- Fix bug displaying null continuous_pickup as '0'.
- Add route type selector with new extended GTFS route types.
- Fix bug to update continuous_pickup/dropoff values correctly.
71 changes: 37 additions & 34 deletions __tests__/end-to-end.js
Original file line number Diff line number Diff line change
Expand Up @@ -1099,40 +1099,43 @@ describe('end-to-end', () => {
}, defaultTestTimeout, 'should create a project')

if (doNonEssentialSteps) {
makeTestPostLogin('should delete a project', async () => {
const testProjectToDeleteName = `test-project-that-will-get-deleted-${testTime}`

// navigate to home project view
await goto(
`https://datatools-ui-proxy/home/${testProjectId}`,
{
waitUntil: 'networkidle0'
}
)
await waitForSelector('#context-dropdown')

// create a new project
await createProject(testProjectToDeleteName)

// get the created project id
// go into the project page and verify that it looks ok-ish
const projectEls = await getAllElements('.project-name-editable a')

let projectFound = false
let projectToDeleteId = ''
for (const projectEl of projectEls) {
const innerHtml = await getInnerHTML(projectEl)
if (innerHtml.indexOf(testProjectToDeleteName) > -1) {
const href = await getHref(projectEl)
projectToDeleteId = href.match(/\/project\/([\w-]*)/)[1]
projectFound = true
break
}
}
if (!projectFound) throw new Error('Created project not found')

await deleteProject(projectToDeleteId)
}, defaultTestTimeout, 'should create a project')
// makeTestPostLogin('should delete a project', async () => {
// const testProjectToDeleteName = `test-project-that-will-get-deleted-${testTime}`

// // navigate to home project view
// await goto(
// `https://datatools-ui-proxy/home/${testProjectId}`,
// {
// waitUntil: 'networkidle0'
// }
// )
// await waitForSelector('#context-dropdown')

// // create a new project
// await createProject(testProjectToDeleteName)

// // go back to project list
// await goto('http://localhost:9966/project', {waitUntil: 'networkidle0'})

// // get the created project id
// // go into the project page and verify that it looks ok-ish
// const projectEls = await getAllElements('.project-name-editable a')

// let projectFound = false
// let projectToDeleteId = ''
// for (const projectEl of projectEls) {
// const innerHtml = await getInnerHTML(projectEl)
// if (innerHtml.indexOf(testProjectToDeleteName) > -1) {
// const href = await getHref(projectEl)
// projectToDeleteId = href.match(/\/project\/([\w-]*)/)[1]
// projectFound = true
// break
// }
// }
// if (!projectFound) throw new Error('Created project not found')

// await deleteProject(projectToDeleteId)
// }, defaultTestTimeout, 'should create a project')
}
})

Expand Down
2 changes: 2 additions & 0 deletions __tests__/test-utils/mock-data/store.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {defaultState as defaultEditorSettingsState} from '../../../lib/editor/re
import {defaultState as defaultEditorTimetableState} from '../../../lib/editor/reducers/timetable'
import gtfs from '../../../lib/gtfs/reducers'
import {defaultState as defaultGtfsFilterState} from '../../../lib/gtfs/reducers/filter'
import {defaultState as defaultGtfsLocationsState} from '../../../lib/gtfs/reducers/locations'
import {defaultState as defaultGtfsPatternState} from '../../../lib/gtfs/reducers/patterns'
import {defaultState as defaultGtfsRoutesState} from '../../../lib/gtfs/reducers/routes'
import {defaultState as defaultGtfsShapesState} from '../../../lib/gtfs/reducers/shapes'
Expand Down Expand Up @@ -97,6 +98,7 @@ export function getMockInitialState (): AppState {
},
gtfs: {
filter: defaultGtfsFilterState,
locations: defaultGtfsLocationsState,
patterns: defaultGtfsPatternState,
routes: defaultGtfsRoutesState,
shapes: defaultGtfsShapesState,
Expand Down
Loading
Loading