feat: leave only ui changes

This commit is contained in:
Malena Aguiar committed 2026-09-12 16:17:16 -06:00
1 parent 86b59da909
commit cc4b8b38f5
16 files changed
+29 -286

No files matched your search

+1
View File
@@ -102,6 +102,7 @@ const uiSlice = createSlice({
setShowURL: (state, action: PayloadAction<boolean>) => {
state.showURL = action.payload;
},
setTimezone: (state, action: PayloadAction<{ timezone: string }>) => {
if (action.payload.timezone) {
state.timezone = action.payload.timezone;
@@ -1,57 +1,18 @@
import Box from "@mui/material/Box";
import Skeleton from "@mui/material/Skeleton";
import Stack from "@mui/material/Stack";
import Typography from "@mui/material/Typography";
import { useTheme } from "@mui/material/styles";
import { useTranslation } from "react-i18next";
import { LAYOUT } from "@/Utils/Theme/constants";
import { typographyLevels } from "@/Utils/Theme/Palette";
interface DashboardCardProps {
title: string;
topRight?: React.ReactNode;
isLoading?: boolean;
error?: unknown;
children: React.ReactNode;
}
export const DashboardCard = ({
title,
topRight,
isLoading,
error,
children,
}: DashboardCardProps) => {
export const DashboardCard = ({ title, topRight, children }: DashboardCardProps) => {
const theme = useTheme();
const { t } = useTranslation();
const renderContent = () => {
if (isLoading) {
return (
<Stack gap={theme.spacing(LAYOUT.XS)}>
{[80, 60, 90, 50, 70].map((w, i) => (
<Skeleton
key={i}
variant="rounded"
height={14}
width={`${w}%`}
/>
))}
</Stack>
);
}
if (error) {
return (
<Typography
fontSize={typographyLevels.m}
color={theme.palette.error.main}
>
{t("pages.dashboard.error")}
</Typography>
);
}
return children;
};
return (
<Box
@@ -87,7 +48,7 @@ export const DashboardCard = ({
</Typography>
)}
</Stack>
{renderContent()}
{children}
</Box>
);
};
@@ -7,17 +7,12 @@ import { typographyLevels } from "@/Utils/Theme/Palette";
import { SPACING } from "@/Utils/Theme/constants";
import { useTranslation } from "react-i18next";
import type { MonitorsSummary } from "@/Types/Monitor";
interface MonitorStatusCardProps {
summary: MonitorsSummary;
isLoading?: boolean;
error?: unknown;
}
export const MonitorStatusCard = ({
summary,
isLoading,
error,
}: MonitorStatusCardProps) => {
export const MonitorStatusCard = ({ summary }: MonitorStatusCardProps) => {
const theme = useTheme();
const { t } = useTranslation();
@@ -26,11 +21,7 @@ export const MonitorStatusCard = ({
const ratio = total > 0 ? up / total : 0;
return (
<DashboardCard
title={t("pages.dashboard.cards.monitorStatus")}
isLoading={isLoading}
error={error}
>
<DashboardCard title={t("pages.dashboard.cards.monitorStatus")}>
<Stack gap={theme.spacing(SPACING.SM)}>
<Stack
direction="row"
@@ -8,26 +8,16 @@ import { LAYOUT } from "@/Utils/Theme/constants";
interface MonitorsByTypeCardProps {
monitorsByType: DashboardTypeCount[];
isLoading?: boolean;
error?: unknown;
}
export const MonitorsByTypeCard = ({
monitorsByType,
isLoading,
error,
}: MonitorsByTypeCardProps) => {
export const MonitorsByTypeCard = ({ monitorsByType }: MonitorsByTypeCardProps) => {
const { t } = useTranslation();
const theme = useTheme();
const maxCount = monitorsByType[0]?.count ?? 1;
return (
<DashboardCard
title={t("pages.dashboard.cards.monitorsByType")}
isLoading={isLoading}
error={error}
>
<DashboardCard title={t("pages.dashboard.cards.monitorsByType")}>
<Stack gap={LAYOUT.SM}>
{monitorsByType.map(({ type, count }) => (
<BarRow
@@ -1,30 +0,0 @@
import { useGet } from "@/Hooks/UseApi";
import type { DashboardSummaryResult } from "@/Pages/Dashboard/types";
import type { MonitorsSummary } from "@/Types/Monitor";
const EMPTY_SUMMARY: MonitorsSummary = {
totalMonitors: 0,
upMonitors: 0,
downMonitors: 0,
pausedMonitors: 0,
initializingMonitors: 0,
maintenanceMonitors: 0,
breachedMonitors: 0,
};
export const useDashboardData = () => {
const { data, isLoading, error } = useGet<DashboardSummaryResult>(
"/dashboard/summary",
undefined,
{
refreshInterval: 30000,
}
);
return {
isLoading,
error,
summary: data?.summary ?? EMPTY_SUMMARY,
monitorsByType: data?.monitorsByType ?? [],
};
};
+20 -13
View File
@@ -5,16 +5,31 @@ import useMediaQuery from "@mui/material/useMediaQuery";
import { BasePage } from "@/Components/design-elements/BasePage";
import { LAYOUT } from "@/Utils/Theme/constants";
import { useDashboardData } from "@/Pages/Dashboard/hooks/useDashboardData";
import { MonitorStatusCard } from "@/Pages/Dashboard/components/cards/MonitorStatusCard";
import { MonitorsByTypeCard } from "@/Pages/Dashboard/components/cards/MonitorsByTypeCard";
import type { MonitorsSummary } from "@/Types/Monitor";
import type { DashboardTypeCount } from "@/Pages/Dashboard/types";
const MOCK_SUMMARY: MonitorsSummary = {
totalMonitors: 12,
upMonitors: 10,
downMonitors: 1,
pausedMonitors: 1,
initializingMonitors: 0,
maintenanceMonitors: 0,
breachedMonitors: 0,
};
const MOCK_MONITORS_BY_TYPE: DashboardTypeCount[] = [
{ type: "http", count: 7 },
{ type: "ping", count: 3 },
{ type: "port", count: 2 },
];
const Dashboard = () => {
const theme = useTheme();
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
const { isLoading, error, summary, monitorsByType } = useDashboardData();
return (
<BasePage headerKey="dashboard">
<Box
@@ -22,16 +37,8 @@ const Dashboard = () => {
gridTemplateColumns={isSmall ? "1fr" : "1fr 1fr"}
gap={theme.spacing(LAYOUT.MD)}
>
<MonitorStatusCard
summary={summary}
isLoading={isLoading}
error={error}
/>
<MonitorsByTypeCard
monitorsByType={monitorsByType}
isLoading={isLoading}
error={error}
/>
<MonitorStatusCard summary={MOCK_SUMMARY} />
<MonitorsByTypeCard monitorsByType={MOCK_MONITORS_BY_TYPE} />
</Box>
</BasePage>
);
-27
View File
@@ -1,31 +1,4 @@
import type { MonitorsSummary } from "@/Types/Monitor";
export interface DashboardMonitorRow {
id: string;
name: string;
status: string;
type: string;
group: string | null;
uptimePercentage: number;
avgResponseTime: number;
}
export interface DashboardTypeCount {
type: string;
count: number;
}
export interface DashboardGroupCount {
group: string;
count: number;
}
export interface DashboardSummaryResult {
summary: MonitorsSummary;
monitors: DashboardMonitorRow[];
slowestMonitors: DashboardMonitorRow[];
lowestUptimeMonitors: DashboardMonitorRow[];
downMonitors: DashboardMonitorRow[];
monitorsByType: DashboardTypeCount[];
monitorsByGroup: DashboardGroupCount[];
}
-1
View File
@@ -1887,7 +1887,6 @@
}
},
"dashboard": {
"error": "Failed to load data",
"monitorStatus": {
"ofUp": "of {{total}} up"
},
+1
View File
@@ -25,6 +25,7 @@ const persistConfig = {
storage,
whitelist: ["auth", "ui"],
transforms: [authTransform],
// Merge two levels deep on rehydrate so a slice key added in a new release keeps initial value
stateReconciler: autoMergeLevel2,
};