From 9d0dc3f330928375260023b95614d553d89bbe78 Mon Sep 17 00:00:00 2001 From: Malena Aguiar Date: Sat, 19 Sep 2026 14:57:30 -0600 Subject: [PATCH 1/2] feat(dashboard): add edit visible cards modal --- .../Dashboard/components/EditCardsModal.tsx | 71 +++++++++++++++++++ client/src/Pages/Dashboard/index.tsx | 58 ++++++++++++--- client/src/locales/en.json | 6 ++ 3 files changed, 126 insertions(+), 9 deletions(-) create mode 100644 client/src/Pages/Dashboard/components/EditCardsModal.tsx diff --git a/client/src/Pages/Dashboard/components/EditCardsModal.tsx b/client/src/Pages/Dashboard/components/EditCardsModal.tsx new file mode 100644 index 000000000..1ffbeeb1a --- /dev/null +++ b/client/src/Pages/Dashboard/components/EditCardsModal.tsx @@ -0,0 +1,71 @@ +import { useState, useEffect } from "react"; +import Stack from "@mui/material/Stack"; +import FormControlLabel from "@mui/material/FormControlLabel"; +import { useTranslation } from "react-i18next"; +import { Checkbox, Dialog } from "@/Components/inputs"; + +export type DashboardCardKey = "monitorStatus" | "monitorsByType"; + +interface EditCardsModalProps { + open: boolean; + visibleCards: Set; + onClose: () => void; + onSave: (visibleCards: Set) => void; +} + +const allCards: DashboardCardKey[] = ["monitorStatus", "monitorsByType"]; + +export const EditCardsModal = ({ + open, + visibleCards, + onClose, + onSave, +}: EditCardsModalProps) => { + const { t } = useTranslation(); + const [draft, setDraft] = useState>(new Set(visibleCards)); + + useEffect(() => { + if (open) setDraft(new Set(visibleCards)); + }, [open, visibleCards]); + + const handleToggle = (key: DashboardCardKey) => { + setDraft((prev) => { + const next = new Set(prev); + if (next.has(key)) { + next.delete(key); + } else { + next.add(key); + } + return next; + }); + }; + + return ( + onSave(draft)} + confirmText={t("pages.dashboard.editCardsModal.done")} + maxWidth="xs" + fullWidth + > + + {allCards.map((key) => ( + handleToggle(key)} + /> + } + /> + ))} + + + ); +}; diff --git a/client/src/Pages/Dashboard/index.tsx b/client/src/Pages/Dashboard/index.tsx index 845f4ab8c..2ad50da7e 100644 --- a/client/src/Pages/Dashboard/index.tsx +++ b/client/src/Pages/Dashboard/index.tsx @@ -1,17 +1,30 @@ -import { useMemo } from "react"; +import { useMemo, useState } from "react"; import Box from "@mui/material/Box"; +import Stack from "@mui/material/Stack"; import { useTheme } from "@mui/material/styles"; +import { useTranslation } from "react-i18next"; import { BasePage } from "@/Components/design-elements/BasePage"; +import { Button } from "@/Components/inputs"; import { LAYOUT } from "@/Utils/Theme/constants"; import { useMonitorListController } from "@/Hooks/useMonitorListController"; import { MonitorTypes, type MonitorTypeCount } from "@/Types/Monitor"; import { MonitorStatusCard } from "@/Pages/Dashboard/components/cards/MonitorStatusCard"; import { MonitorsByTypeCard } from "@/Pages/Dashboard/components/cards/MonitorsByTypeCard"; +import { + EditCardsModal, + type DashboardCardKey, +} from "@/Pages/Dashboard/components/EditCardsModal"; + +const allCards = new Set(["monitorStatus", "monitorsByType"]); const Dashboard = () => { const theme = useTheme(); + const { t } = useTranslation(); + const [editOpen, setEditOpen] = useState(false); + const [visibleCards, setVisibleCards] = useState>(allCards); + const { monitors, summary } = useMonitorListController({ types: [...MonitorTypes], checksLimit: 1, @@ -32,14 +45,41 @@ const Dashboard = () => { return ( - - - - + + + + + + + {visibleCards.has("monitorStatus") && } + {visibleCards.has("monitorsByType") && ( + + )} + + + + setEditOpen(false)} + onSave={(next) => { + setVisibleCards(next); + setEditOpen(false); + }} + /> ); }; diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 75e695c70..980fcd3ab 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -1922,6 +1922,12 @@ "header": { "title": "Dashboard", "description": "See every monitor type in one place and spot what needs attention." + }, + "editCards": "Edit cards", + "editCardsModal": { + "title": "Edit cards", + "description": "Select the cards to display on your dashboard.", + "done": "Done" } } } From a277a89befeacb852ac1cac8b85cfa4e1a0d8dad Mon Sep 17 00:00:00 2001 From: Malena Aguiar Date: Mon, 21 Sep 2026 18:29:48 -0600 Subject: [PATCH 2/2] feat(dashboard): add code refactors --- client/src/Features/UI/uiSlice.ts | 10 +++++ .../Dashboard/components/EditCardsModal.tsx | 18 ++++----- client/src/Pages/Dashboard/index.tsx | 38 ++++++++++++------- 3 files changed, 44 insertions(+), 22 deletions(-) diff --git a/client/src/Features/UI/uiSlice.ts b/client/src/Features/UI/uiSlice.ts index a07b629f8..143d170db 100644 --- a/client/src/Features/UI/uiSlice.ts +++ b/client/src/Features/UI/uiSlice.ts @@ -2,6 +2,10 @@ import { createSlice, type PayloadAction } from "@reduxjs/toolkit"; type ThemeMode = "light" | "dark"; type ChartType = "histogram" | "line"; + +export const dashboardCardKeys = ["monitorStatus", "monitorsByType"] as const; +export type DashboardCardKey = (typeof dashboardCardKeys)[number]; + type TableName = | "monitors" | "team" @@ -35,6 +39,7 @@ interface UIState { language: string; starPromptOpen: boolean; chartType: ChartType; + dashboardVisibleCards: DashboardCardKey[]; } const initialMode: ThemeMode = window?.matchMedia?.("(prefers-color-scheme: dark)") @@ -74,6 +79,7 @@ const initialState: UIState = { language: "en", starPromptOpen: true, chartType: "histogram", + dashboardVisibleCards: [...dashboardCardKeys], }; const uiSlice = createSlice({ @@ -117,6 +123,9 @@ const uiSlice = createSlice({ setChartType: (state, action: PayloadAction) => { state.chartType = action.payload; }, + setDashboardVisibleCards: (state, action: PayloadAction) => { + state.dashboardVisibleCards = action.payload; + }, }, }); @@ -133,4 +142,5 @@ export const { setLanguage, setStarPromptOpen, setChartType, + setDashboardVisibleCards, } = uiSlice.actions; diff --git a/client/src/Pages/Dashboard/components/EditCardsModal.tsx b/client/src/Pages/Dashboard/components/EditCardsModal.tsx index 1ffbeeb1a..48731eb9b 100644 --- a/client/src/Pages/Dashboard/components/EditCardsModal.tsx +++ b/client/src/Pages/Dashboard/components/EditCardsModal.tsx @@ -1,10 +1,11 @@ -import { useState, useEffect } from "react"; +import { useState } from "react"; import Stack from "@mui/material/Stack"; import FormControlLabel from "@mui/material/FormControlLabel"; import { useTranslation } from "react-i18next"; import { Checkbox, Dialog } from "@/Components/inputs"; +import { type DashboardCardKey, dashboardCardKeys } from "@/Features/UI/uiSlice"; -export type DashboardCardKey = "monitorStatus" | "monitorsByType"; +export type { DashboardCardKey }; interface EditCardsModalProps { open: boolean; @@ -13,8 +14,6 @@ interface EditCardsModalProps { onSave: (visibleCards: Set) => void; } -const allCards: DashboardCardKey[] = ["monitorStatus", "monitorsByType"]; - export const EditCardsModal = ({ open, visibleCards, @@ -24,9 +23,10 @@ export const EditCardsModal = ({ const { t } = useTranslation(); const [draft, setDraft] = useState>(new Set(visibleCards)); - useEffect(() => { - if (open) setDraft(new Set(visibleCards)); - }, [open, visibleCards]); + const handleClose = () => { + setDraft(new Set(visibleCards)); + onClose(); + }; const handleToggle = (key: DashboardCardKey) => { setDraft((prev) => { @@ -45,14 +45,14 @@ export const EditCardsModal = ({ open={open} title={t("pages.dashboard.editCardsModal.title")} content={t("pages.dashboard.editCardsModal.description")} - onCancel={onClose} + onCancel={handleClose} onConfirm={() => onSave(draft)} confirmText={t("pages.dashboard.editCardsModal.done")} maxWidth="xs" fullWidth > - {allCards.map((key) => ( + {dashboardCardKeys.map((key) => ( (["monitorStatus", "monitorsByType"]); +import { EditCardsModal } from "@/Pages/Dashboard/components/EditCardsModal"; const Dashboard = () => { const theme = useTheme(); const { t } = useTranslation(); + const dispatch = useDispatch(); const [editOpen, setEditOpen] = useState(false); - const [visibleCards, setVisibleCards] = useState>(allCards); + const visibleCardsList = useSelector( + (state: RootState) => state.ui.dashboardVisibleCards + ); + const visibleCards = useMemo(() => new Set(visibleCardsList), [visibleCardsList]); const { monitors, summary } = useMonitorListController({ types: [...MonitorTypes], @@ -43,6 +49,11 @@ const Dashboard = () => { .sort((a, b) => b.count - a.count); }, [monitors]); + const cardComponents: Record = { + monitorStatus: , + monitorsByType: , + }; + return ( @@ -64,10 +75,11 @@ const Dashboard = () => { gridTemplateColumns={{ xs: "1fr", md: "1fr 1fr" }} gap={theme.spacing(LAYOUT.MD)} > - {visibleCards.has("monitorStatus") && } - {visibleCards.has("monitorsByType") && ( - - )} + {dashboardCardKeys + .filter((key) => visibleCards.has(key)) + .map((key) => ( +
{cardComponents[key]}
+ ))}
@@ -76,7 +88,7 @@ const Dashboard = () => { visibleCards={visibleCards} onClose={() => setEditOpen(false)} onSave={(next) => { - setVisibleCards(next); + dispatch(setDashboardVisibleCards([...next])); setEditOpen(false); }} />