Fix merge conflict, remove unused dispatch
This commit is contained in:
1 parent
a4989d3e95
commit
ef56283fa9
4 files changed
+1
-19
No files matched your search
@@ -11,7 +11,6 @@ import {
|
|||||||
updateUptimeMonitor,
|
updateUptimeMonitor,
|
||||||
pauseUptimeMonitor,
|
pauseUptimeMonitor,
|
||||||
getUptimeMonitorById,
|
getUptimeMonitorById,
|
||||||
getUptimeSummaryByTeamId,
|
|
||||||
deleteUptimeMonitor,
|
deleteUptimeMonitor,
|
||||||
} from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
|
} from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
|
||||||
import TextInput from "../../../Components/Inputs/TextInput";
|
import TextInput from "../../../Components/Inputs/TextInput";
|
||||||
@@ -157,7 +156,6 @@ const Configure = () => {
|
|||||||
const action = await dispatch(updateUptimeMonitor({ authToken, monitor: monitor }));
|
const action = await dispatch(updateUptimeMonitor({ authToken, monitor: monitor }));
|
||||||
if (action.meta.requestStatus === "fulfilled") {
|
if (action.meta.requestStatus === "fulfilled") {
|
||||||
createToast({ body: "Monitor updated successfully!" });
|
createToast({ body: "Monitor updated successfully!" });
|
||||||
dispatch(getUptimeSummaryByTeamId(authToken));
|
|
||||||
} else {
|
} else {
|
||||||
createToast({ body: "Failed to update monitor." });
|
createToast({ body: "Failed to update monitor." });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import {
|
|||||||
getUptimeSummaryByTeamId,
|
getUptimeSummaryByTeamId,
|
||||||
getUptimeMonitorsByTeamId,
|
getUptimeMonitorsByTeamId,
|
||||||
} from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
|
} from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
|
||||||
import { setRowsPerPage } from "../../../Features/UI/uiSlice";
|
|
||||||
import { useIsAdmin } from "../../../Hooks/useIsAdmin";
|
import { useIsAdmin } from "../../../Hooks/useIsAdmin";
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
import { useSelector, useDispatch } from "react-redux";
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
@@ -26,15 +25,13 @@ const BREADCRUMBS = [{ name: `Uptime`, path: "/uptime" }];
|
|||||||
|
|
||||||
const UptimeMonitors = () => {
|
const UptimeMonitors = () => {
|
||||||
// Redux state
|
// Redux state
|
||||||
const { isLoading, monitorsSummary } = useSelector((state) => state.uptimeMonitors);
|
|
||||||
const authState = useSelector((state) => state.auth);
|
|
||||||
const { rowsPerPage } = useSelector((state) => state.ui.monitors);
|
|
||||||
|
|
||||||
// Local state
|
// Local state
|
||||||
const [monitors, setMonitors] = useState([]);
|
const [monitors, setMonitors] = useState([]);
|
||||||
const [sort, setSort] = useState({});
|
const [sort, setSort] = useState({});
|
||||||
const [search, setSearch] = useState("");
|
const [search, setSearch] = useState("");
|
||||||
const [page, setPage] = useState(0);
|
const [page, setPage] = useState(0);
|
||||||
|
const [rowsPerPage, setRowsPerPage] = useState(10);
|
||||||
const [isSearching, setIsSearching] = useState(false);
|
const [isSearching, setIsSearching] = useState(false);
|
||||||
const [monitorUpdateTrigger, setMonitorUpdateTrigger] = useState(false);
|
const [monitorUpdateTrigger, setMonitorUpdateTrigger] = useState(false);
|
||||||
|
|
||||||
@@ -46,9 +43,6 @@ const UptimeMonitors = () => {
|
|||||||
const isAdmin = useIsAdmin();
|
const isAdmin = useIsAdmin();
|
||||||
const { isLoading, monitorsSummary } = useSelector((state) => state.uptimeMonitors);
|
const { isLoading, monitorsSummary } = useSelector((state) => state.uptimeMonitors);
|
||||||
const authState = useSelector((state) => state.auth);
|
const authState = useSelector((state) => state.auth);
|
||||||
const dispatch = useDispatch({});
|
|
||||||
const [monitorUpdateTrigger, setMonitorUpdateTrigger] = useState(false);
|
|
||||||
|
|
||||||
|
|
||||||
const fetchParams = useMemo(
|
const fetchParams = useMemo(
|
||||||
() => ({
|
() => ({
|
||||||
|
|||||||
@@ -30,15 +30,6 @@ const CHECK_MODEL_LOOKUP = {
|
|||||||
hardware: HardwareCheck,
|
hardware: HardwareCheck,
|
||||||
};
|
};
|
||||||
|
|
||||||
const MODEL_TYPE_MAPPING = {
|
|
||||||
http: "checks",
|
|
||||||
ping: "checks",
|
|
||||||
docker: "checks",
|
|
||||||
port: "checks",
|
|
||||||
pagespeed: "pagespeedchecks",
|
|
||||||
hardware: "hardwarechecks",
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all monitors
|
* Get all monitors
|
||||||
* @async
|
* @async
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ const NormalizeData = (checks, rangeMin, rangeMax) => {
|
|||||||
const min = calculatePercentile(checks, 0);
|
const min = calculatePercentile(checks, 0);
|
||||||
const max = calculatePercentile(checks, 95);
|
const max = calculatePercentile(checks, 95);
|
||||||
const normalizedChecks = checks.map((check) => {
|
const normalizedChecks = checks.map((check) => {
|
||||||
console.log(check);
|
|
||||||
const originalResponseTime = check.responseTime;
|
const originalResponseTime = check.responseTime;
|
||||||
// Normalize the response time between 1 and 100
|
// Normalize the response time between 1 and 100
|
||||||
let normalizedResponseTime =
|
let normalizedResponseTime =
|
||||||
|
|||||||
Reference in new issue
Block a user