Merge branch 'develop' into fix/incidents
This commit is contained in:
commit
f696b4ef9b
12 files changed
+95
-55
No files matched your search
@@ -14,15 +14,7 @@
|
|||||||
}
|
}
|
||||||
} */
|
} */
|
||||||
|
|
||||||
/* .home-layout aside {
|
.home-layout > .home-content-wrapper {
|
||||||
position: sticky;
|
|
||||||
top: 0;
|
|
||||||
left: 0;
|
|
||||||
height: 100vh;
|
|
||||||
max-width: var(--env-var-side-bar-width);
|
|
||||||
} */
|
|
||||||
|
|
||||||
.home-layout > div {
|
|
||||||
min-height: calc(100vh - var(--env-var-spacing-2) * 2);
|
min-height: calc(100vh - var(--env-var-spacing-2) * 2);
|
||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,27 @@
|
|||||||
import Sidebar from "../../Sidebar/index.jsx";
|
import Sidebar from "../../Sidebar/index.jsx";
|
||||||
import { Outlet } from "react-router";
|
import { Outlet } from "react-router";
|
||||||
import { Stack } from "@mui/material";
|
import { Box, Stack } from "@mui/material";
|
||||||
|
import { useSidebar } from "@/Hooks/useSidebar.js";
|
||||||
|
|
||||||
import "./index.css";
|
import "./index.css";
|
||||||
|
|
||||||
const HomeLayout = () => {
|
const HomeLayout = () => {
|
||||||
|
const { width, transition } = useSidebar();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack
|
<Stack
|
||||||
className="home-layout"
|
className="home-layout"
|
||||||
flexDirection="row"
|
flexDirection="row"
|
||||||
gap={14}
|
|
||||||
>
|
>
|
||||||
<Sidebar />
|
<Sidebar />
|
||||||
|
{/* Spacer for fixed sidebar */}
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
width,
|
||||||
|
flexShrink: 0,
|
||||||
|
transition,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
<Stack className="home-content-wrapper">
|
<Stack className="home-content-wrapper">
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</Stack>
|
</Stack>
|
||||||
|
|||||||
@@ -12,9 +12,9 @@ import Icon from "../Icon";
|
|||||||
|
|
||||||
// Utils
|
// Utils
|
||||||
import { useTheme } from "@mui/material/styles";
|
import { useTheme } from "@mui/material/styles";
|
||||||
import { useSelector } from "react-redux";
|
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { useNavigate } from "react-router";
|
import { useNavigate } from "react-router";
|
||||||
|
import { useSidebar } from "@/Hooks/useSidebar.js";
|
||||||
|
|
||||||
const URL_MAP = {
|
const URL_MAP = {
|
||||||
support: "https://discord.com/invite/NAb6H3UTjK",
|
support: "https://discord.com/invite/NAb6H3UTjK",
|
||||||
@@ -65,8 +65,7 @@ const Sidebar = () => {
|
|||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
// Redux state
|
const { collapsed, width, transition } = useSidebar();
|
||||||
const collapsed = useSelector((state) => state.ui.sidebar?.collapsed ?? false);
|
|
||||||
|
|
||||||
const menu = getMenu(t);
|
const menu = getMenu(t);
|
||||||
const otherMenuItems = getOtherMenuItems(t);
|
const otherMenuItems = getOtherMenuItems(t);
|
||||||
@@ -75,20 +74,19 @@ const Sidebar = () => {
|
|||||||
return (
|
return (
|
||||||
<Stack
|
<Stack
|
||||||
height="100vh"
|
height="100vh"
|
||||||
width={
|
width={width}
|
||||||
collapsed
|
|
||||||
? "var(--env-var-side-bar-collapsed-width)"
|
|
||||||
: "var(--env-var-side-bar-width)"
|
|
||||||
}
|
|
||||||
component="aside"
|
component="aside"
|
||||||
position="sticky"
|
position="fixed"
|
||||||
top={0}
|
top={0}
|
||||||
borderRight={`1px solid ${theme.palette.primary.lowContrast}`}
|
left={0}
|
||||||
paddingTop={theme.spacing(6)}
|
paddingTop={theme.spacing(6)}
|
||||||
paddingBottom={theme.spacing(6)}
|
paddingBottom={theme.spacing(6)}
|
||||||
gap={theme.spacing(6)}
|
gap={theme.spacing(6)}
|
||||||
sx={{
|
sx={{
|
||||||
transition: "width 650ms cubic-bezier(0.36, -0.01, 0, 0.77)",
|
transition,
|
||||||
|
backgroundColor: "#000000",
|
||||||
|
borderRight: "1px solid #344054",
|
||||||
|
zIndex: 1000,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<CollapseButton collapsed={collapsed} />
|
<CollapseButton collapsed={collapsed} />
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import { useSelector } from "react-redux";
|
||||||
|
|
||||||
|
// CSS variable names for sidebar widths
|
||||||
|
const SIDEBAR_WIDTH_VAR = "var(--env-var-side-bar-width)";
|
||||||
|
const SIDEBAR_COLLAPSED_WIDTH_VAR = "var(--env-var-side-bar-collapsed-width)";
|
||||||
|
|
||||||
|
// Transition timing for sidebar width changes
|
||||||
|
const SIDEBAR_TRANSITION = "width 650ms cubic-bezier(0.36, -0.01, 0, 0.77)";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Hook to get sidebar state and computed width
|
||||||
|
* Centralizes sidebar width logic to avoid duplication between Sidebar and HomeLayout
|
||||||
|
*
|
||||||
|
* @returns {Object} Sidebar state and styles
|
||||||
|
* @returns {boolean} collapsed - Whether the sidebar is collapsed
|
||||||
|
* @returns {string} width - CSS width value based on collapsed state
|
||||||
|
* @returns {string} transition - CSS transition for width changes
|
||||||
|
*/
|
||||||
|
export const useSidebar = () => {
|
||||||
|
const collapsed = useSelector((state) => state.ui.sidebar?.collapsed ?? false);
|
||||||
|
|
||||||
|
return {
|
||||||
|
collapsed,
|
||||||
|
width: collapsed ? SIDEBAR_COLLAPSED_WIDTH_VAR : SIDEBAR_WIDTH_VAR,
|
||||||
|
transition: SIDEBAR_TRANSITION,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
export default useSidebar;
|
||||||
@@ -129,7 +129,9 @@ const CreateInfrastructureMonitor = () => {
|
|||||||
const onSubmit = async (event) => {
|
const onSubmit = async (event) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
const form = buildForm(infrastructureMonitor, https);
|
const form = buildForm(infrastructureMonitor, https);
|
||||||
const error = validateForm(form);
|
// When editing, exclude URL from validation since it's disabled and can't be changed
|
||||||
|
const formToValidate = isCreate ? form : { ...form, url: monitor.url };
|
||||||
|
const error = validateForm(formToValidate);
|
||||||
if (error) {
|
if (error) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -205,14 +207,14 @@ const CreateInfrastructureMonitor = () => {
|
|||||||
<></>
|
<></>
|
||||||
)}
|
)}
|
||||||
</Typography>
|
</Typography>
|
||||||
{!isCreate && (
|
{!isCreate && monitor && (
|
||||||
<MonitorStatusHeader
|
<MonitorStatusHeader
|
||||||
monitor={monitor}
|
monitor={monitor}
|
||||||
infrastructureMonitor={infrastructureMonitor}
|
infrastructureMonitor={infrastructureMonitor}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
{!isCreate && (
|
{!isCreate && monitor && (
|
||||||
<MonitorActionButtons
|
<MonitorActionButtons
|
||||||
monitor={monitor}
|
monitor={monitor}
|
||||||
isBusy={isBusy}
|
isBusy={isBusy}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import { useTheme } from "@emotion/react";
|
|||||||
import { useHardwareUtils } from "../../Hooks/useHardwareUtils.jsx";
|
import { useHardwareUtils } from "../../Hooks/useHardwareUtils.jsx";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
|
||||||
const BaseContainer = ({ children, sx = {} }) => {
|
const BaseContainer = ({ children, sx = {}, shouldExpand = false }) => {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
const { getDimensions } = useHardwareUtils();
|
const { getDimensions } = useHardwareUtils();
|
||||||
return (
|
return (
|
||||||
@@ -22,7 +22,7 @@ const BaseContainer = ({ children, sx = {} }) => {
|
|||||||
sx={{
|
sx={{
|
||||||
padding: `${theme.spacing(getDimensions().baseBoxPaddingVertical)} ${theme.spacing(getDimensions().baseBoxPaddingHorizontal)}`,
|
padding: `${theme.spacing(getDimensions().baseBoxPaddingVertical)} ${theme.spacing(getDimensions().baseBoxPaddingHorizontal)}`,
|
||||||
minWidth: 200,
|
minWidth: 200,
|
||||||
width: 225,
|
width: shouldExpand ? "100%" : 225,
|
||||||
backgroundColor: theme.palette.primary.main,
|
backgroundColor: theme.palette.primary.main,
|
||||||
border: 1,
|
border: 1,
|
||||||
borderStyle: "solid",
|
borderStyle: "solid",
|
||||||
@@ -38,6 +38,7 @@ const BaseContainer = ({ children, sx = {} }) => {
|
|||||||
BaseContainer.propTypes = {
|
BaseContainer.propTypes = {
|
||||||
children: PropTypes.node.isRequired,
|
children: PropTypes.node.isRequired,
|
||||||
sx: PropTypes.object,
|
sx: PropTypes.object,
|
||||||
|
shouldExpand: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default BaseContainer;
|
export default BaseContainer;
|
||||||
@@ -17,21 +17,26 @@ const Gauge = ({
|
|||||||
valueThree,
|
valueThree,
|
||||||
metricFour,
|
metricFour,
|
||||||
valueFour,
|
valueFour,
|
||||||
|
shouldExpand = false,
|
||||||
}) => {
|
}) => {
|
||||||
const theme = useTheme();
|
const theme = useTheme();
|
||||||
|
|
||||||
const valueStyle = {
|
const valueStyle = {
|
||||||
borderRadius: theme.spacing(2),
|
borderRadius: theme.spacing(2),
|
||||||
backgroundColor: theme.palette.tertiary.main,
|
backgroundColor: theme.palette.tertiary.main,
|
||||||
width: "40%",
|
minWidth: "40%",
|
||||||
|
maxWidth: "60%",
|
||||||
mb: theme.spacing(2),
|
mb: theme.spacing(2),
|
||||||
mt: theme.spacing(2),
|
mt: theme.spacing(2),
|
||||||
pr: theme.spacing(2),
|
pr: theme.spacing(2),
|
||||||
textAlign: "right",
|
textAlign: "right",
|
||||||
|
overflow: "hidden",
|
||||||
|
textOverflow: "ellipsis",
|
||||||
|
whiteSpace: "nowrap",
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BaseContainer>
|
<BaseContainer shouldExpand={shouldExpand}>
|
||||||
<Stack
|
<Stack
|
||||||
direction="column"
|
direction="column"
|
||||||
gap={theme.spacing(2)}
|
gap={theme.spacing(2)}
|
||||||
@@ -116,6 +121,7 @@ Gauge.propTypes = {
|
|||||||
valueThree: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
|
valueThree: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
|
||||||
metricFour: PropTypes.string,
|
metricFour: PropTypes.string,
|
||||||
valueFour: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
|
valueFour: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
|
||||||
|
shouldExpand: PropTypes.bool,
|
||||||
};
|
};
|
||||||
|
|
||||||
export default Gauge;
|
export default Gauge;
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
// Components
|
// Components
|
||||||
import { Stack } from "@mui/material";
|
import { Box } from "@mui/material";
|
||||||
import Gauge from "./Gauge.jsx";
|
import Gauge from "./Gauge.jsx";
|
||||||
import SkeletonLayout from "./skeleton.jsx";
|
import SkeletonLayout from "./skeleton.jsx";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
@@ -65,16 +65,23 @@ const Gauges = ({ isLoading = false, monitor }) => {
|
|||||||
valueTwo: formatBytes(disk.total_bytes, true),
|
valueTwo: formatBytes(disk.total_bytes, true),
|
||||||
metricThree: t("device"),
|
metricThree: t("device"),
|
||||||
valueThree: formatDeviceName(disk.device),
|
valueThree: formatDeviceName(disk.device),
|
||||||
metricFour: t("mountpoint"),
|
metricFour: t("mountedOn"),
|
||||||
valueFour: formatMountpoint(disk.mountpoint),
|
valueFour: formatMountpoint(disk.mountpoint),
|
||||||
})),
|
})),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// Only expand gauges to fill row when there are 4 or more
|
||||||
|
const shouldExpand = gauges.length >= 4;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack
|
<Box
|
||||||
direction="row"
|
sx={{
|
||||||
flexWrap="wrap"
|
display: "grid",
|
||||||
gap={theme.spacing(8)}
|
gridTemplateColumns: shouldExpand
|
||||||
|
? "repeat(auto-fill, minmax(200px, 1fr))"
|
||||||
|
: "repeat(auto-fill, 225px)",
|
||||||
|
gap: theme.spacing(4),
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
{gauges.map((gauge) => {
|
{gauges.map((gauge) => {
|
||||||
return (
|
return (
|
||||||
@@ -90,10 +97,11 @@ const Gauges = ({ isLoading = false, monitor }) => {
|
|||||||
valueThree={gauge.valueThree}
|
valueThree={gauge.valueThree}
|
||||||
metricFour={gauge.metricFour}
|
metricFour={gauge.metricFour}
|
||||||
valueFour={gauge.valueFour}
|
valueFour={gauge.valueFour}
|
||||||
|
shouldExpand={shouldExpand}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</Stack>
|
</Box>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -123,14 +123,7 @@ const useHardwareUtils = () => {
|
|||||||
const formatDeviceName = (device) => {
|
const formatDeviceName = (device) => {
|
||||||
const deviceStr = String(device || "");
|
const deviceStr = String(device || "");
|
||||||
|
|
||||||
// Extract the last part of the path (after last '/')
|
// Show full device path
|
||||||
const parts = deviceStr.split("/");
|
|
||||||
const lastPart = parts[parts.length - 1];
|
|
||||||
|
|
||||||
// If there's more than one part, show with "..." prefix
|
|
||||||
const displayText = parts.length > 1 ? `.../${lastPart}` : deviceStr;
|
|
||||||
|
|
||||||
// Always show tooltip with full device path
|
|
||||||
return (
|
return (
|
||||||
<Tooltip
|
<Tooltip
|
||||||
title={deviceStr}
|
title={deviceStr}
|
||||||
@@ -149,7 +142,7 @@ const useHardwareUtils = () => {
|
|||||||
maxWidth: "100%",
|
maxWidth: "100%",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{displayText}
|
{deviceStr}
|
||||||
</Typography>
|
</Typography>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
);
|
);
|
||||||
@@ -181,14 +174,7 @@ const useHardwareUtils = () => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Extract the last part of the path (after last '/')
|
// Show full mountpoint path
|
||||||
const parts = mountpointStr.split("/");
|
|
||||||
const lastPart = parts[parts.length - 1];
|
|
||||||
|
|
||||||
// If there's more than one part, show with "..." prefix
|
|
||||||
const displayText = parts.length > 1 ? `.../${lastPart}` : mountpointStr;
|
|
||||||
|
|
||||||
// Always show tooltip with full mountpoint path
|
|
||||||
return (
|
return (
|
||||||
<Tooltip
|
<Tooltip
|
||||||
title={mountpointStr}
|
title={mountpointStr}
|
||||||
@@ -207,7 +193,7 @@ const useHardwareUtils = () => {
|
|||||||
maxWidth: "100%",
|
maxWidth: "100%",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{displayText}
|
{mountpointStr}
|
||||||
</Typography>
|
</Typography>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -4,6 +4,12 @@
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
html,
|
||||||
|
body {
|
||||||
|
background-color: #000000;
|
||||||
|
overscroll-behavior: none;
|
||||||
|
}
|
||||||
|
|
||||||
html {
|
html {
|
||||||
scroll-behavior: smooth;
|
scroll-behavior: smooth;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -193,6 +193,8 @@
|
|||||||
"total": "Total",
|
"total": "Total",
|
||||||
"cores": "Cores",
|
"cores": "Cores",
|
||||||
"frequency": "Frequency",
|
"frequency": "Frequency",
|
||||||
|
"device": "Device",
|
||||||
|
"mountedOn": "Mounted on",
|
||||||
"status": "Status",
|
"status": "Status",
|
||||||
"cpuPhysical": "CPU (Physical)",
|
"cpuPhysical": "CPU (Physical)",
|
||||||
"cpuLogical": "CPU (Logical)",
|
"cpuLogical": "CPU (Logical)",
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ class MonitorController {
|
|||||||
await getHardwareDetailsByIdQueryValidation.validateAsync(req.query);
|
await getHardwareDetailsByIdQueryValidation.validateAsync(req.query);
|
||||||
|
|
||||||
const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
|
const monitorId = requireString(req?.params?.monitorId, "Monitor ID");
|
||||||
const dateRange = requireString(req?.query?.dateRange, "dateRange");
|
const dateRange = optionalString(req?.query?.dateRange, "dateRange") || "recent";
|
||||||
const teamId = requireTeamId(req?.user?.teamId);
|
const teamId = requireTeamId(req?.user?.teamId);
|
||||||
|
|
||||||
const monitor = await this.monitorService.getHardwareDetailsById({
|
const monitor = await this.monitorService.getHardwareDetailsById({
|
||||||
|
|||||||
Reference in new issue
Block a user