admin/ota-admin-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CEC-1256/CEC-1330 fixing filters length function (#137)

Browse Source 
* fixing filters length function

* adding filters testing

* code smell

* code smells

* bug
This commit is contained in:
Drew Taylor
2022-04-14 19:03:22 -07:00
committed by GitHub
parent 07f77cabdb
commit 11c85e57d6
15 changed files with 108 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/App/__snapshots__/App.test.js.snap
View File

@@ -7839,7 +7839,7 @@ exports[`App Route /vehicle-status authenticated 1`] = `
Filters
</b>
:
0
3
</p>
</div>
<div

2
src/components/Cars/Status/Details/__snapshots__/index.test.jsx.snap
View File

@@ -76,7 +76,7 @@ exports[`VehicleDetailsTab Render 1`] = `
Filters
</b>
:
0
3
</p>
</div>
<div

2
src/components/Cars/Status/Details/index.jsx
View File

@@ -66,7 +66,7 @@ const MainForm = ({ vin }) => {
<p><b>Max Memory Buffer Size</b>: {vehicle.canbus.max_mem_buffer_size ?? "Default"}</p>
<p><b>Enabled</b>: {vehicle.canbus.data_logger_enabled.toString()}</p>
<p><b>Max Disk Buffer Size</b>: {vehicle.canbus.max_disk_buffer_size ?? "Default"}</p>
<p><b>Filters</b>: {vehicle.canbus.filters ? vehicle.canbus.filters.length() : 0}</p>
<p><b>Filters</b>: {vehicle.canbus.filters ? vehicle.canbus.filters.length : 0}</p>
</Grid>
)}
<Grid item md={12} className={classes.textCenterAlign}>

2
src/components/Cars/Status/__snapshots__/DetailsTab.test.jsx.snap
View File

@@ -85,7 +85,7 @@ exports[`DetailsTab Render 1`] = `
Filters
</b>
:
0
3
</p>
</div>
<div

19
src/components/Contexts/FleetContext.test.jsx
View File

@@ -691,10 +691,25 @@ describe("FleetContext", () => {
});
});
const expectedFilters = [
{
can_id: "123-456",
interval: 789
},
{
can_id: "1",
interval: 1000
},
{
can_id: "1000",
interval: 1
}
]
const expectedFleetData = {
name: "US-WEST",
log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: expectedFilters },
vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"]
}
@@ -702,7 +717,7 @@ const expectedFleetsData = [
{
name: "US-WEST",
log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: expectedFilters },
vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"]
},
{

19
src/components/Contexts/VehicleContext.test.jsx
View File

@@ -319,6 +319,21 @@ describe("VehicleContext", () => {
});
});
const expectedFilters = [
{
can_id: "123-456",
interval: 789
},
{
can_id: "1",
interval: 1000
},
{
can_id: "1000",
interval: 1
}
]
const expectedVehicleData = {
vin: "3C4PDCBG0ET127145",
year: 2021,
@@ -326,7 +341,7 @@ const expectedVehicleData = {
trim: "Basic",
ecu_list: "ECUA 2.0.0, ECUB 2.1.1",
log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: expectedFilters },
connected: true,
}
@@ -338,7 +353,7 @@ const expectedVehiclesData = [
trim: "Basic",
ecu_list: "ECUA 2.0.0, ECUB 2.1.1",
log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: expectedFilters },
connected: true,
},
{ vin: "1G1FP87S3GN100062", connected: true },

32
src/components/Contexts/__mocks__/FleetContext.jsx
View File

@@ -1,15 +1,29 @@
let busy = false;
let fleetCANFilters = [
{
can_id: "123-456",
interval: 789
},
{
can_id: "1",
interval: 1000
},
{
can_id: "1000",
interval: 1
}
]
let fleet = {
name: "US-WEST",
log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: fleetCANFilters },
vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"],
}
let fleets = [
{
name: "US-WEST",
log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: fleetCANFilters },
vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"]
},
{
@@ -28,20 +42,6 @@ let fleets = [
let totalFleets = 3;
let fleetVehicles = ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"];
let totalFleetVehicles = 3;
let fleetCANFilters = [
{
can_id: "123-456",
interval: 789
},
{
can_id: "1",
interval: 1000
},
{
can_id: "1000",
interval: 1
}
]
let totalFleetCANFilters = 3;
export const FleetProvider = ({ children }) => {

18
src/components/Contexts/__mocks__/VehicleContext.jsx
View File

@@ -1,6 +1,22 @@
import React from "react";
let busy = false;
const filters = [
{
can_id: "123-456",
interval: 789
},
{
can_id: "1",
interval: 1000
},
{
can_id: "1000",
interval: 1
}
]
let vehicle = {
vin: "3C4PDCBG0ET127145",
year: 2021,
@@ -8,7 +24,7 @@ let vehicle = {
trim: "Basic",
ecu_list: "ECUA 2.0.0, ECUB 2.1.1",
log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: filters },
};
let vehicles = [];
let models = ["Ocean", "PEAR"];

2
src/components/Fleets/Status/Details/__snapshots__/index.test.jsx.snap
View File

@@ -83,7 +83,7 @@ exports[`FleetDetailsTab Render 1`] = `
Filters
</b>
:
0
3
</p>
</div>
<div

