refactor monitor pages
This commit is contained in:
1 parent
e444d5fbe6
commit
0c9334071f
4 files changed
+94
-744
No files matched your search
@@ -1,274 +1,44 @@
|
|||||||
import Stack from "@mui/material/Stack";
|
import { MonitorListPage } from "@/Components/monitors";
|
||||||
import Typography from "@mui/material/Typography";
|
import { InfraMonitorsTable } from "@/Pages/Infrastructure/Monitors/Components/MonitorsTable";
|
||||||
import useMediaQuery from "@mui/material/useMediaQuery";
|
|
||||||
import { MonitorBasePageWithStates, ColoredLabel } from "@/Components/design-elements";
|
|
||||||
import { HeaderCreate } from "@/Components/common";
|
|
||||||
import {
|
|
||||||
ControlsFilter,
|
|
||||||
HeaderMonitorsSummary,
|
|
||||||
BulkActionsBar,
|
|
||||||
} from "@/Components/monitors";
|
|
||||||
import { TextField, Dialog, Button } from "@/Components/inputs";
|
|
||||||
import { Play, Pause } from "lucide-react";
|
|
||||||
|
|
||||||
import { useGet, useDelete } from "@/Hooks/UseApi";
|
import { useMonitorListController } from "@/Hooks/useMonitorListController";
|
||||||
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
|
||||||
import type { Monitor, MonitorsWithChecksResponse } from "@/Types/Monitor";
|
|
||||||
import type { Tag } from "@/Types/Tag";
|
|
||||||
import { useTheme } from "@mui/material";
|
|
||||||
import { SPACING } from "@/Utils/Theme/constants";
|
|
||||||
import { useState, useCallback, useMemo } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
|
||||||
import { setRowsPerPage } from "@/Features/UI/uiSlice.js";
|
|
||||||
import type { RootState } from "@/Types/state";
|
|
||||||
import { InfraMonitorsTable } from "./Components/MonitorsTable";
|
|
||||||
import useDebounce from "@/Hooks/useDebounce";
|
|
||||||
import { useBulkMonitorActions } from "@/Hooks/useBulkMonitorActions";
|
|
||||||
|
|
||||||
const InfrastructureMonitors = () => {
|
const InfrastructureMonitors = () => {
|
||||||
const { t } = useTranslation();
|
const c = useMonitorListController({
|
||||||
const theme = useTheme();
|
types: ["hardware"],
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
checksLimit: 1,
|
||||||
const isAdmin = useIsAdmin();
|
refreshInterval: 5000,
|
||||||
const dispatch = useDispatch();
|
rowsPerPageTable: "infrastructure",
|
||||||
|
rowsPerPageDefault: 5,
|
||||||
// Redux state
|
});
|
||||||
const rowsPerPage = useSelector(
|
|
||||||
(state: RootState) => state.ui?.infrastructure?.rowsPerPage ?? 5
|
|
||||||
);
|
|
||||||
|
|
||||||
// Local state
|
|
||||||
const [selectedStatus, setSelectedStatus] = useState<string>("");
|
|
||||||
const [selectedState, setSelectedState] = useState<string>("");
|
|
||||||
const [selectedTags, setSelectedTags] = useState<string[]>([]);
|
|
||||||
const [search, setSearch] = useState<string>("");
|
|
||||||
const [page, setPage] = useState<number>(0);
|
|
||||||
const [sortField, setSortField] = useState<string>("");
|
|
||||||
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
|
|
||||||
const [selectedMonitor, setSelectedMonitor] = useState<Monitor | null>(null);
|
|
||||||
|
|
||||||
const { data: tags } = useGet<Tag[]>("/tags/team");
|
|
||||||
|
|
||||||
const isDialogOpen = Boolean(selectedMonitor);
|
|
||||||
|
|
||||||
const debouncedSearch = useDebounce<string>(search, 300);
|
|
||||||
|
|
||||||
const handleClearFilters = useCallback(() => {
|
|
||||||
setSelectedStatus("");
|
|
||||||
setSelectedState("");
|
|
||||||
setSelectedTags([]);
|
|
||||||
setSearch("");
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
// Convert filter selections to API filter values
|
|
||||||
const toFilterStatus = useMemo(() => {
|
|
||||||
if (selectedStatus === "up") return "true";
|
|
||||||
if (selectedStatus === "down") return "false";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedStatus]);
|
|
||||||
|
|
||||||
const toFilterActive = useMemo(() => {
|
|
||||||
if (selectedState === "active") return "true";
|
|
||||||
if (selectedState === "paused") return "false";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedState]);
|
|
||||||
|
|
||||||
// Determine field and filter for the API request
|
|
||||||
// Priority: status > isActive > search
|
|
||||||
const filterLookup = new Map<string | undefined, string>([
|
|
||||||
[toFilterStatus, "status"],
|
|
||||||
[toFilterActive, "isActive"],
|
|
||||||
]);
|
|
||||||
const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
|
|
||||||
const field = activeFilter?.[1] || (debouncedSearch ? "name" : sortField || undefined);
|
|
||||||
const filter = activeFilter?.[0] || debouncedSearch || undefined;
|
|
||||||
|
|
||||||
// Build URL for monitors with checks
|
|
||||||
const monitorsWithChecksUrl = useMemo(() => {
|
|
||||||
const params = new URLSearchParams();
|
|
||||||
params.append("type", "hardware");
|
|
||||||
selectedTags.forEach((tagId) => params.append("tags", tagId));
|
|
||||||
params.append("limit", "1");
|
|
||||||
if (page !== undefined) params.append("page", String(page));
|
|
||||||
if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
|
|
||||||
if (filter) params.append("filter", filter);
|
|
||||||
if (field) params.append("field", field);
|
|
||||||
if (sortOrder) params.append("order", sortOrder);
|
|
||||||
return `/monitors/team/with-checks?${params.toString()}`;
|
|
||||||
}, [page, rowsPerPage, filter, field, sortOrder, selectedTags]);
|
|
||||||
|
|
||||||
const {
|
|
||||||
data: monitorsWithChecksData,
|
|
||||||
isLoading: monitorsWithChecksLoading,
|
|
||||||
error: monitorsWithChecksError,
|
|
||||||
refetch,
|
|
||||||
} = useGet<MonitorsWithChecksResponse>(
|
|
||||||
monitorsWithChecksUrl,
|
|
||||||
{},
|
|
||||||
{ refreshInterval: 5000, keepPreviousData: true }
|
|
||||||
);
|
|
||||||
|
|
||||||
const { summary, count } = monitorsWithChecksData ?? { summary: null, count: 0 };
|
|
||||||
const isLoading = monitorsWithChecksLoading;
|
|
||||||
|
|
||||||
// Bulk actions
|
|
||||||
const {
|
|
||||||
selectedRows,
|
|
||||||
setSelectedRows,
|
|
||||||
handleBulkPause,
|
|
||||||
handleBulkResume,
|
|
||||||
handleCancelSelection,
|
|
||||||
} = useBulkMonitorActions(refetch, page);
|
|
||||||
|
|
||||||
// Check if any filters are active
|
|
||||||
const hasActiveFilters = Boolean(
|
|
||||||
selectedStatus || selectedState || selectedTags.length > 0 || search
|
|
||||||
);
|
|
||||||
|
|
||||||
// Show empty state only when there are truly no monitors (not just filtered out)
|
|
||||||
const effectiveTotalCount =
|
|
||||||
hasActiveFilters && (summary?.totalMonitors ?? 0) === 0
|
|
||||||
? 1
|
|
||||||
: (summary?.totalMonitors ?? 0);
|
|
||||||
|
|
||||||
// Delete hook
|
|
||||||
const { deleteFn, loading: isDeleting } = useDelete();
|
|
||||||
|
|
||||||
const handleConfirm = async () => {
|
|
||||||
if (!selectedMonitor) return;
|
|
||||||
await deleteFn(`/monitors/${selectedMonitor.id}`);
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
refetch();
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleCancel = () => {
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MonitorBasePageWithStates
|
<MonitorListPage
|
||||||
headerKey="infrastructure"
|
headerKey="infrastructure"
|
||||||
loading={isLoading}
|
|
||||||
error={monitorsWithChecksError}
|
|
||||||
totalCount={effectiveTotalCount}
|
|
||||||
page="infrastructure"
|
page="infrastructure"
|
||||||
actionLink="/infrastructure/create"
|
actionLink="/infrastructure/create"
|
||||||
|
controller={c}
|
||||||
|
bulkActions
|
||||||
|
showTypeFilter={false}
|
||||||
|
summaryProps={{ showBreached: true }}
|
||||||
>
|
>
|
||||||
<HeaderCreate
|
|
||||||
path="/infrastructure/create"
|
|
||||||
isLoading={isLoading}
|
|
||||||
isAdmin={isAdmin}
|
|
||||||
/>
|
|
||||||
<HeaderMonitorsSummary
|
|
||||||
summary={summary}
|
|
||||||
showBreached={true}
|
|
||||||
/>
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
justifyContent={isSmall ? "flex-start" : "space-between"}
|
|
||||||
gap={theme.spacing(4)}
|
|
||||||
>
|
|
||||||
<ControlsFilter
|
|
||||||
showTypes={false}
|
|
||||||
selectedStatus={selectedStatus}
|
|
||||||
setSelectedStatus={setSelectedStatus}
|
|
||||||
selectedState={selectedState}
|
|
||||||
setSelectedState={setSelectedState}
|
|
||||||
tagOptions={tags ?? []}
|
|
||||||
selectedTags={selectedTags}
|
|
||||||
setSelectedTags={setSelectedTags}
|
|
||||||
onClearFilters={handleClearFilters}
|
|
||||||
/>
|
|
||||||
<TextField
|
|
||||||
placeholder={t("pages.uptime.filters.search.placeholder")}
|
|
||||||
value={search}
|
|
||||||
onChange={(event) => {
|
|
||||||
setSearch(event.target.value);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
{selectedTags.length > 0 && (
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
alignItems={isSmall ? "flex-start" : "center"}
|
|
||||||
flexWrap="wrap"
|
|
||||||
gap={theme.spacing(SPACING.XL)}
|
|
||||||
>
|
|
||||||
<Typography color={theme.palette.text.secondary}>
|
|
||||||
{t("pages.uptime.filters.activeTags")}
|
|
||||||
</Typography>
|
|
||||||
{selectedTags.map((tagId) => {
|
|
||||||
const tag = tags?.find((t) => t.id === tagId);
|
|
||||||
if (!tag) return null;
|
|
||||||
return (
|
|
||||||
<ColoredLabel
|
|
||||||
key={tag.id}
|
|
||||||
text={tag.name}
|
|
||||||
color={tag.color}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</Stack>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{!isLoading && (
|
|
||||||
<BulkActionsBar
|
|
||||||
selectedCount={selectedRows.length}
|
|
||||||
onCancel={handleCancelSelection}
|
|
||||||
>
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
startIcon={<Play size={16} />}
|
|
||||||
onClick={handleBulkResume}
|
|
||||||
>
|
|
||||||
{t("common.buttons.resume")}
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
startIcon={<Pause size={16} />}
|
|
||||||
onClick={handleBulkPause}
|
|
||||||
>
|
|
||||||
{t("common.buttons.pause")}
|
|
||||||
</Button>
|
|
||||||
</BulkActionsBar>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<InfraMonitorsTable
|
<InfraMonitorsTable
|
||||||
monitors={monitorsWithChecksData?.monitors || []}
|
monitors={c.monitors || []}
|
||||||
tags={tags ?? []}
|
tags={c.tags || []}
|
||||||
refetch={refetch}
|
refetch={c.refetch}
|
||||||
setSelectedMonitor={setSelectedMonitor}
|
setSelectedMonitor={c.setSelectedMonitor}
|
||||||
sortField={sortField}
|
count={c.count || 0}
|
||||||
setSortField={setSortField}
|
page={c.page}
|
||||||
sortOrder={sortOrder}
|
setPage={c.setPage}
|
||||||
setSortOrder={setSortOrder}
|
rowsPerPage={c.rowsPerPage}
|
||||||
count={count || 0}
|
sortField={c.sortField}
|
||||||
page={page}
|
setSortField={c.setSortField}
|
||||||
setPage={setPage}
|
sortOrder={c.sortOrder}
|
||||||
rowsPerPage={rowsPerPage}
|
setSortOrder={c.setSortOrder}
|
||||||
setRowsPerPage={(value: number) => {
|
setRowsPerPage={c.handleSetRowsPerPage}
|
||||||
dispatch(
|
selectedRows={c.selectedRows}
|
||||||
setRowsPerPage({
|
onSelectionChange={c.setSelectedRows}
|
||||||
value,
|
|
||||||
table: "infrastructure",
|
|
||||||
})
|
|
||||||
);
|
|
||||||
setPage(0);
|
|
||||||
}}
|
|
||||||
selectedRows={selectedRows}
|
|
||||||
onSelectionChange={setSelectedRows}
|
|
||||||
/>
|
/>
|
||||||
<Dialog
|
</MonitorListPage>
|
||||||
open={isDialogOpen}
|
|
||||||
title={t("common.dialogs.delete.title")}
|
|
||||||
content={t("common.dialogs.delete.description")}
|
|
||||||
onConfirm={handleConfirm}
|
|
||||||
onCancel={handleCancel}
|
|
||||||
loading={isDeleting}
|
|
||||||
/>
|
|
||||||
</MonitorBasePageWithStates>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,229 +1,57 @@
|
|||||||
import {
|
import { PageSpeedKeyPriorityFallback } from "@/Components/design-elements";
|
||||||
MonitorBasePageWithStates,
|
|
||||||
PageSpeedKeyPriorityFallback,
|
|
||||||
ColoredLabel,
|
|
||||||
} from "@/Components/design-elements";
|
|
||||||
import { Dialog, TextField } from "@/Components/inputs";
|
|
||||||
import { HeaderCreate } from "@/Components/common";
|
|
||||||
import { PageSpeedMonitorsTable } from "@/Pages/PageSpeed/Monitors/Components/PageSpeedMonitorsTable";
|
import { PageSpeedMonitorsTable } from "@/Pages/PageSpeed/Monitors/Components/PageSpeedMonitorsTable";
|
||||||
import type { Monitor } from "@/Types/Monitor";
|
|
||||||
import type { Tag } from "@/Types/Tag";
|
|
||||||
import Stack from "@mui/material/Stack";
|
|
||||||
import Typography from "@mui/material/Typography";
|
|
||||||
import useMediaQuery from "@mui/material/useMediaQuery";
|
|
||||||
import { useTheme } from "@mui/material";
|
|
||||||
import { SPACING } from "@/Utils/Theme/constants";
|
|
||||||
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
import { useCallback, useMemo, useState } from "react";
|
|
||||||
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
||||||
import { useGet, useDelete } from "@/Hooks/UseApi";
|
import { useGet } from "@/Hooks/UseApi";
|
||||||
import useDebounce from "@/Hooks/useDebounce";
|
|
||||||
import type { MonitorsWithChecksResponse } from "@/Types/Monitor";
|
|
||||||
import type { AppSettingsResponse } from "@/Types/Settings";
|
import type { AppSettingsResponse } from "@/Types/Settings";
|
||||||
import { ControlsFilter, HeaderMonitorsSummary } from "@/Components/monitors";
|
import { MonitorListPage } from "@/Components/monitors";
|
||||||
|
import { useMonitorListController } from "@/Hooks/useMonitorListController";
|
||||||
|
|
||||||
const PageSpeedMonitorsPage = () => {
|
const PageSpeedMonitorsPage = () => {
|
||||||
const { t } = useTranslation();
|
|
||||||
const theme = useTheme();
|
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
|
||||||
const isAdmin = useIsAdmin();
|
const isAdmin = useIsAdmin();
|
||||||
const { deleteFn, loading: isDeleting } = useDelete();
|
|
||||||
|
|
||||||
const settingsUrl = "/settings";
|
|
||||||
const {
|
const {
|
||||||
data: settingsData,
|
data: settingsData,
|
||||||
isLoading: settingsIsLoading,
|
isLoading: settingsIsLoading,
|
||||||
error: settingsError,
|
error: settingsError,
|
||||||
} = useGet<AppSettingsResponse>(settingsUrl);
|
} = useGet<AppSettingsResponse>("/settings");
|
||||||
|
|
||||||
const [selectedMonitor, setSelectedMonitor] = useState<Monitor | null>(null);
|
const c = useMonitorListController({
|
||||||
const isDialogOpen = Boolean(selectedMonitor);
|
types: ["pagespeed"],
|
||||||
const [sortField, setSortField] = useState<string>("name");
|
checksLimit: 25,
|
||||||
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
|
refreshInterval: 30000,
|
||||||
const [page, setPage] = useState(0);
|
rowsPerPageTable: "pagespeed",
|
||||||
const [rowsPerPage, setRowsPerPage] = useState(10);
|
rowsPerPageDefault: 10,
|
||||||
const [selectedTags, setSelectedTags] = useState<string[]>([]);
|
initialSortField: "name",
|
||||||
const [selectedStatus, setSelectedStatus] = useState<string>("");
|
});
|
||||||
const [selectedState, setSelectedState] = useState<string>("");
|
|
||||||
const [search, setSearch] = useState<string>("");
|
|
||||||
|
|
||||||
const debouncedSearch = useDebounce<string>(search, 300);
|
|
||||||
|
|
||||||
// Status: pass "up"/"down" directly to the API
|
|
||||||
// State: "active" -> true, "paused" -> false
|
|
||||||
const toFilterStatus = useMemo(() => {
|
|
||||||
if (selectedStatus === "up") return "up";
|
|
||||||
if (selectedStatus === "down") return "down";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedStatus]);
|
|
||||||
|
|
||||||
const toFilterActive = useMemo(() => {
|
|
||||||
if (selectedState === "active") return "true";
|
|
||||||
if (selectedState === "paused") return "false";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedState]);
|
|
||||||
|
|
||||||
// Priority: status > isActive > search > sort
|
|
||||||
const filterLookup = new Map<string | undefined, string>([
|
|
||||||
[toFilterStatus, "status"],
|
|
||||||
[toFilterActive, "isActive"],
|
|
||||||
]);
|
|
||||||
const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
|
|
||||||
const field = activeFilter?.[1] || (debouncedSearch ? "name" : sortField || undefined);
|
|
||||||
const filter = activeFilter?.[0] || debouncedSearch;
|
|
||||||
|
|
||||||
const { data: tags } = useGet<Tag[]>("/tags/team");
|
|
||||||
|
|
||||||
const monitorsWithChecksUrl = useMemo(() => {
|
|
||||||
const params = new URLSearchParams();
|
|
||||||
params.append("type", "pagespeed");
|
|
||||||
selectedTags.forEach((tagId) => params.append("tags", tagId));
|
|
||||||
params.append("limit", "25");
|
|
||||||
if (page !== undefined) params.append("page", String(page));
|
|
||||||
if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
|
|
||||||
if (filter) params.append("filter", filter);
|
|
||||||
if (field) params.append("field", field);
|
|
||||||
if (sortOrder) params.append("order", sortOrder);
|
|
||||||
return `/monitors/team/with-checks?${params.toString()}`;
|
|
||||||
}, [page, rowsPerPage, sortOrder, selectedTags, filter, field]);
|
|
||||||
|
|
||||||
const {
|
|
||||||
data: monitorsData,
|
|
||||||
isLoading: monitorsIsLoading,
|
|
||||||
error: monitorsError,
|
|
||||||
refetch,
|
|
||||||
} = useGet<MonitorsWithChecksResponse>(
|
|
||||||
monitorsWithChecksUrl,
|
|
||||||
{},
|
|
||||||
{ refreshInterval: 30000 }
|
|
||||||
);
|
|
||||||
|
|
||||||
const monitors = monitorsData?.monitors;
|
|
||||||
const monitorsCount = monitorsData?.count ?? 0;
|
|
||||||
const summary = monitorsData?.summary ?? null;
|
|
||||||
|
|
||||||
const isLoading = monitorsIsLoading || settingsIsLoading;
|
|
||||||
|
|
||||||
const showApiKeyWarning = isAdmin && settingsData && !settingsData.pagespeedKeySet;
|
const showApiKeyWarning = isAdmin && settingsData && !settingsData.pagespeedKeySet;
|
||||||
|
|
||||||
const handleConfirm = async () => {
|
|
||||||
if (!selectedMonitor) return;
|
|
||||||
await deleteFn(`/monitors/${selectedMonitor.id}`);
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
refetch();
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleCancel = () => {
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleClearFilters = useCallback(() => {
|
|
||||||
setSelectedStatus("");
|
|
||||||
setSelectedState("");
|
|
||||||
setSelectedTags([]);
|
|
||||||
setSearch("");
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const hasActiveFilters = Boolean(
|
|
||||||
selectedStatus || selectedState || selectedTags.length > 0 || search
|
|
||||||
);
|
|
||||||
|
|
||||||
const effectiveTotalCount =
|
|
||||||
hasActiveFilters && (summary?.totalMonitors ?? 0) === 0
|
|
||||||
? 1
|
|
||||||
: (summary?.totalMonitors ?? 0);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MonitorBasePageWithStates
|
<MonitorListPage
|
||||||
headerKey="pageSpeed"
|
headerKey="pageSpeed"
|
||||||
loading={isLoading}
|
|
||||||
error={monitorsError || settingsError}
|
|
||||||
totalCount={effectiveTotalCount}
|
|
||||||
page="pageSpeed"
|
page="pageSpeed"
|
||||||
actionLink="/pagespeed/create"
|
actionLink="/pagespeed/create"
|
||||||
|
controller={c}
|
||||||
|
showTypeFilter={false}
|
||||||
|
extraLoading={settingsIsLoading}
|
||||||
|
extraError={settingsError}
|
||||||
priorityFallback={showApiKeyWarning ? <PageSpeedKeyPriorityFallback /> : undefined}
|
priorityFallback={showApiKeyWarning ? <PageSpeedKeyPriorityFallback /> : undefined}
|
||||||
>
|
>
|
||||||
<HeaderCreate
|
|
||||||
path="/pagespeed/create"
|
|
||||||
isLoading={isLoading}
|
|
||||||
isAdmin={isAdmin}
|
|
||||||
/>
|
|
||||||
<HeaderMonitorsSummary summary={summary} />
|
|
||||||
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
justifyContent={isSmall ? "flex-start" : "space-between"}
|
|
||||||
gap={theme.spacing(4)}
|
|
||||||
>
|
|
||||||
<ControlsFilter
|
|
||||||
showTypes={false}
|
|
||||||
selectedStatus={selectedStatus}
|
|
||||||
setSelectedStatus={setSelectedStatus}
|
|
||||||
selectedState={selectedState}
|
|
||||||
setSelectedState={setSelectedState}
|
|
||||||
tagOptions={tags ?? []}
|
|
||||||
selectedTags={selectedTags}
|
|
||||||
setSelectedTags={setSelectedTags}
|
|
||||||
onClearFilters={handleClearFilters}
|
|
||||||
/>
|
|
||||||
<TextField
|
|
||||||
placeholder={t("pages.uptime.filters.search.placeholder")}
|
|
||||||
value={search}
|
|
||||||
onChange={(event) => {
|
|
||||||
setSearch(event.target.value);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
{selectedTags.length > 0 && (
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
alignItems={isSmall ? "flex-start" : "center"}
|
|
||||||
flexWrap="wrap"
|
|
||||||
gap={theme.spacing(SPACING.XL)}
|
|
||||||
>
|
|
||||||
<Typography color={theme.palette.text.secondary}>
|
|
||||||
{t("pages.uptime.filters.activeTags")}
|
|
||||||
</Typography>
|
|
||||||
{selectedTags.map((tagId) => {
|
|
||||||
const tag = tags?.find((t) => t.id === tagId);
|
|
||||||
if (!tag) return null;
|
|
||||||
return (
|
|
||||||
<ColoredLabel
|
|
||||||
key={tag.id}
|
|
||||||
text={tag.name}
|
|
||||||
color={tag.color}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</Stack>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<PageSpeedMonitorsTable
|
<PageSpeedMonitorsTable
|
||||||
monitors={monitors || []}
|
monitors={c.monitors || []}
|
||||||
tags={tags ?? []}
|
tags={c.tags || []}
|
||||||
refetch={refetch}
|
refetch={c.refetch}
|
||||||
setSelectedMonitor={setSelectedMonitor}
|
setSelectedMonitor={c.setSelectedMonitor}
|
||||||
sortField={sortField}
|
count={c.count || 0}
|
||||||
setSortField={setSortField}
|
page={c.page}
|
||||||
sortOrder={sortOrder}
|
setPage={c.setPage}
|
||||||
setSortOrder={setSortOrder}
|
rowsPerPage={c.rowsPerPage}
|
||||||
count={monitorsCount || 0}
|
sortField={c.sortField}
|
||||||
page={page}
|
setSortField={c.setSortField}
|
||||||
setPage={setPage}
|
sortOrder={c.sortOrder}
|
||||||
rowsPerPage={rowsPerPage}
|
setSortOrder={c.setSortOrder}
|
||||||
setRowsPerPage={setRowsPerPage}
|
setRowsPerPage={c.handleSetRowsPerPage}
|
||||||
/>
|
/>
|
||||||
<Dialog
|
</MonitorListPage>
|
||||||
open={isDialogOpen}
|
|
||||||
title={t("common.dialogs.delete.title")}
|
|
||||||
content={t("common.dialogs.delete.description")}
|
|
||||||
onConfirm={handleConfirm}
|
|
||||||
onCancel={handleCancel}
|
|
||||||
loading={isDeleting}
|
|
||||||
/>
|
|
||||||
</MonitorBasePageWithStates>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,294 +1,43 @@
|
|||||||
import {
|
import { MonitorListPage } from "@/Components/monitors";
|
||||||
ControlsFilter,
|
|
||||||
HeaderMonitorsSummary,
|
|
||||||
BulkActionsBar,
|
|
||||||
} from "@/Components/monitors";
|
|
||||||
import { MonitorBasePageWithStates, ColoredLabel } from "@/Components/design-elements";
|
|
||||||
import { TextField, Dialog, Button } from "@/Components/inputs";
|
|
||||||
import Stack from "@mui/material/Stack";
|
|
||||||
import { MonitorTable } from "@/Pages/Uptime/Monitors/Components/UptimeMonitorsTable";
|
import { MonitorTable } from "@/Pages/Uptime/Monitors/Components/UptimeMonitorsTable";
|
||||||
import { HeaderCreate } from "@/Components/common";
|
|
||||||
import { Play, Pause } from "lucide-react";
|
|
||||||
import Typography from "@mui/material/Typography";
|
|
||||||
|
|
||||||
import { useTranslation } from "react-i18next";
|
import { useMonitorListController } from "@/Hooks/useMonitorListController";
|
||||||
import useMediaQuery from "@mui/material/useMediaQuery";
|
|
||||||
import { useGet, useDelete } from "@/Hooks/UseApi";
|
|
||||||
import type { Monitor, MonitorType, MonitorsWithChecksResponse } from "@/Types/Monitor";
|
|
||||||
import type { Tag } from "@/Types/Tag";
|
|
||||||
import { useState, useMemo, useCallback } from "react";
|
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
|
||||||
import { setRowsPerPage } from "@/Features/UI/uiSlice.js";
|
|
||||||
import { useIsAdmin } from "@/Hooks/useIsAdmin";
|
|
||||||
import type { RootState } from "@/Types/state";
|
|
||||||
import { useTheme } from "@mui/material";
|
|
||||||
import useDebounce from "@/Hooks/useDebounce";
|
|
||||||
import { useBulkMonitorActions } from "@/Hooks/useBulkMonitorActions";
|
|
||||||
import { SPACING } from "@/Utils/Theme/constants";
|
|
||||||
|
|
||||||
const UptimeMonitorsPage = () => {
|
const UptimeMonitorsPage = () => {
|
||||||
const { t } = useTranslation();
|
const c = useMonitorListController({
|
||||||
const theme = useTheme();
|
types: "selectable",
|
||||||
const isSmall = useMediaQuery(theme.breakpoints.down("md"));
|
checksLimit: 25,
|
||||||
const dispatch = useDispatch();
|
refreshInterval: 5000,
|
||||||
const isAdmin = useIsAdmin();
|
rowsPerPageTable: "monitors",
|
||||||
// Redux state
|
rowsPerPageDefault: 10,
|
||||||
const rowsPerPage = useSelector(
|
});
|
||||||
(state: RootState) => state.ui?.monitors?.rowsPerPage ?? 10
|
|
||||||
);
|
|
||||||
|
|
||||||
// Local state
|
|
||||||
const [selectedTypes, setSelectedTypes] = useState<MonitorType[]>([]);
|
|
||||||
const [selectedStatus, setSelectedStatus] = useState<string>("");
|
|
||||||
const [selectedState, setSelectedState] = useState<string>("");
|
|
||||||
const [selectedTags, setSelectedTags] = useState<string[]>([]);
|
|
||||||
const [page, setPage] = useState<number>(0);
|
|
||||||
const [search, setSearch] = useState<string>("");
|
|
||||||
const [sortField, setSortField] = useState<string>("");
|
|
||||||
const [sortOrder, setSortOrder] = useState<"asc" | "desc">("asc");
|
|
||||||
const [selectedMonitor, setSelectedMonitor] = useState<Monitor | null>(null);
|
|
||||||
|
|
||||||
const isDialogOpen = Boolean(selectedMonitor);
|
|
||||||
|
|
||||||
const debouncedSearch = useDebounce<string>(search, 300);
|
|
||||||
|
|
||||||
// Convert filter selections to API filter values
|
|
||||||
// Status: pass "up"/"down" directly to the API
|
|
||||||
// State: "active" -> true, "paused" -> false
|
|
||||||
const toFilterStatus = useMemo(() => {
|
|
||||||
if (selectedStatus === "up") return "up";
|
|
||||||
if (selectedStatus === "down") return "down";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedStatus]);
|
|
||||||
|
|
||||||
const toFilterActive = useMemo(() => {
|
|
||||||
if (selectedState === "active") return "true";
|
|
||||||
if (selectedState === "paused") return "false";
|
|
||||||
return undefined;
|
|
||||||
}, [selectedState]);
|
|
||||||
|
|
||||||
// Determine field and filter for the API request
|
|
||||||
// Priority: status > isActive > search > sort
|
|
||||||
const filterLookup = new Map<string | undefined, string>([
|
|
||||||
[toFilterStatus, "status"],
|
|
||||||
[toFilterActive, "isActive"],
|
|
||||||
]);
|
|
||||||
const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
|
|
||||||
const field = activeFilter?.[1] || (debouncedSearch ? "name" : sortField || undefined);
|
|
||||||
const filter = activeFilter?.[0] || debouncedSearch;
|
|
||||||
|
|
||||||
// Default to all types when none selected
|
|
||||||
const effectiveTypes =
|
|
||||||
selectedTypes.length > 0
|
|
||||||
? selectedTypes
|
|
||||||
: ["http", "ping", "docker", "port", "game", "grpc", "websocket", "dns"];
|
|
||||||
|
|
||||||
// Build URL for monitors with checks
|
|
||||||
const monitorsWithChecksUrl = useMemo(() => {
|
|
||||||
const params = new URLSearchParams();
|
|
||||||
effectiveTypes.forEach((type) => params.append("type", type));
|
|
||||||
selectedTags.forEach((tagId) => params.append("tags", tagId));
|
|
||||||
params.append("limit", "25");
|
|
||||||
if (page !== undefined) params.append("page", String(page));
|
|
||||||
if (rowsPerPage) params.append("rowsPerPage", String(rowsPerPage));
|
|
||||||
if (filter) params.append("filter", filter);
|
|
||||||
if (field) params.append("field", field);
|
|
||||||
if (sortOrder) params.append("order", sortOrder);
|
|
||||||
return `/monitors/team/with-checks?${params.toString()}`;
|
|
||||||
}, [effectiveTypes, selectedTags, page, rowsPerPage, filter, field, sortOrder]);
|
|
||||||
|
|
||||||
const {
|
|
||||||
data: monitorsWithChecksData,
|
|
||||||
isLoading: monitorsWithChecksLoading,
|
|
||||||
error: monitorsWithChecksError,
|
|
||||||
refetch,
|
|
||||||
} = useGet<MonitorsWithChecksResponse>(
|
|
||||||
monitorsWithChecksUrl,
|
|
||||||
{},
|
|
||||||
{ refreshInterval: 5000, keepPreviousData: true }
|
|
||||||
);
|
|
||||||
|
|
||||||
const { data: tags } = useGet<Tag[]>("/tags/team");
|
|
||||||
|
|
||||||
const {
|
|
||||||
monitors: monitorsWithChecks,
|
|
||||||
summary,
|
|
||||||
count,
|
|
||||||
} = monitorsWithChecksData ?? { monitors: null, summary: null, count: 0 };
|
|
||||||
|
|
||||||
// Bulk actions
|
|
||||||
const {
|
|
||||||
selectedRows,
|
|
||||||
setSelectedRows,
|
|
||||||
handleBulkPause,
|
|
||||||
handleBulkResume,
|
|
||||||
handleCancelSelection,
|
|
||||||
} = useBulkMonitorActions(refetch, page);
|
|
||||||
|
|
||||||
// Delete hook
|
|
||||||
const { deleteFn, loading: isDeleting } = useDelete();
|
|
||||||
|
|
||||||
// Handlers
|
|
||||||
const handleClearFilters = useCallback(() => {
|
|
||||||
setSelectedTypes([]);
|
|
||||||
setSelectedStatus("");
|
|
||||||
setSelectedState("");
|
|
||||||
setSelectedTags([]);
|
|
||||||
setSearch("");
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const handleConfirm = async () => {
|
|
||||||
if (!selectedMonitor) return;
|
|
||||||
await deleteFn(`/monitors/${selectedMonitor.id}`);
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
refetch();
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleCancel = () => {
|
|
||||||
setSelectedMonitor(null);
|
|
||||||
};
|
|
||||||
|
|
||||||
const isLoading = monitorsWithChecksLoading;
|
|
||||||
|
|
||||||
// Check if any filters are active
|
|
||||||
const hasActiveFilters = Boolean(
|
|
||||||
selectedTypes.length > 0 ||
|
|
||||||
selectedStatus ||
|
|
||||||
selectedState ||
|
|
||||||
selectedTags.length > 0 ||
|
|
||||||
search
|
|
||||||
);
|
|
||||||
|
|
||||||
// Show empty state only when there are truly no monitors (not just filtered out)
|
|
||||||
// If filters are active and count is 0, pass 1 to prevent empty state fallback
|
|
||||||
const effectiveTotalCount =
|
|
||||||
hasActiveFilters && (summary?.totalMonitors ?? 0) === 0
|
|
||||||
? 1
|
|
||||||
: (summary?.totalMonitors ?? 0);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MonitorBasePageWithStates
|
<MonitorListPage
|
||||||
headerKey="uptime"
|
headerKey="uptime"
|
||||||
loading={isLoading}
|
|
||||||
error={monitorsWithChecksError}
|
|
||||||
totalCount={effectiveTotalCount}
|
|
||||||
page="uptime"
|
page="uptime"
|
||||||
actionLink="/uptime/create"
|
actionLink="/uptime/create"
|
||||||
|
controller={c}
|
||||||
|
bulkActions
|
||||||
>
|
>
|
||||||
<HeaderCreate
|
|
||||||
path="/uptime/create"
|
|
||||||
isLoading={isLoading}
|
|
||||||
isAdmin={isAdmin}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<HeaderMonitorsSummary summary={summary} />
|
|
||||||
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
justifyContent={isSmall ? "flex-start" : "space-between"}
|
|
||||||
gap={theme.spacing(4)}
|
|
||||||
>
|
|
||||||
<ControlsFilter
|
|
||||||
selectedTypes={selectedTypes}
|
|
||||||
setSelectedTypes={setSelectedTypes}
|
|
||||||
selectedStatus={selectedStatus}
|
|
||||||
setSelectedStatus={setSelectedStatus}
|
|
||||||
selectedState={selectedState}
|
|
||||||
setSelectedState={setSelectedState}
|
|
||||||
tagOptions={tags ?? []}
|
|
||||||
selectedTags={selectedTags}
|
|
||||||
setSelectedTags={setSelectedTags}
|
|
||||||
onClearFilters={handleClearFilters}
|
|
||||||
/>
|
|
||||||
<TextField
|
|
||||||
placeholder={t("pages.uptime.filters.search.placeholder")}
|
|
||||||
value={search}
|
|
||||||
onChange={(event) => {
|
|
||||||
setSearch(event.target.value);
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</Stack>
|
|
||||||
|
|
||||||
{selectedTags.length > 0 && (
|
|
||||||
<Stack
|
|
||||||
direction={isSmall ? "column" : "row"}
|
|
||||||
alignItems={isSmall ? "flex-start" : "center"}
|
|
||||||
flexWrap="wrap"
|
|
||||||
gap={theme.spacing(SPACING.XL)}
|
|
||||||
>
|
|
||||||
<Typography color={theme.palette.text.secondary}>
|
|
||||||
{t("pages.uptime.filters.activeTags")}
|
|
||||||
</Typography>
|
|
||||||
{selectedTags.map((tagId) => {
|
|
||||||
const tag = tags?.find((t) => t.id === tagId);
|
|
||||||
if (!tag) return null;
|
|
||||||
return (
|
|
||||||
<ColoredLabel
|
|
||||||
key={tag.id}
|
|
||||||
text={tag.name}
|
|
||||||
color={tag.color}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</Stack>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{!isLoading && (
|
|
||||||
<BulkActionsBar
|
|
||||||
selectedCount={selectedRows.length}
|
|
||||||
onCancel={handleCancelSelection}
|
|
||||||
>
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
startIcon={<Play size={16} />}
|
|
||||||
onClick={handleBulkResume}
|
|
||||||
>
|
|
||||||
{t("common.buttons.resume")}
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
size="small"
|
|
||||||
startIcon={<Pause size={16} />}
|
|
||||||
onClick={handleBulkPause}
|
|
||||||
>
|
|
||||||
{t("common.buttons.pause")}
|
|
||||||
</Button>
|
|
||||||
</BulkActionsBar>
|
|
||||||
)}
|
|
||||||
|
|
||||||
<MonitorTable
|
<MonitorTable
|
||||||
monitors={monitorsWithChecks || []}
|
monitors={c.monitors || []}
|
||||||
tags={tags || []}
|
tags={c.tags || []}
|
||||||
refetch={refetch}
|
refetch={c.refetch}
|
||||||
setSelectedMonitor={setSelectedMonitor}
|
setSelectedMonitor={c.setSelectedMonitor}
|
||||||
count={count || 0}
|
count={c.count || 0}
|
||||||
page={page}
|
page={c.page}
|
||||||
setPage={setPage}
|
setPage={c.setPage}
|
||||||
rowsPerPage={rowsPerPage}
|
rowsPerPage={c.rowsPerPage}
|
||||||
sortField={sortField}
|
sortField={c.sortField}
|
||||||
setSortField={setSortField}
|
setSortField={c.setSortField}
|
||||||
sortOrder={sortOrder}
|
sortOrder={c.sortOrder}
|
||||||
setSortOrder={setSortOrder}
|
setSortOrder={c.setSortOrder}
|
||||||
setRowsPerPage={(rowsPerPage: number) => {
|
setRowsPerPage={c.handleSetRowsPerPage}
|
||||||
dispatch(
|
selectedRows={c.selectedRows}
|
||||||
setRowsPerPage({
|
onSelectionChange={c.setSelectedRows}
|
||||||
value: rowsPerPage,
|
|
||||||
table: "monitors",
|
|
||||||
})
|
|
||||||
);
|
|
||||||
setPage(0);
|
|
||||||
}}
|
|
||||||
selectedRows={selectedRows}
|
|
||||||
onSelectionChange={setSelectedRows}
|
|
||||||
/>
|
/>
|
||||||
<Dialog
|
</MonitorListPage>
|
||||||
open={isDialogOpen}
|
|
||||||
title={t("common.dialogs.delete.title")}
|
|
||||||
content={t("common.dialogs.delete.description")}
|
|
||||||
onConfirm={handleConfirm}
|
|
||||||
onCancel={handleCancel}
|
|
||||||
loading={isDeleting}
|
|
||||||
/>
|
|
||||||
</MonitorBasePageWithStates>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { configureStore, combineReducers } from "@reduxjs/toolkit";
|
|||||||
import authReducer from "@/Features/Auth/authSlice";
|
import authReducer from "@/Features/Auth/authSlice";
|
||||||
import uiReducer from "@/Features/UI/uiSlice";
|
import uiReducer from "@/Features/UI/uiSlice";
|
||||||
import storage from "redux-persist/lib/storage";
|
import storage from "redux-persist/lib/storage";
|
||||||
|
import autoMergeLevel2 from "redux-persist/lib/stateReconciler/autoMergeLevel2";
|
||||||
import {
|
import {
|
||||||
persistReducer,
|
persistReducer,
|
||||||
persistStore,
|
persistStore,
|
||||||
@@ -24,6 +25,8 @@ const persistConfig = {
|
|||||||
storage,
|
storage,
|
||||||
whitelist: ["auth", "ui"],
|
whitelist: ["auth", "ui"],
|
||||||
transforms: [authTransform],
|
transforms: [authTransform],
|
||||||
|
// Merge two levels deep on rehydrate so a slice key added in a new release keeps initial value
|
||||||
|
stateReconciler: autoMergeLevel2,
|
||||||
};
|
};
|
||||||
|
|
||||||
const rootReducer = combineReducers({
|
const rootReducer = combineReducers({
|
||||||
|
|||||||
Reference in new issue
Block a user