Skip to content
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

Conflict Visualizer Integration, Commsignia OBU OTA Support & Custom Email Features #24

Merged
merged 242 commits into from
Sep 9, 2024
Merged

Conflict Visualizer Integration, Commsignia OBU OTA Support & Custom Email Features #24

merged 242 commits into from
Sep 9, 2024

Conversation

dmccoystephenson
Copy link
Collaborator

PR Details

Description

This PR integrates the jpo-conflictvisualizer web application directly into the CV Manager, adds support for the Commsignia OBU OTA firmware server, introduces customizable user and organization-level emails, and implements Material UI theming. The integration of the jpo-conflictvisualizer requires updates to the docker-compose file to support the expanded services. Documentation for the jpo-conflictvisualizer is available in its repository, with plans to integrate it into the CV Manager in the future. The OBU OTA server is currently limited to Commsignia devices, and organization-level email settings override user-level customizations. Additionally, various smaller changes and bug fixes are included.

How Has This Been Tested?

These changes have been tested using unit tests, local deployments & CDOT GCP deployments.

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • My changes require new environment variables:
    • I have updated the docker-compose, K8s YAML, and all dependent deployment configuration files.
  • My changes require updates to the documentation:
    • I have updated the documentation accordingly.
  • My changes require updates and/or additions to the unit tests:
    • I have modified/added tests to cover my changes.
  • All existing tests pass.

jacob6838 and others added 30 commits March 5, 2024 08:55
@jacob6838
Adding conflictvisualizer map page to cvmanager
ae052a8
@jacob6838
sync'ing map properties with side panel
1a4e3df
@jacob6838
Updating map source data type and adding rsu_ip
0460329
@jacob6838
Fixing notification type
f4ddb56
@jacob6838
Updating environment variables, breaking out intersection list/ids in…
7f43edd 
…to shared slice
@jacob6838
Merge branch 'page-routing' into conflictvisualizer-map-page
87217d5
@jacob6838
Updating keycloak config with conflictvisualizer roles
da59af9
@jacob6838
Updating documentation for conflictvisualizer integration
f5317bd
@jacob6838
Adding intersections to main map page
fb04c08
@jacob6838
Adding payload types to rsu slice
e7f726a
@jacob6838
Improving intersection map data type selector
0145d4d
@Michael7371
init commit for obu ota server
f450bb6
@jacob6838
Fully working CIMMS map page!
84392ae
@jacob6838
Merge branch 'develop' into conflictvisualizer-map-page
e7ac82a
@jacob6838
Updating setBsmFilterStep
37354fd
@jacob6838
Updating dockerfile with new env vars
d325a00
@Michael7371
updating ota server unit tests
82ede15
@jacob6838
Fixing various warnings
dcfff87
@jacob6838
Updating BSM counts start/end time text color
d8b9f69
@Michael7371
updates with unit tests
6691d93 
added unit tests
added docker compose to spin up local deployment
tested on k8 cluster
@mwodahl
Add docker-compose-mongo.yml for local MongoDB support
d3e7377
@mwodahl
Update mongo-setup image
67ec16d
@jacob6838
Merge branch 'develop' into conflictvisualizer-map-page
e99e27c
@jacob6838
Updating errors in type definitions
cfc9f7c
@jacob6838
Merging recent conflictvisualizer changes
0eff4c6
@jacob6838
Fixing cviz bsm colors error
cb333b5
@jacob6838
Tweaking cimms popup display
75feb32
@jacob6838
Fixing PR comments, removing comments
d653c7d
@jacob6838
Removing unnecessary images, updating documentation
b36ea67
@jacob6838
Removing updateGeoMsg comments and prints
63366da
jacob6838 and others added 27 commits August 22, 2024 13:04
@jacob6838
Updating conflictmonitor documentation
d5b6ace
@jacob6838
Fixing assessment tooltips and data selector graph
c76f070
@jacob6838
Merge branch 'cimms-dashboard' of https://github.com/CDOT-CV/jpo-cvma…
2ee93d5 
…nager into cimms-dashboard
@jacob6838
removing ODE_KAFKA_BROKERS variable
2262015
@jacob6838
Updating docker compose --build documentation
1bd43b9
@jacob6838
Adding configurable CM_STARTUP_DELAY
dd8f9bf
@jacob6838
Removing mongodb restore wait
dcc1a63
@payneBrandon
Merge pull request #93 from CDOT-CV/cimms-dashboard
2af4570 
Cimms dashboard
@jacob6838
Removing unnecessary code comments
213051d
@Michael7371
fix broken unit tests
4fb7ace
@drewjj
Update the webapp tests to resolve failing checks
380b214
@mwodahl
merge branch 'develop' into Feature/emailer-customization
3c1f136
@jacob6838
Increasing keycloak docker max retries
a212f7d
@payneBrandon
Merge pull request #58 from CDOT-CV/conflictvisualizer-map-page
7f9abf3 
Conflictvisualizer Map Page Integration
@drewjj
Merge remote-tracking branch 'origin/develop' into Feature/mui-dialogs
a4b5a5a
@drewjj
Update headers while dialog boxes are open
ad3c0d0
@payneBrandon
Merge pull request #101 from CDOT-CV:Feature/org-emails
a709942 
Organization Emails
@drewjj
Merge pull request #95 from CDOT-CV/Feature/mui-dialogs
89fd441 
Add Material UI Dialogs
@drewjj
Merge remote-tracking branch 'origin/develop' into Feature/emailer-cu…
c5311df 
…stomization
@drewjj
Update branch to fix pages after the changes made to resolve merge co…
077dad5 
…nflicts
@drewjj
Remove comment
6ad03c3
@mwodahl
Remove unnecessary rows, pull notification data on first render
bb32020
@drewjj
Merge pull request #81 from CDOT-CV/Feature/emailer-customization
05e46e5 
Add emailer customization menu
@drewjj
Added release notes
4f209aa
@drewjj
Merge remote-tracking branch 'upstream/develop' into Update/release-n…
368d5ea 
…otes-1.4.0
@drewjj
Resolve failing test
0865ce7
@drewjj
Merge pull request #102 from CDOT-CV/Update/release-notes-1.4.0
cbb082c 
Release Notes 1.4.0 And Resolve Upstream Conflicts
drewjj
drewjj approved these changes Sep 9, 2024
View reviewed changes
Copy link
Collaborator

@drewjj drewjj left a comment

Choose a reason for hiding this comment

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

Very excited to get this into the USDOT repo!

@drewjj drewjj merged commit a029096 into usdot-jpo-ode:develop Sep 9, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drewjj drewjj drewjj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dmccoystephenson @drewjj @jacob6838 @Michael7371 @mwodahl @payneBrandon