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

Hotfix Neon: Load default topics button has incorrect text "Save" #262

Merged
merged 3 commits into from
Sep 18, 2024
Merged

Hotfix Neon: Load default topics button has incorrect text "Save" #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c3c61b
fix
dan-du-car Sep 17, 2024
5b70d31
Updated Docker compose files to point 4.7.3
SaikrishnaBairamoni Sep 17, 2024
6f9ce86
fix unit test
dan-du-car Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ jobs:
run: |
apt-get update
apt-get -y install python3-coverage python3-pip python3-pytest python3-pytest-asyncio
pip3 install pytest==8.0.2
cd src/cda-telematics/telematic_system/telematic_historical_data_processing/rosbag2_processing_service/docker
chmod 777 checkout.sh install.sh
./checkout.sh
Expand All @@ -159,6 +158,7 @@ jobs:
run: |
cd $GITHUB_WORKSPACE/src/cda-telematics/telematic_system/telematic_historical_data_processing/rosbag2_processing_service
source /ws/install/setup.bash
pip3 install pytest==8.0.2
python3 -m coverage run -m pytest
python3 -m coverage xml --omit="/opt/*,/root/*,/tmp/*,/usr/*,/var/*,**/__init__.py"
- name: Find coverage.xml
Expand Down
4 changes: 2 additions & 2 deletions telematic_system/docker-compose.cloud.servers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
context: "./telematic_cloud_messaging"
container_name: messaging_server
#Todo: The cloud messaging service image has incorrect configuration. Please update the application.properties, and build it from source code.
image: usdotfhwastol/telematic_cloud_messaging:carma-system-4.7.2
image: usdotfhwastol/telematic_cloud_messaging:carma-system-4.7.3
depends_on:
- nats
restart: always
Expand All @@ -33,7 +33,7 @@ services:
context: ./telematic_historical_data_processing
dockerfile: Dockerfile
network: host
image: usdotfhwastol/telematic_historical_data_processing:carma-system-4.7.2
image: usdotfhwastol/telematic_historical_data_processing:carma-system-4.7.3
network_mode: host
logging:
options:
Expand Down
12 changes: 6 additions & 6 deletions telematic_system/docker-compose.local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ services:
grafana:
build:
context: "./telematic_apps/grafana"
image: usdotfhwastol/telematic_grafana:carma-system-4.7.2
image: usdotfhwastol/telematic_grafana:carma-system-4.7.3
restart: always
container_name: grafana
logging:
Expand All @@ -74,7 +74,7 @@ services:
build:
context: "./telematic_apps/web_app/server"
dockerfile: "Dockerfile"
image: usdotfhwastol/telematic_web_server:carma-system-4.7.2
image: usdotfhwastol/telematic_web_server:carma-system-4.7.3
restart: always
container_name: web_server
logging:
Expand All @@ -95,7 +95,7 @@ services:
web_client:
build:
context: "./telematic_apps/web_app/client"
image: usdotfhwastol/telematic_web_client:carma-system-4.7.2
image: usdotfhwastol/telematic_web_client:carma-system-4.7.3
restart: always
container_name: web_client
logging:
Expand All @@ -110,7 +110,7 @@ services:
build:
context: "./telematic_apps/apache2"
dockerfile: "./local.Dockerfile"
image: usdotfhwastol/telematic_local_apache2:carma-system-4.7.2
image: usdotfhwastol/telematic_local_apache2:carma-system-4.7.3
restart: always
container_name: apache2
logging:
Expand All @@ -135,7 +135,7 @@ services:
build:
context: "./telematic_cloud_messaging"
container_name: messaging_server
image: usdotfhwastol/telematic_cloud_messaging:carma-system-4.7.2
image: usdotfhwastol/telematic_cloud_messaging:carma-system-4.7.3
depends_on:
- nats
- mysqldb
Expand All @@ -155,7 +155,7 @@ services:
context: ./telematic_historical_data_processing
dockerfile: Dockerfile
network: host
image: usdotfhwastol/telematic_historical_data_processing:carma-system-4.7.2
image: usdotfhwastol/telematic_historical_data_processing:carma-system-4.7.3
container_name: rosbag2_processing_service
restart: always
depends_on:
Expand Down
6 changes: 3 additions & 3 deletions telematic_system/docker-compose.units.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
build:
context: ./telematic_units/carma_vehicle_bridge
dockerfile: Dockerfile
image: usdotfhwastol/carma_vehicle_nats_bridge:carma-system-4.7.2
image: usdotfhwastol/carma_vehicle_nats_bridge:carma-system-4.7.3
logging:
options:
max-size: "2g"
Expand Down Expand Up @@ -32,7 +32,7 @@ services:
build:
context: ./telematic_units/carma_street_bridge
dockerfile: Dockerfile
image: usdotfhwastol/carma_street_nats_bridge:carma-system-4.7.2
image: usdotfhwastol/carma_street_nats_bridge:carma-system-4.7.3
logging:
options:
max-size: "2g"
Expand Down Expand Up @@ -60,7 +60,7 @@ services:
build:
context: ./telematic_units/carma_cloud_bridge
dockerfile: Dockerfile
image: usdotfhwastol/carma_cloud_nats_bridge:carma-system-4.7.2
image: usdotfhwastol/carma_cloud_nats_bridge:carma-system-4.7.3
logging:
options:
max-size: "2g"
Expand Down
8 changes: 4 additions & 4 deletions telematic_system/docker-compose.webapp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
context: "./telematic_apps/web_app/server"
restart: always
container_name: web_server
image: usdotfhwastol/telematic_web_server:carma-system-4.7.2
image: usdotfhwastol/telematic_web_server:carma-system-4.7.3
logging:
options:
max-size: "10m"
Expand Down Expand Up @@ -48,7 +48,7 @@ services:
web_client:
build:
context: "./telematic_apps/web_app/client"
image: usdotfhwastol/telematic_web_client:carma-system-4.7.2
image: usdotfhwastol/telematic_web_client:carma-system-4.7.3
restart: always
container_name: web_client
logging:
Expand All @@ -65,7 +65,7 @@ services:
build:
context: "./telematic_apps/apache2"
restart: always
image: usdotfhwastol/telematic_apache2:carma-system-4.7.2
image: usdotfhwastol/telematic_apache2:carma-system-4.7.3
container_name: apache2
logging:
options:
Expand All @@ -88,7 +88,7 @@ services:
grafana:
build:
context: "./telematic_apps/grafana"
image: usdotfhwastol/telematic_grafana:carma-system-4.7.2
image: usdotfhwastol/telematic_grafana:carma-system-4.7.3
restart: always
container_name: grafana
logging:
Expand Down
2 changes: 1 addition & 1 deletion telematic_system/telematic_apps/web_app/client/src/components/topics/DefaultTopicSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const DefaultTopicSettings = (props) => {
<React.Fragment>
<Stack spacing={1} direction="row" sx={{ float: 'right' }}>
<CustomizedButton title="Default topic setting: Given an event and units, updating the list of selected topics to default selected topics for the units." onClick={saveDefaultSeletedTopicsHandler} >Save</CustomizedButton>
<CustomizedButton title="Default topic setting: Given an event and units, loading the default list of selected topics for the units." onClick={loadDefaultSelectedTopicsHandler} >Save</CustomizedButton>
<CustomizedButton title="Default topic setting: Given an event and units, loading the default list of selected topics for the units." onClick={loadDefaultSelectedTopicsHandler} >Load</CustomizedButton>
</Stack>
{isSaved || isLoaded ? <Typography sx={{ color: 'green', float: 'right', display: 'inline-flex' }}>{msg}</Typography> : <Typography sx={{ color: 'red', float: 'right' }}>{msg}</Typography>}
</React.Fragment>
Expand Down
Loading