Merge branch 'develop' into feat/be/hardware-details

Client/src/Utils/NetworkService.js

@@ -248,6 +248,13 @@ class NetworkService {
 
 		return this.axiosInstance.get(
 			`/monitors/hardware/details/${config.monitorId}?${params.toString()}`,
+	async getUptimeDetailsById(config) {
+		const params = new URLSearchParams();
+		if (config.dateRange) params.append("dateRange", config.dateRange);
+		if (config.normalize) params.append("normalize", config.normalize);
+
+		return this.axiosInstance.get(
+			`/monitors/uptime/details/${config.monitorId}?${params.toString()}`,
 			{
 				headers: {
 					Authorization: `Bearer ${config.authToken}`,

Client/src/Utils/timeUtils.js

@@ -1,8 +1,11 @@
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc";
 import timezone from "dayjs/plugin/timezone";
+import customParseFormat from "dayjs/plugin/customParseFormat";
+
 dayjs.extend(utc);
 dayjs.extend(timezone);
+dayjs.extend(customParseFormat);
 
 export const MS_PER_SECOND = 1000;
 export const MS_PER_MINUTE = 60 * MS_PER_SECOND;
@@ -90,6 +93,6 @@ export const formatDate = (date, customOptions) => {
 };
 
 export const formatDateWithTz = (timestamp, format, timezone) => {
-	const formattedDate = dayjs(timestamp, timezone).tz(timezone).format(format);
+	const formattedDate = dayjs(timestamp).tz(timezone).format(format);
 	return formattedDate;
 };