## Changes - Fix infrastructure monitor configure page loading error by adding required dateRange parameter - Fix URL validation error when editing existing infrastructure monitors - Fix monitor update using correct 'id' property instead of '_id' - Fix gauge box labels: "Device" (capitalized) and "Mounted on" instead of "mountpoint" - Show full device path instead of truncated ".../" prefix - Implement CSS Grid layout for gauge boxes ensuring consistent widths across all rows - Gauge boxes expand to fill space only when 4+ boxes exist ## Files Modified - client/src/Pages/Infrastructure/Create/index.jsx - client/src/Pages/Infrastructure/Create/hooks/useInfrastructureSubmit.jsx - client/src/Pages/Infrastructure/Details/Components/GaugeBoxes/index.jsx - client/src/Pages/Infrastructure/Details/Components/GaugeBoxes/Gauge.jsx - client/src/Pages/Infrastructure/Details/Components/BaseContainer/index.jsx - client/src/Pages/Infrastructure/Details/Hooks/useHardwareUtils.jsx - client/src/locales/en.json
271 lines
6.0 KiB
React
271 lines
6.0 KiB
React
import { Typography, Tooltip } from "@mui/material";
|
|
import { useTheme } from "@emotion/react";
|
|
import { useTranslation } from "react-i18next";
|
|
|
|
// Constants
|
|
const BASE_BOX_PADDING_VERTICAL = 4;
|
|
const BASE_BOX_PADDING_HORIZONTAL = 8;
|
|
const TYPOGRAPHY_PADDING = 8;
|
|
const CHART_CONTAINER_HEIGHT = 300;
|
|
|
|
const useHardwareUtils = () => {
|
|
const theme = useTheme();
|
|
const { t } = useTranslation();
|
|
|
|
const getDimensions = () => {
|
|
const totalTypographyPadding = parseInt(theme.spacing(TYPOGRAPHY_PADDING), 10) * 2;
|
|
const totalChartContainerPadding =
|
|
parseInt(theme.spacing(BASE_BOX_PADDING_VERTICAL), 10) * 2;
|
|
return {
|
|
baseBoxPaddingVertical: BASE_BOX_PADDING_VERTICAL,
|
|
baseBoxPaddingHorizontal: BASE_BOX_PADDING_HORIZONTAL,
|
|
totalContainerPadding: parseInt(theme.spacing(BASE_BOX_PADDING_VERTICAL), 10) * 2,
|
|
areaChartHeight:
|
|
CHART_CONTAINER_HEIGHT - totalChartContainerPadding - totalTypographyPadding,
|
|
};
|
|
};
|
|
|
|
const formatBytes = (bytes, space = false) => {
|
|
if (bytes === undefined || bytes === null)
|
|
return (
|
|
<>
|
|
{0}
|
|
{space ? " " : ""}
|
|
<Typography component="span">{t("gb")}</Typography>
|
|
</>
|
|
);
|
|
if (typeof bytes !== "number")
|
|
return (
|
|
<>
|
|
{0}
|
|
{space ? " " : ""}
|
|
<Typography component="span">{t("gb")}</Typography>
|
|
</>
|
|
);
|
|
if (bytes === 0)
|
|
return (
|
|
<>
|
|
{0}
|
|
{space ? " " : ""}
|
|
<Typography component="span">{t("gb")}</Typography>
|
|
</>
|
|
);
|
|
|
|
const GB = bytes / (1024 * 1024 * 1024);
|
|
const MB = bytes / (1024 * 1024);
|
|
|
|
if (GB >= 1) {
|
|
return (
|
|
<>
|
|
{Number(GB.toFixed(2))}
|
|
{space ? " " : ""}
|
|
<Typography component="span">{t("gb")}</Typography>
|
|
</>
|
|
);
|
|
} else {
|
|
return (
|
|
<>
|
|
{Number(MB.toFixed(2))}
|
|
{space ? " " : ""}
|
|
<Typography component="span">{t("mb")}</Typography>
|
|
</>
|
|
);
|
|
}
|
|
};
|
|
|
|
const formatBytesPerSecondString = (bytesPerSec, space = false) => {
|
|
if (
|
|
bytesPerSec === undefined ||
|
|
bytesPerSec === null ||
|
|
typeof bytesPerSec !== "number" ||
|
|
bytesPerSec === 0
|
|
) {
|
|
return `0${space ? " " : ""}B/s`;
|
|
}
|
|
|
|
const GB = bytesPerSec / (1024 * 1024 * 1024);
|
|
const MB = bytesPerSec / (1024 * 1024);
|
|
const KB = bytesPerSec / 1024;
|
|
|
|
if (GB >= 1) {
|
|
return `${Number(GB.toFixed(1))}${space ? " " : ""}GB/s`;
|
|
} else if (MB >= 1) {
|
|
return `${Number(MB.toFixed(1))}${space ? " " : ""}MB/s`;
|
|
} else if (KB >= 1) {
|
|
return `${Number(KB.toFixed(1))}${space ? " " : ""}KB/s`;
|
|
} else {
|
|
return `${Number(bytesPerSec.toFixed(1))}${space ? " " : ""}B/s`;
|
|
}
|
|
};
|
|
|
|
const formatPacketsPerSecondString = (packetsPerSec, space = false) => {
|
|
if (
|
|
packetsPerSec === undefined ||
|
|
packetsPerSec === null ||
|
|
typeof packetsPerSec !== "number" ||
|
|
packetsPerSec === 0
|
|
) {
|
|
return `0${space ? " " : ""}pps`;
|
|
}
|
|
|
|
const M = packetsPerSec / (1000 * 1000);
|
|
const K = packetsPerSec / 1000;
|
|
|
|
if (M >= 1) {
|
|
return `${Number(M.toFixed(1))}${space ? " " : ""}Mpps`;
|
|
} else if (K >= 1) {
|
|
return `${Number(K.toFixed(1))}${space ? " " : ""}Kpps`;
|
|
} else {
|
|
return `${Math.round(packetsPerSec)}${space ? " " : ""}pps`;
|
|
}
|
|
};
|
|
|
|
const formatDeviceName = (device) => {
|
|
const deviceStr = String(device || "");
|
|
|
|
// Show full device path
|
|
return (
|
|
<Tooltip
|
|
title={deviceStr}
|
|
arrow
|
|
placement="top"
|
|
>
|
|
<Typography
|
|
component="span"
|
|
sx={{
|
|
cursor: "default",
|
|
display: "inline-block",
|
|
userSelect: "none",
|
|
whiteSpace: "nowrap",
|
|
overflow: "hidden",
|
|
textOverflow: "ellipsis",
|
|
maxWidth: "100%",
|
|
}}
|
|
>
|
|
{deviceStr}
|
|
</Typography>
|
|
</Tooltip>
|
|
);
|
|
};
|
|
|
|
const formatMountpoint = (mountpoint) => {
|
|
const mountpointStr = String(mountpoint || "");
|
|
|
|
if (!mountpointStr) {
|
|
return (
|
|
<Tooltip
|
|
title="No mountpoint available"
|
|
arrow
|
|
placement="top"
|
|
>
|
|
<Typography
|
|
component="span"
|
|
sx={{
|
|
cursor: "default",
|
|
display: "inline-block",
|
|
userSelect: "none",
|
|
color: "text.secondary",
|
|
fontStyle: "italic",
|
|
}}
|
|
>
|
|
N/A
|
|
</Typography>
|
|
</Tooltip>
|
|
);
|
|
}
|
|
|
|
// Show full mountpoint path
|
|
return (
|
|
<Tooltip
|
|
title={mountpointStr}
|
|
arrow
|
|
placement="top"
|
|
>
|
|
<Typography
|
|
component="span"
|
|
sx={{
|
|
cursor: "default",
|
|
display: "inline-block",
|
|
userSelect: "none",
|
|
whiteSpace: "nowrap",
|
|
overflow: "hidden",
|
|
textOverflow: "ellipsis",
|
|
maxWidth: "100%",
|
|
}}
|
|
>
|
|
{mountpointStr}
|
|
</Typography>
|
|
</Tooltip>
|
|
);
|
|
};
|
|
|
|
/**
|
|
* Converts a decimal value to a percentage
|
|
*
|
|
* @function decimalToPercentage
|
|
* @param {number} value - Decimal value to convert
|
|
* @returns {number} Percentage representation
|
|
*
|
|
* @example
|
|
* decimalToPercentage(0.75) // Returns 75
|
|
* decimalToPercentage(null) // Returns 0
|
|
*/
|
|
const decimalToPercentage = (value) => {
|
|
if (value === null || value === undefined) return 0;
|
|
return value * 100;
|
|
};
|
|
|
|
const buildTemps = (checks) => {
|
|
let numCores = 1;
|
|
if (checks === null) return { temps: [], tempKeys: [] };
|
|
|
|
for (const check of checks) {
|
|
if (check?.avgTemperature?.length > numCores) {
|
|
numCores = check.avgTemperature.length;
|
|
break;
|
|
}
|
|
}
|
|
const temps = checks.map((check) => {
|
|
// If there's no data, set the temperature to 0
|
|
if (
|
|
check?.avgTemperature?.length === 0 ||
|
|
check?.avgTemperature === undefined ||
|
|
check?.avgTemperature === null
|
|
) {
|
|
check.avgTemperature = Array(numCores).fill(0);
|
|
}
|
|
const res = check?.avgTemperature?.reduce(
|
|
(acc, cur, idx) => {
|
|
acc[`core${idx + 1}`] = cur;
|
|
return acc;
|
|
},
|
|
{
|
|
_id: check._id,
|
|
}
|
|
);
|
|
return res;
|
|
});
|
|
if (temps.length === 0 || !temps[0]) {
|
|
return { temps: [], tempKeys: [] };
|
|
}
|
|
|
|
return {
|
|
tempKeys: Object.keys(temps[0] || {}).filter((key) => key !== "_id"),
|
|
temps,
|
|
};
|
|
};
|
|
|
|
return {
|
|
formatBytes,
|
|
formatDeviceName,
|
|
formatMountpoint,
|
|
decimalToPercentage,
|
|
buildTemps,
|
|
getDimensions,
|
|
formatBytesPerSecondString,
|
|
formatPacketsPerSecondString,
|
|
};
|
|
};
|
|
|
|
export { useHardwareUtils };
|