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

CEC-4926: use new vehicles_count field (#423)

Browse Source 
* use new vehicles_count field

* fix affected tests
This commit is contained in:
Tristan Timblin
2023-08-31 09:15:40 -07:00
committed by GitHub
parent 3562ccc31c
commit bb0006eed6
3 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,25 +18,29 @@ let fleet = {
log_level: "info", log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: fleetCANFilters }, canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: fleetCANFilters },
vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"], vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"],
vehicles_count: 3,
} }
let fleets = [ let fleets = [
{ {
name: "US-WEST", name: "US-WEST",
log_level: "info", log_level: "info",
canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: fleetCANFilters }, canbus: { enabled: true, data_logger_enabled: true, max_mem_buffer_size: 1, max_disk_buffer_size: 2, filters: fleetCANFilters },
vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"] vehicles: ["USWESTVIN12345678", "USWESTVIN12345679", "USWESTVIN12345670"],
vehicles_count: 3,
}, },
{ {
name: "US-CENTRAL", name: "US-CENTRAL",
log_level: "warning", log_level: "warning",
canbus: { enabled: false, data_logger_enabled: false, max_mem_buffer_size: 0, max_disk_buffer_size: 0 }, canbus: { enabled: false, data_logger_enabled: false, max_mem_buffer_size: 0, max_disk_buffer_size: 0 },
vehicles: ["USCENTVIN12345678", "USCENTVIN12345679", "USCENTVIN12345670"] vehicles: ["USCENTVIN12345678", "USCENTVIN12345679", "USCENTVIN12345670"],
vehicles_count: 3,
}, },
{ {
name: "US-EAST", name: "US-EAST",
log_level: "error", log_level: "error",
canbus: { enabled: true }, canbus: { enabled: true },
vehicles: ["USEASTVIN12345678", "USEASTVIN12345679", "USEASTVIN12345670"] vehicles: ["USEASTVIN12345678", "USEASTVIN12345679", "USEASTVIN12345670"],
vehicles_count: 3,
}, },
]; ];
let totalFleets = 3; let totalFleets = 3;

70
src/components/Controls/FleetSelectionTable/index.jsx
View File

@@ -1,13 +1,13 @@
import React, {useEffect, useState} from "react"; import React, { useEffect, useState } from "react";
import {Link} from 'react-router-dom'; import { Link } from 'react-router-dom';
import {Checkbox, Table, TableBody, TableCell, TableFooter, TablePagination, TableRow} from "@material-ui/core"; import { Checkbox, Table, TableBody, TableCell, TableFooter, TablePagination, TableRow } from "@material-ui/core";
import clsx from "clsx"; import clsx from "clsx";
import TableHeaderSortable from "../../Table/HeaderSortable"; import TableHeaderSortable from "../../Table/HeaderSortable";
import {useStatusContext} from "../../Contexts/StatusContext"; import { useStatusContext } from "../../Contexts/StatusContext";
import {useFleetContext} from "../../Contexts/FleetContext" import { useFleetContext } from "../../Contexts/FleetContext"
import {logger} from "../../../services/monitoring"; import { logger } from "../../../services/monitoring";
import {useLocalStorage} from "../../useLocalStorage"; import { useLocalStorage } from "../../useLocalStorage";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
const tableColumns = [ const tableColumns = [
@@ -105,10 +105,12 @@ const FleetSelectionTable = (props) => {
useEffect(() => { useEffect(() => {
const options = { search: searchTerm, const options = {
limit: pageSize, search: searchTerm,
offset: pageSize * pageIndex, limit: pageSize,
order: `${orderBy} ${order}`, offset: pageSize * pageIndex,
order: `${orderBy} ${order}`,
ignore: ["vehicles"],
}; };
(async () => { (async () => {
try { try {
@@ -138,29 +140,29 @@ const FleetSelectionTable = (props) => {
/> />
<TableBody> <TableBody>
{fleets.map((row) => { {fleets.map((row) => {
const isSelected = selected const isSelected = selected
? selected.indexOf(row.name) !== -1 ? selected.indexOf(row.name) !== -1
: false; : false;
return ( return (
<TableRow key={row.name}> <TableRow key={row.name}>
{multiSelect && ( {multiSelect && (
<TableCell padding="checkbox"> <TableCell padding="checkbox">
<Checkbox <Checkbox
checked={isSelected} checked={isSelected}
onChange={(event) => handleSelect(event, row.name)} onChange={(event) => handleSelect(event, row.name)}
/> />
</TableCell>
)}
<TableCell align="center">
<Link to={`/fleet/${row.name}`}>{row.name}</Link>
</TableCell> </TableCell>
<TableCell align="center">{row.log_level}</TableCell> )}
<TableCell align="center">{row.canbus.enabled ? "true" : "false"}</TableCell> <TableCell align="center">
<TableCell align="center">{row.canbus.data_logger_enabled ? "true" : "false"}</TableCell> <Link to={`/fleet/${row.name}`}>{row.name}</Link>
<TableCell align="center">{!row.vehicles ? 0 : row.vehicles.length}</TableCell> </TableCell>
<TableCell align="center">{!row.canbus.filters ? 0 : row.canbus.filters.length}</TableCell> <TableCell align="center">{row.log_level}</TableCell>
</TableRow>) <TableCell align="center">{row.canbus.enabled ? "true" : "false"}</TableCell>
} <TableCell align="center">{row.canbus.data_logger_enabled ? "true" : "false"}</TableCell>
<TableCell align="center">{row.vehicles_count || 0}</TableCell>
<TableCell align="center">{!row.canbus.filters ? 0 : row.canbus.filters.length}</TableCell>
</TableRow>)
}
)} )}
</TableBody> </TableBody>
<TableFooter> <TableFooter>
@@ -172,7 +174,7 @@ const FleetSelectionTable = (props) => {
rowsPerPage={pageSize} rowsPerPage={pageSize}
page={pageIndex} page={pageIndex}
SelectProps={{ SelectProps={{
inputProps: {"aria-label": "rows per page"}, inputProps: { "aria-label": "rows per page" },
native: true, native: true,
}} }}
onPageChange={handleChangePageIndex} onPageChange={handleChangePageIndex}

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

@@ -60,7 +60,7 @@ const MainForm = ({ name }) => {
<Grid container className={classes.root} spacing={2}> <Grid container className={classes.root} spacing={2}>
<Grid item md={12} className={classes.textCenterAlign}> <Grid item md={12} className={classes.textCenterAlign}>
<p><b>Name</b>: {name}</p> <p><b>Name</b>: {name}</p>
<p><b>Vehicles</b>: {fleet.vehicles ? fleet.vehicles.length : 0}</p> <p><b>Vehicles</b>: {fleet.vehicles_count || 0}</p>
{fleet.log_level != null && ( {fleet.log_level != null && (
<p><b>Log Level</b>: {fleet.log_level}</p> <p><b>Log Level</b>: {fleet.log_level}</p>
)} )}