Skip to content

Production-ready Flex - #1067

Merged
miles-grant-ibigroup merged 316 commits into
devfrom
dev-flex-2024
Oct 2, 2026
Merged

miles-grant-ibigroup merged 316 commits into
devfrom
dev-flex-2024

Conversation

@miles-grant-ibigroup

@miles-grant-ibigroup miles-grant-ibigroup commented Sep 1, 2026 •

Copy link
Copy Markdown
Contributor

Merges flex into dev! Only 4 years late

e2e tests should pass once ibi-group/datatools-server#666 is merged

miles-grant-ibigroup and others added 30 commits January 26, 2022 10:36
… for a single location

Allow timetable editing for a single location & fix some issues with constructing a new trip
timetable row.
@miles-grant-ibigroup miles-grant-ibigroup self-assigned this Sep 1, 2026

@binh-dam-ibigroup binh-dam-ibigroup left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One bad merge, some light refactors, and a few instances where use of i18n messages should continue. I give a pass on sooo many TODOs, formatting and prop ordering.

Comment thread lib/editor/components/map/EditorMap.js
Comment thread lib/editor/components/pattern/EditShapePanel.js Outdated
Comment thread lib/editor/components/pattern/PatternStopContainer.js Outdated
Comment thread lib/editor/components/pattern/PatternStopsPanel.js Outdated
Comment thread lib/editor/components/timetable/TimetableEditor.js
Comment thread lib/editor/util/gtfs.js Outdated
Comment thread lib/editor/util/index.js
Comment thread lib/editor/util/map.js Outdated
Comment thread lib/manager/components/deployment/CurrentDeploymentPanel.js
Comment thread lib/types/reducers.js Outdated

@binh-dam-ibigroup binh-dam-ibigroup left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving pending server-side PRs I have to review!

# Conflicts:
#	lib/editor/actions/editor.js
#	lib/editor/components/EditorSidebar.js
#	lib/editor/components/EntityListSecondaryActions.js
#	lib/editor/selectors/index.js
race condition in the server sometimes means the expected project deletion confirmation doesn’t appear
@miles-grant-ibigroup
miles-grant-ibigroup merged commit 8cab058 into dev Oct 2, 2026
5 checks passed
@miles-grant-ibigroup
miles-grant-ibigroup deleted the dev-flex-2024 branch October 2, 2026 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants