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 new file mode 100644 index 000000000..48731eb9b --- /dev/null +++ b/client/src/Pages/Dashboard/components/EditCardsModal.tsx @@ -0,0 +1,71 @@ +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 }; + +interface EditCardsModalProps { + open: boolean; + visibleCards: Set; + onClose: () => void; + onSave: (visibleCards: Set) => void; +} + +export const EditCardsModal = ({ + open, + visibleCards, + onClose, + onSave, +}: EditCardsModalProps) => { + const { t } = useTranslation(); + const [draft, setDraft] = useState>(new Set(visibleCards)); + + const handleClose = () => { + setDraft(new Set(visibleCards)); + onClose(); + }; + + 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 + > + + {dashboardCardKeys.map((key) => ( + handleToggle(key)} + /> + } + /> + ))} + + + ); +}; diff --git a/client/src/Pages/Dashboard/index.tsx b/client/src/Pages/Dashboard/index.tsx index 845f4ab8c..e92ec9791 100644 --- a/client/src/Pages/Dashboard/index.tsx +++ b/client/src/Pages/Dashboard/index.tsx @@ -1,17 +1,36 @@ -import { useMemo } from "react"; +import { useMemo, useState, type ReactNode } 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 { useSelector, useDispatch } from "react-redux"; 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 { + setDashboardVisibleCards, + dashboardCardKeys, + type DashboardCardKey, +} from "@/Features/UI/uiSlice"; +import type { RootState, AppDispatch } from "@/store"; import { MonitorStatusCard } from "@/Pages/Dashboard/components/cards/MonitorStatusCard"; import { MonitorsByTypeCard } from "@/Pages/Dashboard/components/cards/MonitorsByTypeCard"; +import { EditCardsModal } from "@/Pages/Dashboard/components/EditCardsModal"; const Dashboard = () => { const theme = useTheme(); + const { t } = useTranslation(); + const dispatch = useDispatch(); + const [editOpen, setEditOpen] = useState(false); + const visibleCardsList = useSelector( + (state: RootState) => state.ui.dashboardVisibleCards + ); + const visibleCards = useMemo(() => new Set(visibleCardsList), [visibleCardsList]); + const { monitors, summary } = useMonitorListController({ types: [...MonitorTypes], checksLimit: 1, @@ -30,16 +49,49 @@ const Dashboard = () => { .sort((a, b) => b.count - a.count); }, [monitors]); + const cardComponents: Record = { + monitorStatus: , + monitorsByType: , + }; + return ( - - - - + + + + + + + {dashboardCardKeys + .filter((key) => visibleCards.has(key)) + .map((key) => ( +
{cardComponents[key]}
+ ))} +
+
+ + setEditOpen(false)} + onSave={(next) => { + dispatch(setDashboardVisibleCards([...next])); + setEditOpen(false); + }} + />
); }; diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 57ddc5707..562cdc2e4 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" } } }