Skip to content

MTC mtc-deploy branch with dev #1032

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

Jump to bottom
Open
wants to merge 798 commits into
base: mtc-deploy
Choose a base branch
from
Open

MTC mtc-deploy branch with dev #1032

wants to merge 798 commits into from

Conversation

binh-dam-ibigroup
Copy link
Contributor

@binh-dam-ibigroup binh-dam-ibigroup commented May 22, 2025 •
edited
Loading

Checklist

  • Appropriate branch selected => Updating the mtc-deploy branch at this time
  • [na] Any modified or new methods or classes have helpful JSDoc and code is thoroughly commented
  • [na] The description lists all applicable issues this PR seeks to resolve
  • [na] The description lists any configuration setting(s) that differ from the default settings
  • All tests and CI builds passing

Description

This PR brings changes from the dev branch to the mtc-deploy branch and resolves conflicts between the two branches.

Many of the changes are just i18n, improved Flow types, or Bootstrap syntax updates, so when you see them you can just skim them. Weird indents are sometimes brought in from the dev branch, I have not really attempted to fix them.

A few things that needed to be fixed in this PR for the MTC UI to work:

  • Alerts Viewer UI was updated to newest bootstrap syntax (so that the collapsible panes for each alert keep working)
  • The AppInfoRetriever component is modified to wrap the app contents, so that nothing is rendered until the app info JSON is downloaded and customizations can be applied (e.g. title, logo, link to alerts module).
  • When creating a new route in the GTFS editor, the following defaults are maintained: route status = "in progress", route approval state = "not approved".

philip-cline and others added 30 commits June 28, 2023 10:37
@philip-cline
refactor(transformation): pass strings as props
2909ffe
@philip-cline
refactor(i18n): add all keys to translations
84d80dd
@philip-cline
refactor(i18n): refactor translation files
2cf3bb9
@miles-grant-ibigroup
refactor: show csv upload time
94a0027
@philip-cline
refactor(transformations): respond to PR comments
d605d34
@philip-cline
Merge pull request #959 from ibi-group/make-timepoint-defaults-zero
6480e6f 
Make Timepoint Default Value 0
@miles-grant-ibigroup
refactor: pelias synonyms
fbf4578
@miles-grant-ibigroup
Merge branch 'dev' into auth-disable
d5445ab
@miles-grant-ibigroup
1-click docker!
af4e9a6
@philip-cline
refactor(transformation results): show new transform results
44807e7
@daniel-heppner-ibigroup
add persistence to docker-compose
c7d2db4
@philip-cline
refactor(transformations): add error for including .txt
2d62c9f
@miles-grant-ibigroup
refactor: cleanup UX
b762705
@miles-grant-ibigroup
test: fix flow issue
d95acfc
@miles-grant-ibigroup
test: update snapshots
fdbbcb7
@miles-grant-ibigroup
refactor: only allow plain text custom_name.txt files
ef26ebf
@philip-cline
feat(exception ranges): i18n ExceptionDateRange
2c17fca
@philip-cline
fix(Exception ranges): allow exception range overlap
91d6379
@philip-cline
refactor(transformations): respond to PR comments
51e47ec
@philip-cline
Merge pull request #950 from ibi-group/add-preserve-fields-transforma…
f586b36 
…tion

Add custom file and preserve fields transformations
@philip-cline
refactor(i18n): add keys to other lang files
9385ecc
@philip-cline
refactor(validation): correct positive int error string
6c90708
@philip-cline
feat(TripSeriesModal): auto assign trip IDs
a1b7d2b
@miles-grant-ibigroup
refactor: address pr feedback
c61a3e2
@philip-cline
refactor(TripSeriesModal): add increment amount
3c894aa
@philip-cline
refactor(TripSeriesModal): Disable for freq service
c5c9532
@binh-dam-ibigroup
refactor(LocalUserRetriever): Provide local user info for non-auth co…
fd85a0e 
…nfigs
@binh-dam-ibigroup
refactor(PublicHeader): Hide logout button on non-auth configs
dee0615
@philip-cline
refactor(ExceptionRangeOverlap): limit the number of errors
8b74659
@philip-cline
refactor(ExceptionDate): i18n exception date
fb3d19e
danielhep and others added 16 commits April 18, 2025 14:24
@danielhep
styling and formatting improvements
473ec33
@danielhep
fix missing translations
c11a00a
@danielhep
remove extra .zip in placeholder
2bfc376
@danielhep
adjust regex to completely disallow . from filename
bd6b320
@daniel-heppner-ibigroup
Merge pull request #1030 from ibi-group/override-feed-filenames
70adc13 
feat: support overriding feed filenames
@binh-dam-ibigroup
Merge branch 'dev' into mtc-deploy-with-dev
c068be8
@binh-dam-ibigroup
chore(i18n): Fix language entry mismatches
7aa10fa
@binh-dam-ibigroup
ci(codeql): Enable CodeQL analysis on mtc-deploy branch
db184cd
@binh-dam-ibigroup
ci(codeql): Enable CodeQL Analysis on push to mtc-deploy
cf7e05b
@binh-dam-ibigroup
chore(env.yml.tmp): Group MAP_BASE_URL and GRAPH_HOPPER_* entries tog…
2dd1ade 
…ether.
@binh-dam-ibigroup
fix(AlertPreview): Restore collapsible feature for alert entries.
7976756
@binh-dam-ibigroup
refactor(AlertPreview): Remove unused prop
f8810a9
@binh-dam-ibigroup
fix(App): Fix fetching app customizations on page load
2fba5b7
@binh-dam-ibigroup
style(NormalizeStopTimesModal): Fix type decl indent
e2c5d1f
@binh-dam-ibigroup
fix(editor/util/gtfs): Revert route editor initial approval/published…
64f574d 
… states
@binh-dam-ibigroup
style(NotesViewer): Revert indent
b698b47
@binh-dam-ibigroup binh-dam-ibigroup marked this pull request as ready for review May 29, 2025 16:07
miles-grant-ibigroup
miles-grant-ibigroup requested changes Jun 2, 2025
View reviewed changes
Copy link
Contributor

@miles-grant-ibigroup miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

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

Haven't tested yet, but code-wise I think there is one glaring thing to fix first

miles-grant-ibigroup
miles-grant-ibigroup approved these changes Jun 3, 2025
View reviewed changes
Copy link
Contributor

@miles-grant-ibigroup miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

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

Tested and working!

@binh-dam-ibigroup binh-dam-ibigroup removed their assignment Jun 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@miles-grant-ibigroup miles-grant-ibigroup miles-grant-ibigroup approved these changes

@daniel-heppner-ibigroup daniel-heppner-ibigroup Awaiting requested review from daniel-heppner-ibigroup

Assignees

@daniel-heppner-ibigroup daniel-heppner-ibigroup

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@binh-dam-ibigroup @AdrianaCeric @philip-cline @miles-grant-ibigroup @daniel-heppner-ibigroup @Aletor93 @danielhep