fix human readable logs data

LoV432 · Nov 6, 2023 · 6529848 · 6529848
1 parent 85aaf56
commit 6529848
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/app/components/dashboard/ConnectionLogsListModal.client.tsx b/app/components/dashboard/ConnectionLogsListModal.client.tsx
@@ -79,8 +79,8 @@ function ConnectionLogsList({ days }: { days: number }) {
 	}, [days]);
 	return (
 		<div className="overflow-x-auto">
-			{humanReadableDisconnectedTime !== 'No Disconnects' ? (
-				<div className="badge badge-error h-fit gap-2">
+			{!humanReadableDisconnectedTime.includes('No Disconnects') ? (
+				<div className="h-fit gap-2 text-error">
 					{humanReadableDisconnectedTime}
 				</div>
 			) : null}

diff --git a/app/components/dashboard/DashboardCardTotalDisconnectTime.client.tsx b/app/components/dashboard/DashboardCardTotalDisconnectTime.client.tsx
@@ -35,7 +35,7 @@ export default function DashboardCardTotalDisconnectTime({
 		<>
 			<DashboardCardBase backgroundColor={backgroundColor}>
 				<div className="text-xl font-bold">
-					{humanReadableDisconnectedTime} in 24 hours
+					{humanReadableDisconnectedTime}
 					<Image
 						onClick={toggleConnectionLogsListModal}
 						className="ml-3 inline cursor-pointer"

diff --git a/lib/logs-list-to-human-format.ts b/lib/logs-list-to-human-format.ts
@@ -4,8 +4,12 @@ export function connectionLogsListToHumanFormat(
 	allConnectionLogs: connectionLogsList,
 	totalDays = 1
 ) {
+	const totalDaysString =
+		totalDays > 1 ? `last ${totalDays} days` : `past 24 hours`;
+
+	const noDisconnectsReturnString = `No Disconnects in ${totalDaysString}`;
 	if (allConnectionLogs.length === 0) {
-		return 'No Disconnects';
+		return noDisconnectsReturnString;
 	}
 	allConnectionLogs = allConnectionLogs.reverse();
 
@@ -32,7 +36,7 @@ export function connectionLogsListToHumanFormat(
 				minute: '2-digit'
 			})}`;
 		}
-		return 'No Disconnects';
+		return noDisconnectsReturnString;
 	}
 
 	let totalDisconnects = 0;
@@ -73,7 +77,7 @@ export function connectionLogsListToHumanFormat(
 	}
 
 	if (totalDisconnects === 0 && totalDowntimeInMS === 0) {
-		return 'No Disconnects';
+		return noDisconnectsReturnString;
 	}
 
 	// This will happen when there is no disconnect within the time frame of totalDays but there is a downtime
@@ -83,7 +87,7 @@ export function connectionLogsListToHumanFormat(
 	const totalDisconnectsString = totalDisconnectsToString(totalDisconnects);
 	const totalDowntimeString = millisecondsToReadableTime(totalDowntimeInMS);
 
-	return `${totalDisconnectsString} with ${totalDowntimeString} of downtime`;
+	return `${totalDisconnectsString} with ${totalDowntimeString} of downtime in ${totalDaysString}`;
 }
 
 function totalDisconnectsToString(totalDisconnects: number) {