@upsnap/strapi 1.0.4 → 1.0.7

package/dist/admin/{App-wfO4MA3Z.js → App-Bo_F3q6I.js}

@@ -8288,6 +8288,19 @@ function PageHeader({
     }
   );
 }
+const LoadingCard = () => /* @__PURE__ */ jsxRuntime.jsxs(
+  designSystem.Flex,
+  {
+    direction: "column",
+    justifyContent: "center",
+    margin: 8,
+    height: { initial: "300px", medium: "400px" },
+    children: [
+      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Loader, {}),
+      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral500", children: "Loading..." })
+    ]
+  }
+);
 function Dashboard() {
   const [monitorData, setMonitorData] = React.useState(null);
   const [uptimeStats, setUptimeStats] = React.useState(null);
@@ -8313,6 +8326,7 @@ function Dashboard() {
     }
     return "default";
   });
+  const MAX_MONITOR_RETRIES = 3;
   React.useEffect(() => {
     (async () => {
       const fetchedMonitorId = await getPrimaryMonitorId();
@@ -8353,17 +8367,29 @@ function Dashboard() {
   React.useEffect(() => {
     getRegionResponseTimeData();
   }, [responseTimeData, selectedRegion]);
-  const handleRefresh = () => {
+  const fetchMonitorDataWithRetry = async (retries = MAX_MONITOR_RETRIES) => {
+    for (let attempt = 0; attempt < retries; attempt++) {
+      try {
+        const res = await request(`/monitor/${monitorId}`, { method: "GET" });
+        if (res?.monitor?.message === "Invalid authentication token") {
+          navigate("/plugins/upsnap/settings");
+          return null;
+        }
+        if (res.monitor?.data) {
+          return res.monitor.data;
+        }
+      } catch (err) {
+      }
+      await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+    return null;
+  };
+  const handleRefresh = async () => {
     const { start, end } = getRangeTimestamps(responseTimeRange || "last_24_hours");
     setIsLoading(true);
-    request(`/monitor/${monitorId}`, {
-      method: "GET"
-    }).then((res) => {
-      if (res?.monitor?.message === "Invalid authentication token") {
-        navigate("/plugins/upsnap/settings");
-      }
-      setMonitorData(res.monitor?.data || null);
-    });
+    if (!monitorId) return;
+    const monitor = await fetchMonitorDataWithRetry();
+    setMonitorData(monitor);
     request(`/monitor/${monitorId}/uptime-stats?region=${selectedRegion}`, {
       method: "GET"
     }).then((res) => {
@@ -8389,7 +8415,7 @@ function Dashboard() {
       setMonitorIncidents(res.incidentsData?.data || null);
     });
   };
-  return /* @__PURE__ */ jsxRuntime.jsx(designSystem.Main, { children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Box, { padding: 1, children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(designSystem.Main, { children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { padding: 1, children: !monitorData || isLoading ? /* @__PURE__ */ jsxRuntime.jsx(LoadingCard, {}) : /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     /* @__PURE__ */ jsxRuntime.jsx(
       PageHeader,
       {
@@ -8415,26 +8441,36 @@ function Dashboard() {
         alignItems: "start",
         style: { alignContent: "space-around", justifyItems: "stretch" },
         children: [
-          /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { width: "100%", children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { direction: "column", gap: 4, height: "100%", alignItems: "start", style: { flexWrap: "wrap" }, children: [
-            /* @__PURE__ */ jsxRuntime.jsx(
-              StatisticsCards,
-              {
-                monitorData,
-                uptimeStats,
-                histogramData,
-                isLoading
-              }
-            ),
-            /* @__PURE__ */ jsxRuntime.jsx(
-              ResponseTimeChart,
-              {
-                monitor: monitorData?.monitor,
-                regionResponseTimeData,
-                timeRange: responseTimeRange || "last_24_hours",
-                onTimeRangeChange: handleTimeRangeChange
-              }
-            )
-          ] }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { width: "100%", children: /* @__PURE__ */ jsxRuntime.jsxs(
+            designSystem.Flex,
+            {
+              direction: "column",
+              gap: 4,
+              height: "100%",
+              alignItems: "start",
+              style: { flexWrap: "wrap" },
+              children: [
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  StatisticsCards,
+                  {
+                    monitorData,
+                    uptimeStats,
+                    histogramData,
+                    isLoading
+                  }
+                ),
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  ResponseTimeChart,
+                  {
+                    monitor: monitorData?.monitor,
+                    regionResponseTimeData,
+                    timeRange: responseTimeRange || "last_24_hours",
+                    onTimeRangeChange: handleTimeRangeChange
+                  }
+                )
+              ]
+            }
+          ) }),
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Box, { width: "100%", children: /* @__PURE__ */ jsxRuntime.jsx(HealthCards, { monitorData, isLoading }) })
         ]
       }
@@ -8447,7 +8483,7 @@ function Dashboard() {
         isLoading
       }
     )
-  ] }) });
+  ] }) }) });
 }
 const DetailRow = ({ label, value, isUrl = false, isChip = false }) => {
   const renderValue = () => {
@@ -8536,19 +8572,6 @@ const StatusCard = ({ status, message, error, cardData }) => {
     }
   ) }) }) }) });
 };
