MTC mtc-deploy branch with dev #1032

binh-dam-ibigroup · 2025-05-22T19:23:12Z

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".

…tion Add custom file and preserve fields transformations

…nfigs

…figs

…-time refactor: show csv upload time

…ing.

miles-grant-ibigroup

Tested and working!

daniel-heppner-ibigroup

I had a look at this, then ran it through CodeRabbit and it found a bunch of things that I didn't see! I'm quite impressed with its ability to grok the whole codebase and generate high quality review comments.

daniel-heppner-ibigroup · 2025-07-09T09:53:40Z

lib/common/components/ExportPatternsModal.js

+
+  publish (publishProprietaryFiles: boolean) {
+    const { createFeedVersionFromSnapshot, feedSource } = this.props
+    this.state.snapshot && createFeedVersionFromSnapshot(feedSource, this.state.snapshot.id, publishProprietaryFiles)


Are we worried about this failing silently if snapshot is null?

There is another comment in this file explaining how it is triggered by a snapshot class.

daniel-heppner-ibigroup · 2025-07-09T09:54:24Z

lib/common/components/ExportPatternsModal.js

+    return (
+      <Modal show={this.state.showModal} onHide={this.close}>
+        <Body style={{display: 'flex'}}>
+          <Title>{this.messages('exportPatterns')}</Title>


Should the title be in the body?

I think this particular layout is intentional (see screenshot below).

lib/editor/components/ExceptionDateRange.js

daniel-heppner-ibigroup · 2025-07-09T10:15:57Z

lib/editor/components/timetable/TripSeriesModal.js

+    // Check the input to make sure it's within the valid range.
+    let input = +evt.target.value
+    if (isNaN(input)) return null
+    if (input > autoBlockIdIncrement) input = autoBlockIdIncrement


the starting block ID is limited to be at most the auto increment value, but the starting ID could be whatever the user wants. (from coderabbit)

What is the requested fix here?

This field is for the starting point for the block ID, right? Then it gets auto incremented by autoBlockIdIncrement. But this line prevents the starting point from being greater than autoBlockIdIncrement, which seems wrong. I would think the starting point could be anything you want as long as it's a number and positive, right?

@daniel-heppner-ibigroup Want to open an issue to resolve in the dev branch?

lib/editor/components/timetable/TimetableEditor.js

daniel-heppner-ibigroup · 2025-07-09T10:28:03Z

docs/dev/development.md

+
+The e2e tests have been Dockerized, which allows them to be run easily anywhere `docker compose` works. To run them on localhost, first create a `.env` file in the `__tests__/e2e`. `docker compose` will alert you as to which variables must be present.
+
+To run the tests, run `docker compose -f docker compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.


extra space between docker and compose

I have only fixed the file reference in a2f26cb.

daniel-heppner-ibigroup · 2025-07-09T10:30:34Z

lib/admin/components/OrganizationSettings.js

@@ -130,7 +129,7 @@ export default class OrganizationSettings extends Component<Props, State> {
          </FormGroup>
          <h4>{this.messages('subDetails')}</h4>
          <FormGroup>
-            <ControlLabel style={{marginRight: '5px'}}>Usage tier</ControlLabel>
+            <ControlLabel style={{marginRight: '5px'}}>this.messages('usageTier.title')}</ControlLabel>


missing {} around the message!

I think the code rabbit got a bit confused :) DT's language model doesn't need brackets

uhhhh are you sure? I think it does. Look just above on line 130, it has {} (this was a daniel comment not code rabbit)
In fact, on this line there is a closing bracket but no opening bracket.

Oh I see what you mean now. Missing opening bracket!

This one would have been tricky to find! => c2a7c03

daniel-heppner-ibigroup · 2025-07-09T10:31:42Z

lib/common/components/Login.js

+ * in the `redirectOnSuccess` prop (or to the previously active URL or `/home` if none is specified).
+ */
+export default function Login ({
+  redirectOnSuccess = window.location.path || '/home'


should be window.location.pathname (or just remove that and let the default be /home)

Yeah that window.location was incorrect, but we could remove the component entirely subsequently. (11e1879)

daniel-heppner-ibigroup · 2025-07-09T10:41:52Z

lib/common/components/StatusModal.js

        title: ''
      })
    }, 500)
  }

  _handleReLock = () => {
+    // Close modal before executing actions.
+    this.close()
    // Calling removeEditorLock with null feedId will use current editor


outdated comment

the feed ID won't be null because there's a null check on the next line

Fixed in 4d17f6f

binh-dam-ibigroup · 2025-07-16T17:39:42Z

I had a look at this, then ran it through CodeRabbit and it found a bunch of things that I didn't see!

The findings you indicated are probably on the devbranch too. I am okay with waiting to merge mtc-deploy into dev in a subsequent PR to fix them there.

Add mastarm eslint

daniel-heppner-ibigroup

Great work! Thanks for the fixes. I'll leave the last one up to you if you think it's wrong logic.

binh-dam-ibigroup · 2025-07-24T12:26:37Z

Holding on merging this PR until client gets to review UI changes.

miles-grant-ibigroup and others added 30 commits July 3, 2023 10:17

refactor: cleanup UX

b762705

test: fix flow issue

d95acfc

test: update snapshots

fdbbcb7

refactor: only allow plain text custom_name.txt files

ef26ebf

feat(exception ranges): i18n ExceptionDateRange

2c17fca

fix(Exception ranges): allow exception range overlap

91d6379

refactor(transformations): respond to PR comments

51e47ec

Merge pull request #950 from ibi-group/add-preserve-fields-transforma…

f586b36

…tion Add custom file and preserve fields transformations

refactor(i18n): add keys to other lang files

9385ecc

refactor(validation): correct positive int error string

6c90708

feat(TripSeriesModal): auto assign trip IDs

a1b7d2b

refactor: address pr feedback

c61a3e2

refactor(TripSeriesModal): add increment amount

3c894aa

refactor(TripSeriesModal): Disable for freq service

c5c9532

refactor(LocalUserRetriever): Provide local user info for non-auth co…

fd85a0e

…nfigs

refactor(PublicHeader): Hide logout button on non-auth configs

dee0615

refactor(ExceptionRangeOverlap): limit the number of errors

8b74659

refactor(ExceptionDate): i18n exception date

fb3d19e

refactor(ExceptionErrors): add shared component

ca65fa9

refactor(UserButtons): Hide logout button on non-auth configs

617833a

refactor(UserAccount): Hide most user account content on non-auth con…

3954164

…figs

refactor(LocalUserRetriever): Use same email as backend.

a895298

refactor(AdminPage): Hide user list on non-auth configs

398d8f9

refactor(ApplicationStatus): Hide Auth0 link on non-auth configs

a67add3

refactor(WatchButton): Hide watch button on no-auth configs

184dbbf

refactor(wrapComponentInAuthStrategy): Relax some admin checks.

6ad320a

Merge pull request #960 from ibi-group/pelias-panel-show-csv-uploaded…

4888a13

…-time refactor: show csv upload time

refactor(editor/util/ui.js): Revert unneeded changes.

8b56c67

refactor(manager/util/index): Only check user perms for enabling edit…

cf1471d

…ing.

refactor(FeedSourceTable): Evaluate admin only using user perms.

62d2dad

refactor(editor/util/gtfs): Add comment for MTC-specific behavior.

f099b48

miles-grant-ibigroup approved these changes Jun 3, 2025

View reviewed changes

binh-dam-ibigroup removed their assignment Jun 4, 2025

binh-dam-ibigroup requested a review from daniel-heppner-ibigroup June 4, 2025 21:27

binh-dam-ibigroup added 2 commits June 17, 2025 10:41

Merge branch 'mtc-deploy' into mtc-deploy-with-dev

5a9ae45

Merge branch 'mtc-deploy' into mtc-deploy-with-dev

ead7279

daniel-heppner-ibigroup requested changes Jul 9, 2025

View reviewed changes

daniel-heppner-ibigroup assigned binh-dam-ibigroup and unassigned daniel-heppner-ibigroup Jul 9, 2025

binh-dam-ibigroup added 8 commits July 16, 2025 10:48

Merge branch 'mtc-deploy' into mtc-deploy-with-dev

927c4f3

docs(StatusModal): Remove obsolete comment.

4d17f6f

refactor(Login): Make Login component always redirect to /home.

11e1879

fix(OrganizationSettings): Add missing brackets

c2a7c03

docs(development.md): Fix docker-compose.yml reference

a2f26cb

fix(TimetableEditor): Fix plural swap

83fbd3d

refactor(ExceptionDateRange): Remove duplicate condition

fa615c7

fix(ExceptionDateRange): Pass correct props to input

b3e3359

binh-dam-ibigroup requested a review from daniel-heppner-ibigroup July 16, 2025 17:37

binh-dam-ibigroup assigned daniel-heppner-ibigroup and unassigned binh-dam-ibigroup Jul 16, 2025

miles-grant-ibigroup and others added 2 commits July 17, 2025 13:27

add mastarm eslint

a027a6a

Merge pull request #1037 from ibi-group/add-correct-eslint

7cba9bf

Add mastarm eslint

daniel-heppner-ibigroup approved these changes Jul 22, 2025

View reviewed changes

daniel-heppner-ibigroup assigned binh-dam-ibigroup and unassigned daniel-heppner-ibigroup Jul 22, 2025

Merge branch 'dev' into mtc-deploy-with-dev

b45e38e

binh-dam-ibigroup added the Pending ext. approval label Jul 24, 2025

binh-dam-ibigroup mentioned this pull request Aug 14, 2025

Isolate MTC features #1038

Open

5 tasks


		The e2e tests have been Dockerized, which allows them to be run easily anywhere `docker compose` works. To run them on localhost, first create a `.env` file in the `__tests__/e2e`. `docker compose` will alert you as to which variables must be present.

		To run the tests, run `docker compose -f docker compose.yml up --abort-on-container-exit` in the `__tests__/e2e/` directory.

MTC mtc-deploy branch with dev #1032

Are you sure you want to change the base?

MTC mtc-deploy branch with dev #1032

Uh oh!

Conversation

binh-dam-ibigroup commented May 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Description

Uh oh!

miles-grant-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

daniel-heppner-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

daniel-heppner-ibigroup Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup commented Jul 16, 2025

Uh oh!

daniel-heppner-ibigroup left a comment

Choose a reason for hiding this comment

Uh oh!

binh-dam-ibigroup commented Jul 24, 2025

Uh oh!

Uh oh!

binh-dam-ibigroup commented May 22, 2025 •

edited

Loading

daniel-heppner-ibigroup Jul 9, 2025 •

edited

Loading