Merge pull request #2921 from bluewave-labs/develop

develop -> master

client/src/Components/Charts/StatusPageBarChart/index.jsx

@@ -1,7 +1,7 @@
 import { useTheme } from "@emotion/react";
 import { Box, Stack, Tooltip, Typography } from "@mui/material";
 import { formatDateWithTz } from "../../../Utils/timeUtils";
-import { useEffect, useState, forwardRef } from "react";
+import { useEffect, useState } from "react";
 import { useSelector } from "react-redux";
 import PropTypes from "prop-types";
 
@@ -17,29 +17,23 @@ import PropTypes from "prop-types";
  * @returns {JSX.Element} The Bar component.
  */
 
-const Bar = forwardRef(
-	({ width, height, backgroundColor, borderRadius, children, ...otherProps }, ref) => {
-		const theme = useTheme();
+const Bar = ({ width, height, backgroundColor, borderRadius, children }) => {
+	const theme = useTheme();
 
-		return (
-			<Box
-				ref={ref}
-				position="relative"
-				width={width}
-				height={height}
-				backgroundColor={backgroundColor}
-				sx={{
-					borderRadius: borderRadius || theme.spacing(1.5),
-				}}
-				{...otherProps}
-			>
-				{children}
-			</Box>
-		);
-	}
-);
-
-Bar.displayName = "Bar";
+	return (
+		<Box
+			width={width}
+			position="relative"
+			height={height}
+			backgroundColor={backgroundColor}
+			sx={{
+				borderRadius: borderRadius || theme.spacing(1.5),
+			}}
+		>
+			{children}
+		</Box>
+	);
+};
 
 Bar.propTypes = {
 	width: PropTypes.oneOfType([PropTypes.string, PropTypes.object]).isRequired,

client/src/Pages/StatusPage/Status/Components/MonitorsList/index.jsx

@@ -11,12 +11,7 @@ import PropTypes from "prop-types";
 
 import { useSelector } from "react-redux";
 
-const MonitorsList = ({
-	isLoading = false,
-	shouldRender = true,
-	monitors = [],
-	statusPage = {},
-}) => {
+const MonitorsList = ({ isLoading = false, shouldRender = true, monitors = [] }) => {
 	const theme = useTheme();
 	const { determineState } = useMonitorUtils();
 
@@ -45,12 +40,10 @@ const MonitorsList = ({
 							alignItems="center"
 							gap={theme.spacing(20)}
 						>
-							{statusPage.showCharts !== false && (
-								<Box flex={9}>
-									<StatusPageBarChart checks={monitor?.checks?.slice().reverse()} />
-								</Box>
-							)}
-							<Box flex={statusPage.showCharts !== false ? 1 : 10}>
+							<Box flex={9}>
+								<StatusPageBarChart checks={monitor?.checks?.slice().reverse()} />
+							</Box>
+							<Box flex={1}>
 								<StatusLabel
 									status={status}
 									text={status}
@@ -67,7 +60,6 @@ const MonitorsList = ({
 
 MonitorsList.propTypes = {
 	monitors: PropTypes.array.isRequired,
-	statusPage: PropTypes.object,
 };
 
 export default MonitorsList;

client/src/Pages/StatusPage/Status/index.jsx

@@ -154,10 +154,7 @@ const PublicStatus = () => {
 			/>
 			<Typography variant="h2">{t("statusPageStatusServiceStatus")}</Typography>
 			<StatusBar monitors={monitors} />
-			<MonitorsList
-				monitors={monitors}
-				statusPage={statusPage}
-			/>
+			<MonitorsList monitors={monitors} />
 			{link}
 		</Stack>
 	);

client/vite.config.js

@@ -5,7 +5,7 @@ import { execSync } from "child_process";
 
 export default defineConfig(({ mode }) => {
 	const env = loadEnv(mode, process.cwd(), "");
-	let version = "3.1.7";
+	let version = "3.1.5";
 
 	return {
 		base: "/",

docker/coolify/server.Dockerfile

@@ -1,10 +1,5 @@
 FROM node:20-slim
 
-# Install ping
-RUN apt-get update \
-    && apt-get install -y iputils-ping \
-    && rm -rf /var/lib/apt/lists/*
-
 WORKDIR /app
 
 COPY ../../package*.json ./

docker/dev/server.Dockerfile

@@ -1,10 +1,5 @@
 FROM node:20-slim
 
-# Install ping
-RUN apt-get update \
-    && apt-get install -y iputils-ping \
-    && rm -rf /var/lib/apt/lists/*
-
 WORKDIR /app
 
 COPY ./server/package*.json ./

docker/dist-arm/server.Dockerfile

@@ -3,11 +3,6 @@
 # ---------------------
 FROM node:24-slim AS frontend-build
 
-# Install ping
-RUN apt-get update \
-    && apt-get install -y iputils-ping \
-    && rm -rf /var/lib/apt/lists/*
-
 WORKDIR /app/client
 
 COPY client/package.json ./

docker/dist-mono/server.Dockerfile

@@ -1,10 +1,5 @@
 FROM node:20-slim AS frontend-build
 
-# Install ping
-RUN apt-get update \
-    && apt-get install -y iputils-ping \
-    && rm -rf /var/lib/apt/lists/*
-
 WORKDIR /app/client
 
 COPY client/package*.json ./

docker/dist/server.Dockerfile

@@ -1,10 +1,5 @@
 FROM node:20-slim
 
-# Install ping
-RUN apt-get update \
-    && apt-get install -y iputils-ping \
-    && rm -rf /var/lib/apt/lists/*
-
 WORKDIR /app
 
 COPY ./server/package*.json ./

docker/prod/server.Dockerfile

@@ -1,10 +1,5 @@
 FROM node:20-slim
 
-# Install ping
-RUN apt-get update \
-    && apt-get install -y iputils-ping \
-    && rm -rf /var/lib/apt/lists/*
-
 ENV NODE_OPTIONS="--max-old-space-size=2048"
 
 WORKDIR /app

docker/staging/server.Dockerfile

@@ -1,10 +1,5 @@
 FROM node:20-slim
 
-# Install ping
-RUN apt-get update \
-    && apt-get install -y iputils-ping \
-    && rm -rf /var/lib/apt/lists/*
-
 ENV NODE_OPTIONS="--max-old-space-size=2048"
 
 WORKDIR /app

server/src/db/mongo/modules/statusPageModule.js

@@ -162,14 +162,6 @@ class StatusPageModule {
 						as: "monitors.checks",
 					},
 				},
-				{
-					$lookup: {
-						from: "monitorstats",
-						localField: "monitors._id",
-						foreignField: "monitorId",
-						as: "monitors.stats",
-					},
-				},
 				{
 					$addFields: {
 						"monitors.orderIndex": {
@@ -189,9 +181,6 @@ class StatusPageModule {
 								},
 							},
 						},
-						"monitors.uptimePercentage": {
-							$arrayElemAt: ["$monitors.stats.uptimePercentage", 0],
-						},
 					},
 				},
 				{ $match: { "monitors.orderIndex": { $ne: -1 } } },

server/src/service/infrastructure/networkService.js

@@ -75,9 +75,6 @@ class NetworkService {
 			const { response, responseTime, error } = await this.timeRequest(() => this.ping.promise.probe(monitor.url));
 
 			if (!response) {
-				if (error) {
-					throw error;
-				}
 				throw new Error("Ping failed - no result returned");
 			}