Merge branch 'master' into staging_environment

This commit is contained in:
csawatzky 2025-05-08 15:22:08 -06:00
commit 5f9d39e26d
13 changed files with 406 additions and 33 deletions

View file

@ -57,7 +57,14 @@ const useStyles = makeStyles((theme: Theme) => {
margin: theme.spacing(1),
marginLeft: theme.spacing(2),
display: "flex",
width: theme.spacing(26)
width: theme.spacing(32)
// justifyContent: "center",
},
tagsCellContainer: {
margin: theme.spacing(1),
marginLeft: theme.spacing(2),
display: "flex",
width: theme.spacing(24)
// justifyContent: "center",
},
green: {
@ -328,8 +335,8 @@ export default function Devices() {
<Box className={classes.descriptionCellContainer}>
<Tooltip title={device.settings?.description}>
<span>
{description.length > 32
? description.substring(0, 32) + "..."
{description.length > 36
? description.substring(0, 36) + "..."
: description}
</span>
</Tooltip>
@ -341,7 +348,7 @@ export default function Devices() {
title: "Tags",
render: (device: Device) => {
return (
<Grid2 container spacing={1} className={classes.descriptionCellContainer}>
<Grid2 container spacing={1} className={classes.tagsCellContainer}>
{device.status.tags.map((tag: pond.TagSettings) => (
<Grid2 key={"device-"+device.id()+"-tag-"+tag.key}>
<TagUI tag={Tag.any({ settings: tag })} />

View file

@ -206,7 +206,7 @@ export default function Firmware() {
// };
const load = useCallback(() => {
firmwareAPI.listFirmware(pageSize, pageSize * tablePage, "asc", "version", searchText)
firmwareAPI.listFirmware(pageSize, pageSize * tablePage, "desc", "version", searchText)
.then((response) => {
setTotal(response.data.total ? response.data.total : 0)
let rows: FirmwareModel[] = or(response.data.firmware, []).map(