Merge mtc-deploy into dev #1046
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… latestValidation
…fields Conflicts: i18n/english.yml
…s-manager into mtc-deployment
Conflicts: src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java
Conflicts: src/main/java/com/conveyal/datatools/manager/controllers/DumpController.java
Conflicts: mkdocs.yml pom.xml src/main/client/admin/actions/admin.js src/main/client/admin/components/CreateUser.js src/main/client/admin/components/UserAdmin.js src/main/client/admin/components/UserList.js src/main/client/admin/components/UserSettings.js src/main/client/admin/containers/ActiveUserAdmin.js src/main/client/admin/reducers/admin.js src/main/client/alerts/actions/alerts.js src/main/client/alerts/actions/projects.js src/main/client/alerts/components/AlertEditor.js src/main/client/alerts/components/AlertsList.js src/main/client/alerts/containers/VisibleAlertsList.js src/main/client/alerts/reducers/alerts.js src/main/client/common/components/ManagerPage.js src/main/client/common/containers/App.js src/main/client/gtfs/components/GtfsFilter.js src/main/client/gtfs/reducers/gtfsFilter.js src/main/client/gtfsplus/components/GtfsPlusVersionSummary.js src/main/client/index.tpl.html src/main/client/manager/actions/feeds.js src/main/client/manager/actions/user.js src/main/client/manager/components/FeedSourceViewer.js src/main/client/manager/components/FeedVersionNavigator.js src/main/client/manager/components/ProjectViewer.js src/main/client/manager/reducers/status.js src/main/client/public/components/PublicFeedsViewer.js src/main/client/signs/actions/projects.js src/main/java/com/conveyal/datatools/manager/DataManager.java src/main/java/com/conveyal/datatools/manager/auth/Auth0Users.java src/main/java/com/conveyal/datatools/manager/controllers/api/FeedVersionController.java src/main/java/com/conveyal/datatools/manager/controllers/api/GtfsPlusController.java src/main/java/com/conveyal/datatools/manager/controllers/api/UserController.java src/main/java/com/conveyal/datatools/manager/extensions/mtc/MtcFeedResource.java src/main/java/com/conveyal/datatools/manager/models/ExternalFeedSourceProperty.java src/main/java/com/conveyal/datatools/manager/models/FeedSource.java src/main/java/com/conveyal/datatools/manager/models/FeedVersion.java src/main/java/com/conveyal/datatools/manager/utils/NotificationsUtils.java webpack.config.js
### Checklist - [ ] Appropriate branch selected _(all PRs must first be merged to `dev` before they can be merged to `master`)_ - [ ] Any modified or new methods or classes have helpful JSDoc and code is thoroughly commented - [ ] The description lists all applicable issues this PR seeks to resolve - [ ] The description lists any configuration setting(s) that differ from the default settings - [ ] All tests and CI builds passing - [ ] The description lists all relevant PRs included in this release _(remove this if not merging to master)_ - [ ] e2e tests are all passing _(remove this if not merging to master)_ ### Description Please explain the changes you made here and, if not immediately obvious from the code, how they resolve any referenced issues (and PRs if merging to master). Be sure to include all issues being resolved and any special configuration settings that are need for the software to run properly with these changes.
Add modal to indicate a successful save in GTFS+ editor
…tc-features Isolate MTC features
…rsion is being processed by server
…eed-is-processing fix(FeedVersionActionsMTC): disable publish button if current feed version is being processed by server
…rsion is being processed by server
This reverts commit de85231.
MTC mtc-deploy branch with dev
miles-grant-ibigroup
approved these changes
Nov 6, 2025
Contributor
miles-grant-ibigroup
left a comment
miles-grant-ibigroup
left a comment
There was a problem hiding this comment.
A few small questions
| on: | ||
| push: | ||
| branches: [ "dev", master ] | ||
| branches: [ "dev", master, "mtc-deploy" ] |
Contributor
There was a problem hiding this comment.
Is this still needed?
| # Getting Started | ||
|
|
||
| The GTFS Editor (or Editor) allows users to edit GTFS feeds imported from the Data Manager (see [Managing Project & Feeds](../managing-projects-feeds.md)) or create GTFS feeds completely from scratch. | ||
| ## Getting started |
| */ | ||
| export default function Login ({ | ||
| redirectOnSuccess = window.location.path || '/home' | ||
| redirectOnSuccess = '/home' |
Contributor
There was a problem hiding this comment.
Doesn't this remove support for returning back to a specific feed source you tried to open?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
devbefore they can be merged tomaster)Description
This PR brings the MTC-specific features. The MTC-specific features are enabled/disabled using config (e.g. using the "mtc" extension or other modules.)