isActive -> stauts === paused

client/package-lock.json

@@ -27,7 +27,7 @@
         "react-redux": "9.2.0",
         "react-router": "7.9.4",
         "react-router-dom": "7.9.4",
-        "react-toastify": "11.0.5",
+        "react-toastify": "^11.0.5",
         "recharts": "2.15.2",
         "redux-persist": "6.0.0",
         "swr": "2.3.6",

client/package.json

@@ -30,7 +30,7 @@
     "react-redux": "9.2.0",
     "react-router": "7.9.4",
     "react-router-dom": "7.9.4",
-    "react-toastify": "11.0.5",
+    "react-toastify": "^11.0.5",
     "recharts": "2.15.2",
     "redux-persist": "6.0.0",
     "swr": "2.3.6",

client/src/components/design-elements/StatusLabel.tsx

@@ -8,13 +8,7 @@ import { useTheme } from "@mui/material/styles";
 export const ValueTypes = ["positive", "negative", "neutral"] as const;
 export type ValueType = (typeof ValueTypes)[number];
 
-export const StatusLabel = ({
-  status,
-  isActive,
-}: {
-  status: MonitorStatus;
-  isActive?: boolean;
-}) => {
+export const StatusLabel = ({ status }: { status: MonitorStatus }) => {
   const theme = useTheme();
   const palette = getStatusPalette(status);
   const transformedText =
@@ -42,7 +36,7 @@ export const StatusLabel = ({
         borderRadius="50%"
         marginRight="5px"
       />
-      {isActive === false ? "Paused" : transformedText}
+      {transformedText}
     </BaseBox>
   );
 };

client/src/components/monitors/HeaderControls.tsx

@@ -69,14 +69,14 @@ export const HeaderControls = ({
               refetch();
             }}
             startIcon={
-              monitor?.isActive ? (
+              monitor.status === "paused" ? (
                 <Pause size={20} strokeWidth={1.5} />
               ) : (
                 <Play size={20} strokeWidth={1.5} />
               )
             }
           >
-            {monitor?.isActive ? t("pause") : t("resume")}
+            {monitor?.status === "paused" ? t("resume") : t("pause")}
           </Button>
           <Button
             startIcon={<Settings size={20} strokeWidth={1.5} />}

client/src/pages/diagnostic/DiagnosticsQueueTab.tsx

@@ -59,7 +59,7 @@ export const DiagnosticsQueueTab = () => {
         id: "active",
         content: t("diagnosticsPage.tableHeaderActive"),
         render: (row) => {
-          return row?.data?.isActive ? "true" : "false";
+          return row?.active === true ? "true" : "false";
         },
       },
 

client/src/pages/infrastructure/InfraMonitorsTable.tsx

@@ -98,7 +98,7 @@ export const InfraMonitorsTable = ({
       // },
       {
         id: 6,
-        label: monitor.isActive ? "Pause" : "Resume",
+        label: monitor.status === "paused" ? "Resume" : "Pause",
         action: async () => {
           await patch(`/monitors/${monitor._id}/active`);
           refetch();
@@ -129,7 +129,7 @@ export const InfraMonitorsTable = ({
         id: "status",
         content: t("status"),
         render: (row) => {
-          return <StatusLabel status={row.status} isActive={row.isActive} />;
+          return <StatusLabel status={row.status} />;
         },
       },
       {
@@ -154,11 +154,11 @@ export const InfraMonitorsTable = ({
         id: "disk",
         content: t("disk"),
         render: (row) => {
-          const totalDiskUsage = row.latestChecks?.[0]?.system?.disk.reduce(
+          const totalDiskUsage = row.latestChecks?.[0]?.system?.disk?.reduce(
             (acc, disk) => acc + disk.usage_percent,
             0
           );
-          const diskCount = row.latestChecks?.[0]?.system?.disk.length || 1;
+          const diskCount = row.latestChecks?.[0]?.system?.disk?.length || 1;
           const diskUsage = ((totalDiskUsage || 0) / diskCount) * 100;
           return <Gauge progress={diskUsage} />;
         },

client/src/pages/pagespeed/PageSpeedMonitorTable.tsx

@@ -99,7 +99,7 @@ export const PageSpeedMonitorTable = ({
       // },
       {
         id: 6,
-        label: monitor.isActive ? "Pause" : "Resume",
+        label: monitor.status === "paused" ? "Resume" : "Pause",
         action: async () => {
           await patch(`/monitors/${monitor._id}/active`);
           refetch();
@@ -130,7 +130,7 @@ export const PageSpeedMonitorTable = ({
         id: "status",
         content: t("status"),
         render: (row) => {
-          return <StatusLabel status={row.status} isActive={row.isActive} />;
+          return <StatusLabel status={row.status} />;
         },
       },
       {

client/src/pages/uptime/MonitorTable.tsx

@@ -97,7 +97,7 @@ export const MonitorTable = ({
       // },
       {
         id: 6,
-        label: monitor.isActive ? "Pause" : "Resume",
+        label: monitor.status === "paused" ? "Resume" : "Pause",
         action: async () => {
           await patch(`/monitors/${monitor._id}/active`);
           refetch();
@@ -128,7 +128,7 @@ export const MonitorTable = ({
         id: "status",
         content: t("status"),
         render: (row) => {
-          return <StatusLabel status={row.status} isActive={row.isActive} />;
+          return <StatusLabel status={row.status} />;
         },
       },
       {

client/src/types/monitor.ts

@@ -27,7 +27,6 @@ export interface IMonitor {
   createdAt: string;
   createdBy: string;
   interval: number;
-  isActive: boolean;
   latestChecks: ICheck[];
   n: number;
   name: string;

client/src/utils/MonitorUtils.ts

@@ -6,6 +6,7 @@ export const getStatusPalette = (status: MonitorStatus): PaletteKey => {
   const paletteMap: Record<MonitorStatus, PaletteKey> = {
     up: "success",
     down: "error",
+    paused: "warning",
     initializing: "warning",
   };
   return paletteMap[status];