This is an automated email to report yesterday's ODE message counts for J2735 messages going in and out of the ODE. " + "In counts are the number of encoded messages received by the ODE from the load balancer. " + "Out counts are the number of decoded messages that have come out of the ODE in JSON form and " + "are available for querying in mongoDB. Ideally, these two counts should be identical. " + "Although, some deviation is expected due to count recording timings. Outbound counts exceeding " + "5% deviation with their corresponding inbound counts will be marked red. Outbound counts within the 5% deviation will be marked " + "green. Map and TIM Out counts are deduplicated so these are going to be lower at 1 per hour. The deviation is normalized with this in mind. " + 'Any RSUs with a road name of "Unknown" are not recorded in the PostgreSQL database and might need to be added.
' + "This is an automated email to report yesterday's ODE message counts for J2735 messages going in and out of the ODE. " + "In counts are the number of encoded messages received by the ODE from the load balancer. " + "Out counts are the number of decoded messages that have come out of the ODE in JSON form and " + "are available for querying in mongoDB. Ideally, these two counts should be identical. " + "Although, some deviation is expected due to count recording timings. Outbound counts exceeding " + "5% deviation with their corresponding inbound counts will be marked red. Outbound counts within the 5% deviation will be marked " + "green. Map and TIM Out counts are deduplicated so these are going to be lower at 1 per hour. The deviation is normalized with this in mind. " + 'Any RSUs with a road name of "Unknown" are not recorded in the PostgreSQL database and might need to be added.
' + "{successMsg}
} - {errorState &&Error: {errorMessage}
} + {successMsg && ( ++ {successMsg} +
+ )} + {errorState && ( ++ Error: {errorMessage} +
+ )}- - Protocol: - -
{errors.name.message}
} + {errors.name && ( ++ {errors.name.message} +
+ )} - {successMsg &&{successMsg}
} - {errorState &&Failed to add organization due to error: {errorMsg}
} + {successMsg && ( ++ {successMsg} +
+ )} + {errorState && ( ++ Failed to add organization due to error: {errorMsg} +
+ )}
Failed to add rsu due to error:
diff --git a/webapp/src/features/adminAddRsu/adminAddRsuSlice.test.ts b/webapp/src/features/adminAddRsu/adminAddRsuSlice.test.ts
index 297527f5..76105964 100644
--- a/webapp/src/features/adminAddRsu/adminAddRsuSlice.test.ts
+++ b/webapp/src/features/adminAddRsu/adminAddRsuSlice.test.ts
@@ -54,12 +54,12 @@ describe('admin add RSU reducer', () => {
apiData: {},
errorState: false,
errorMsg: '',
- selectedRoute: 'Select Route',
+ selectedRoute: 'Select Route (Required)',
otherRouteDisabled: true,
- selectedModel: 'Select RSU Model',
- selectedSshGroup: 'Select SSH Group',
- selectedSnmpGroup: 'Select SNMP Group',
- selectedSnmpVersion: 'Select SNMP Version',
+ selectedModel: 'Select RSU Model (Required)',
+ selectedSshGroup: 'Select SSH Group (Required)',
+ selectedSnmpGroup: 'Select SNMP Group (Required)',
+ selectedSnmpVersion: 'Select SNMP Version (Required)',
selectedOrganizations: [],
submitAttempt: false,
},
@@ -384,7 +384,7 @@ describe('functions', () => {
expect(
checkForm({
value: {
- selectedRoute: 'Select Route',
+ selectedRoute: 'Select Route (Required)',
},
} as any)
).toEqual(false)
@@ -394,7 +394,7 @@ describe('functions', () => {
expect(
checkForm({
value: {
- selectedModel: 'Select RSU Model',
+ selectedModel: 'Select RSU Model (Required)',
},
} as any)
).toEqual(false)
@@ -404,7 +404,7 @@ describe('functions', () => {
expect(
checkForm({
value: {
- selectedSshGroup: 'Select SSH Group',
+ selectedSshGroup: 'Select SSH Group (Required)',
},
} as any)
).toEqual(false)
@@ -414,7 +414,7 @@ describe('functions', () => {
expect(
checkForm({
value: {
- selectedSnmpGroup: 'Select SNMP Group',
+ selectedSnmpGroup: 'Select SNMP Group (Required)',
},
} as any)
).toEqual(false)
@@ -424,7 +424,7 @@ describe('functions', () => {
expect(
checkForm({
value: {
- selectedSnmpVersion: 'Select SNMP Version',
+ selectedSnmpVersion: 'Select SNMP Version (Required)',
},
} as any)
).toEqual(false)
@@ -624,12 +624,12 @@ describe('reducers', () => {
})
it('resetForm reducer updates state correctly', async () => {
- const selectedRoute = 'Select Route'
+ const selectedRoute = 'Select Route (Required)'
const otherRouteDisabled = false
- const selectedModel = 'Select RSU Model'
- const selectedSshGroup = 'Select SSH Group'
- const selectedSnmpGroup = 'Select SNMP Group'
- const selectedSnmpVersion = 'Select SNMP Version'
+ const selectedModel = 'Select RSU Model (Required)'
+ const selectedSshGroup = 'Select SSH Group (Required)'
+ const selectedSnmpGroup = 'Select SNMP Group (Required)'
+ const selectedSnmpVersion = 'Select SNMP Version (Required)'
const selectedOrganizations = [] as any
expect(reducer(initialState, resetForm(selectedOrganizations))).toEqual({
...initialState,
diff --git a/webapp/src/features/adminAddRsu/adminAddRsuSlice.tsx b/webapp/src/features/adminAddRsu/adminAddRsuSlice.tsx
index 1f8dcf7d..48271fdc 100644
--- a/webapp/src/features/adminAddRsu/adminAddRsuSlice.tsx
+++ b/webapp/src/features/adminAddRsu/adminAddRsuSlice.tsx
@@ -48,12 +48,12 @@ const initialState = {
apiData: {} as AdminRsuKeyedCreationInfo,
errorState: false,
errorMsg: '',
- selectedRoute: 'Select Route',
+ selectedRoute: 'Select Route (Required)',
otherRouteDisabled: true,
- selectedModel: 'Select RSU Model',
- selectedSshGroup: 'Select SSH Group',
- selectedSnmpGroup: 'Select SNMP Group',
- selectedSnmpVersion: 'Select SNMP Version',
+ selectedModel: 'Select RSU Model (Required)',
+ selectedSshGroup: 'Select SSH Group (Required)',
+ selectedSnmpGroup: 'Select SNMP Group (Required)',
+ selectedSnmpVersion: 'Select SNMP Version (Required)',
selectedOrganizations: [] as AdminRsuKeyedCreationInfo['organizations'],
submitAttempt: false,
}
@@ -115,15 +115,15 @@ export const updateApiJson = (apiJson: AdminRsuCreationInfo): AdminRsuKeyedCreat
}
export const checkForm = (state: RootState['adminAddRsu']) => {
- if (state.value.selectedRoute === 'Select Route') {
+ if (state.value.selectedRoute === 'Select Route (Required)') {
return false
- } else if (state.value.selectedModel === 'Select RSU Model') {
+ } else if (state.value.selectedModel === 'Select RSU Model (Required)') {
return false
- } else if (state.value.selectedSshGroup === 'Select SSH Group') {
+ } else if (state.value.selectedSshGroup === 'Select SSH Group (Required)') {
return false
- } else if (state.value.selectedSnmpGroup === 'Select SNMP Group') {
+ } else if (state.value.selectedSnmpGroup === 'Select SNMP Group (Required)') {
return false
- } else if (state.value.selectedSnmpVersion === 'Select SNMP Version') {
+ } else if (state.value.selectedSnmpVersion === 'Select SNMP Version (Required)') {
return false
} else if (state.value.selectedOrganizations.length === 0) {
return false
@@ -248,12 +248,12 @@ export const adminAddRsuSlice = createSlice({
state.value.selectedOrganizations = action.payload
},
resetForm: (state) => {
- state.value.selectedRoute = 'Select Route'
+ state.value.selectedRoute = 'Select Route (Required)'
state.value.otherRouteDisabled = false
- state.value.selectedModel = 'Select RSU Model'
- state.value.selectedSshGroup = 'Select SSH Group'
- state.value.selectedSnmpGroup = 'Select SNMP Group'
- state.value.selectedSnmpVersion = 'Select SNMP Version'
+ state.value.selectedModel = 'Select RSU Model (Required)'
+ state.value.selectedSshGroup = 'Select SSH Group (Required)'
+ state.value.selectedSnmpGroup = 'Select SNMP Group (Required)'
+ state.value.selectedSnmpVersion = 'Select SNMP Version (Required)'
state.value.selectedOrganizations = []
},
},
diff --git a/webapp/src/features/adminAdduser/AdminAddUser.tsx b/webapp/src/features/adminAdduser/AdminAddUser.tsx
index dae2ee59..44ceaf0b 100644
--- a/webapp/src/features/adminAdduser/AdminAddUser.tsx
+++ b/webapp/src/features/adminAdduser/AdminAddUser.tsx
@@ -65,7 +65,7 @@ const AdminAddUser = () => {
{errors.email.message}
+ {errors.email.message}
+ {errors.first_name.message}
+ {errors.first_name.message}
+ {errors.last_name.message}
+ {errors.last_name.message}
+ Must select at least one organization
+ Must select at least one organization
+ {successMsg} Failed to add user due to error: {errorMsg}
+ {successMsg}
+
+ Failed to add user due to error: {errorMsg}
+
+ {successMsg}
+
+ Failed to apply changes to organization due to error: {errorMsg}
+ Failed to obtain data due to error: {errorMsg}
+ Failed to obtain data due to error: {errorMsg}
+
- {activeDiv !== 'organization_table' && (
-
- {activeDiv !== 'rsu_table' && (
+ {activeTab !== undefined && (
)}
{title}
- {activeDiv === 'rsu_table' && [
+ {activeTab === undefined && [
+ CV Manager RSUs
+
- Add RSU
@@ -74,7 +97,7 @@ exports[`snapshot add 1`] = `
class="form-control"
id="latitude"
name="latitude"
- placeholder="Enter RSU Latitude"
+ placeholder="Enter RSU Latitude (Required)"
type="text"
/>
@@ -91,7 +114,7 @@ exports[`snapshot add 1`] = `
class="form-control"
id="longitude"
name="longitude"
- placeholder="Enter RSU Longitude"
+ placeholder="Enter RSU Longitude (Required)"
type="text"
/>
@@ -108,7 +131,7 @@ exports[`snapshot add 1`] = `
class="form-control"
id="milepost"
name="milepost"
- placeholder="Enter RSU Milepost"
+ placeholder="Enter RSU Milepost (Required)"
type="text"
/>
@@ -147,7 +170,7 @@ exports[`snapshot add 1`] = `
aria-hidden="true"
class="rw-detect-autofill rw-sr"
tabindex="-1"
- value="Select Route"
+ value="Select Route (Required)"
/>
- Select Route
+ Select Route (Required)
Failed to add rsu due to error: @@ -629,573 +654,526 @@ exports[`snapshot refresh 1`] = ` class="scroll-div-tab" >
+ Failed to add rsu due to error: + +
+Warning: time ranges greater than 24 hours may have longer load times.
) : ( @@ -87,18 +89,25 @@ const DisplayCounts = () => { return (- - Ingress Lane -
-- - Egress Lane -
-- - SSM (table) -
-- - SRM (table) -
-- - SRM (map) -
-