Merge branch 'bluewave-labs:develop' into Maintenance-start-time-style

src/Pages/DistributedUptime/Details/Components/DistributedUptimeMap/index.jsx

@@ -75,7 +75,7 @@ const DistributedUptimeMap = ({
 						type: "Feature",
 						geometry: {
 							type: "Point",
-							coordinates: [check.lng, check.lat],
+							coordinates: [check._id.lng, check._id.lat],
 						},
 						properties: {
 							color: theme.palette.accent.main,

src/Pages/DistributedUptime/Details/Components/DistributedUptimeResponseChart/Helpers/ToolTip.jsx

@@ -75,7 +75,7 @@ CustomToolTip.propTypes = {
 		PropTypes.shape({
 			value: PropTypes.number,
 			payload: PropTypes.shape({
-				_id: PropTypes.string,
+				_id: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
 				avgResponseTime: PropTypes.number,
 				originalAvgResponseTime: PropTypes.number,
 			}),

src/Pages/DistributedUptime/Details/Components/StatBoxes/index.jsx

@@ -32,7 +32,7 @@ const StatBoxes = ({ monitor, lastUpdateTrigger }) => {
 				heading={"Last check"}
 				subHeading={
 					<LastUpdate
-						lastUpdateTime={monitor?.timeSinceLastCheck ?? 0}
+						lastUpdateTime={monitor?.timeSinceLastCheck}
 						suffix={"seconds ago"}
 					/>
 				}

src/Pages/DistributedUptime/Details/Components/StatusHeader/index.jsx

@@ -59,7 +59,7 @@ const StatusHeader = ({ monitor, connectionStatus, elementToCapture }) => {
 								backgroundColor={theme.palette.successSecondary.lowContrast}
 								color={theme.palette.success.lowContrast}
 							>
-								Uptime: {(monitor.totalUptime * 100).toFixed(2)}%
+								Uptime: {(monitor.uptimePercentage * 100).toFixed(2)}%
 							</Typography>
 						</Stack>
 						<Typography
@@ -69,7 +69,7 @@ const StatusHeader = ({ monitor, connectionStatus, elementToCapture }) => {
 							Last updated{" "}
 							<LastUpdate
 								suffix={"seconds ago"}
-								lastUpdateTime={monitor.timeSinceLastCheck}
+								lastUpdateTime={monitor?.timeSinceLastCheck}
 							/>
 						</Typography>
 					</Stack>