-const LoadingCard = () => /* @__PURE__ */ jsxRuntime.jsxs(
-  designSystem.Flex,
-  {
-    direction: "column",
-    justifyContent: "center",
-    margin: 8,
-    height: { initial: "300px", medium: "400px" },
-    children: [
-      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Loader, {}),
-      /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "pi", textColor: "neutral500", children: "Loading..." })
-    ]
-  }
-);
 function RegionWiseCards({
   regions,
   regionNames,

package/dist/admin/{App-B9MprOch.mjs → App-DQN0F1ZK.mjs}

@@ -8281,6 +8281,19 @@ function PageHeader({
     }
   );
 }
+const LoadingCard = () => /* @__PURE__ */ jsxs(
+  Flex,
+  {
+    direction: "column",
+    justifyContent: "center",
+    margin: 8,
+    height: { initial: "300px", medium: "400px" },
+    children: [
+      /* @__PURE__ */ jsx(Loader, {}),
+      /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral500", children: "Loading..." })
+    ]
+  }
+);
 function Dashboard() {
   const [monitorData, setMonitorData] = useState(null);
   const [uptimeStats, setUptimeStats] = useState(null);
@@ -8306,6 +8319,7 @@ function Dashboard() {
     }
     return "default";
   });
+  const MAX_MONITOR_RETRIES = 3;
   useEffect(() => {
     (async () => {
       const fetchedMonitorId = await getPrimaryMonitorId();
@@ -8346,17 +8360,29 @@ function Dashboard() {
   useEffect(() => {
     getRegionResponseTimeData();
   }, [responseTimeData, selectedRegion]);
-  const handleRefresh = () => {
+  const fetchMonitorDataWithRetry = async (retries = MAX_MONITOR_RETRIES) => {
+    for (let attempt = 0; attempt < retries; attempt++) {
+      try {
+        const res = await request(`/monitor/${monitorId}`, { method: "GET" });
+        if (res?.monitor?.message === "Invalid authentication token") {
+          navigate("/plugins/upsnap/settings");
+          return null;
+        }
+        if (res.monitor?.data) {
+          return res.monitor.data;
+        }
+      } catch (err) {
+      }
+      await new Promise((resolve) => setTimeout(resolve, 500));
+    }
+    return null;
+  };
+  const handleRefresh = async () => {
     const { start, end } = getRangeTimestamps(responseTimeRange || "last_24_hours");
     setIsLoading(true);
-    request(`/monitor/${monitorId}`, {
-      method: "GET"
-    }).then((res) => {
-      if (res?.monitor?.message === "Invalid authentication token") {
-        navigate("/plugins/upsnap/settings");
-      }
-      setMonitorData(res.monitor?.data || null);
-    });
+    if (!monitorId) return;
+    const monitor = await fetchMonitorDataWithRetry();
+    setMonitorData(monitor);
     request(`/monitor/${monitorId}/uptime-stats?region=${selectedRegion}`, {
       method: "GET"
     }).then((res) => {
@@ -8382,7 +8408,7 @@ function Dashboard() {
       setMonitorIncidents(res.incidentsData?.data || null);
     });
   };
-  return /* @__PURE__ */ jsx(Main, { children: /* @__PURE__ */ jsxs(Box, { padding: 1, children: [
+  return /* @__PURE__ */ jsx(Main, { children: /* @__PURE__ */ jsx(Box, { padding: 1, children: !monitorData || isLoading ? /* @__PURE__ */ jsx(LoadingCard, {}) : /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(
       PageHeader,
       {
@@ -8408,26 +8434,36 @@ function Dashboard() {
         alignItems: "start",
         style: { alignContent: "space-around", justifyItems: "stretch" },
         children: [
-          /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(Flex, { direction: "column", gap: 4, height: "100%", alignItems: "start", style: { flexWrap: "wrap" }, children: [
-            /* @__PURE__ */ jsx(
-              StatisticsCards,
-              {
-                monitorData,
-                uptimeStats,
-                histogramData,
-                isLoading
-              }
-            ),
-            /* @__PURE__ */ jsx(
-              ResponseTimeChart,
-              {
-                monitor: monitorData?.monitor,
-                regionResponseTimeData,
-                timeRange: responseTimeRange || "last_24_hours",
-                onTimeRangeChange: handleTimeRangeChange
-              }
-            )
-          ] }) }),
+          /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsxs(
+            Flex,
+            {
+              direction: "column",
+              gap: 4,
+              height: "100%",
+              alignItems: "start",
+              style: { flexWrap: "wrap" },
+              children: [
+                /* @__PURE__ */ jsx(
+                  StatisticsCards,
+                  {
+                    monitorData,
+                    uptimeStats,
+                    histogramData,
+                    isLoading
+                  }
+                ),
+                /* @__PURE__ */ jsx(
+                  ResponseTimeChart,
+                  {
+                    monitor: monitorData?.monitor,
+                    regionResponseTimeData,
+                    timeRange: responseTimeRange || "last_24_hours",
+                    onTimeRangeChange: handleTimeRangeChange
+                  }
+                )
+              ]
+            }
+          ) }),
           /* @__PURE__ */ jsx(Box, { width: "100%", children: /* @__PURE__ */ jsx(HealthCards, { monitorData, isLoading }) })
         ]
       }
@@ -8440,7 +8476,7 @@ function Dashboard() {
         isLoading
       }
     )
-  ] }) });
+  ] }) }) });
 }
 const DetailRow = ({ label, value, isUrl = false, isChip = false }) => {
   const renderValue = () => {
@@ -8529,19 +8565,6 @@ const StatusCard = ({ status, message, error, cardData }) => {
     }
   ) }) }) }) });
 };