2
src/components/Fleets/Status/Details/index.jsx
View File

@@ -67,7 +67,7 @@ const MainForm = ({ name }) => {
<p><b>Max Memory Buffer Size</b>: {fleet.canbus.max_mem_buffer_size ?? "Default"}</p>
<p><b>Enabled</b>: {fleet.canbus.data_logger_enabled.toString()}</p>
<p><b>Max Disk Buffer Size</b>: {fleet.canbus.max_disk_buffer_size ?? "Default"}</p>
<p><b>Filters</b>: {fleet.canbus.filters ? fleet.canbus.filters.length() : 0}</p>
<p><b>Filters</b>: {fleet.canbus.filters ? fleet.canbus.filters.length : 0}</p>
</Grid>
)}
<Grid item md={12} className={classes.textCenterAlign}>

2
src/components/Fleets/Status/__snapshots__/DetailsTab.test.jsx.snap
View File

@@ -92,7 +92,7 @@ exports[`DetailsTab Render 1`] = `
Filters
</b>
:
0
3
</p>
</div>
<div

2
src/components/Fleets/Status/__snapshots__/index.test.jsx.snap
View File

@@ -179,7 +179,7 @@ exports[`FleetStatus Render 1`] = `
Filters
</b>
:
0
3
</p>
</div>
<div

2
src/components/Fleets/Table/__snapshots__/index.test.jsx.snap
View File

@@ -285,7 +285,7 @@ exports[`FleetTable Render 1`] = `
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-alignCenter"
>
0
3
</td>
</tr>
<tr

32
src/services/__mocks__/fleetsAPI.js
View File

@@ -1,8 +1,23 @@
const filters = [
{
can_id: "123-456",
interval: 789
},
{
can_id: "1",
interval: 1000
},
{
can_id: "1000",
interval: 1
}
]
const fleets = [
{
name: "US-WEST",
log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: filters },
vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"]
},
{
@@ -21,21 +36,6 @@ const fleets = [
const vehicles = ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"];
const filters = [
{
can_id: "123-456",
interval: 789
},
{
can_id: "1",
interval: 1000
},
{
can_id: "1000",
interval: 1
}
]
const fleetsAPI = {
addFleet: async (fleet) => {
fleets.push(fleet);

17
src/services/__mocks__/vehiclesAPI.js
View File

@@ -1,3 +1,18 @@
const filters = [
{
can_id: "123-456",
interval: 789
},
{
can_id: "1",
interval: 1000
},
{
can_id: "1000",
interval: 1
}
]
const data = [
{
vin: "3C4PDCBG0ET127145",
@@ -6,7 +21,7 @@ const data = [
trim: "Basic",
ecu_list: "ECUA 2.0.0, ECUB 2.1.1",
log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2 },
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: filters },
},
{ vin: "1G1FP87S3GN100062" },
{ vin: "1HGCG325XYA062256", year: 2021 },