Merge branch 'develop' into fix/be/get-monitors-by-team-id-query

Client/src/Pages/Uptime/Home/index.jsx

@@ -44,6 +44,11 @@ const UptimeMonitors = () => {
 	const theme = useTheme();
 	const navigate = useNavigate();
 	const isAdmin = useIsAdmin();
+	const { isLoading, monitorsSummary } = useSelector((state) => state.uptimeMonitors);
+	const authState = useSelector((state) => state.auth);
+	const dispatch = useDispatch({});
+	const [monitorUpdateTrigger, setMonitorUpdateTrigger] = useState(false);
+
 
 	const fetchParams = useMemo(
 		() => ({
@@ -132,7 +137,6 @@ const UptimeMonitors = () => {
 	const triggerUpdate = () => {
 		setMonitorUpdateTrigger((prev) => !prev);
 	};
-
 	const totalMonitors = monitorsSummary?.monitorCounts?.total;
 	const hasMonitors = totalMonitors > 0;
 	const canAddMonitor = isAdmin && hasMonitors;

Server/package-lock.json

@@ -11,7 +11,7 @@
 			"dependencies": {
 				"axios": "^1.7.2",
 				"bcrypt": "5.1.1",
-				"bullmq": "5.34.6",
+				"bullmq": "5.34.7",
 				"cors": "^2.8.5",
 				"dockerode": "4.0.3",
 				"dotenv": "^16.4.5",
@@ -1744,9 +1744,9 @@
 			}
 		},
 		"node_modules/bullmq": {
-			"version": "5.34.6",
-			"resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.34.6.tgz",
-			"integrity": "sha512-pRCYyO9RlkQWxdmKlrNnUthyFwurYXRYLVXD1YIx+nCCdhAOiHatD8FDHbsT/w2I31c0NWoMcfZiIGuipiF7Lg==",
+			"version": "5.34.7",
+			"resolved": "https://registry.npmjs.org/bullmq/-/bullmq-5.34.7.tgz",
+			"integrity": "sha512-Z6nKi8skD9n5/ErddTngeeEd8dRvZCu8wgZqpeH9zK0DlyTxYKceTnkGab3FkA+U9mzlqa0z34ZKGMbn4GWdgQ==",
 			"license": "MIT",
 			"dependencies": {
 				"cron-parser": "^4.9.0",

Server/package.json

@@ -18,7 +18,7 @@
 	"dependencies": {
 		"axios": "^1.7.2",
 		"bcrypt": "5.1.1",
-		"bullmq": "5.34.6",
+		"bullmq": "5.34.7",
 		"cors": "^2.8.5",
 		"dockerode": "4.0.3",
 		"dotenv": "^16.4.5",