-const LoadingCard = () => /* @__PURE__ */ jsxs(
-  Flex,
-  {
-    direction: "column",
-    justifyContent: "center",
-    margin: 8,
-    height: { initial: "300px", medium: "400px" },
-    children: [
-      /* @__PURE__ */ jsx(Loader, {}),
-      /* @__PURE__ */ jsx(Typography, { variant: "pi", textColor: "neutral500", children: "Loading..." })
-    ]
-  }
-);
 function RegionWiseCards({
   regions,
   regionNames,

package/dist/admin/index.js

@@ -38,7 +38,7 @@ const index = {
         defaultMessage: PLUGIN_ID.slice(0, 1).toUpperCase() + PLUGIN_ID.slice(1)
       },
       Component: async () => {
-        const { App } = await Promise.resolve().then(() => require("./App-wfO4MA3Z.js"));
+        const { App } = await Promise.resolve().then(() => require("./App-Bo_F3q6I.js"));
         return App;
       }
     });

package/dist/admin/index.mjs

@@ -36,7 +36,7 @@ const index = {
         defaultMessage: PLUGIN_ID.slice(0, 1).toUpperCase() + PLUGIN_ID.slice(1)
       },
       Component: async () => {
-        const { App } = await import("./App-B9MprOch.mjs");
+        const { App } = await import("./App-DQN0F1ZK.mjs");
         return App;
       }
     });

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.4",
+  "version": "1.0.7",
   "repository": {
     "type": "git",
     "url": "https://github.com/Appfoster/upsnap-strapi"