Update displayed time format (zaproxy#1257)

Show time with leading spaces. Signed-off-by: m2a2 <[email protected]>
njmulsqb · Jul 17, 2023 · 899793e · 899793e
1 parent e4759c9
commit 899793e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- Update displayed time format to include leading zeros (Issue 1256).
 
 ## [0.17.0] - 2023-07-11
 ### Changed

diff --git a/src/main/zapHomeFiles/hud/display.js b/src/main/zapHomeFiles/hud/display.js
@@ -616,8 +616,7 @@ Vue.component('websocket-message-modal', {
 		const self = this;
 
 		eventBus.$on('showWebSocketMessageModal', data => {
-			const date = new Date(Number(data.msg.timestamp));
-			self.time = date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds() + '.' + date.getMilliseconds();
+			self.time = utils.timestampToTimeString(data.msg.timestamp);
 			self.payload = data.msg.payload;
 			self.channelId = data.msg.channelId;
 			self.outgoing = data.msg.outgoing;
@@ -679,8 +678,7 @@ Vue.component('break-websocket-message-modal', {
 		const self = this;
 
 		eventBus.$on('showBreakWebSocketMessageModal', data => {
-			const date = new Date(Number(data.msg.timestamp));
-			self.time = date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds() + '.' + date.getMilliseconds();
+			self.time = utils.timestampToTimeString(data.msg.timestamp);
 			self.payload = data.msg.payload;
 			self.channelId = data.msg.channelId;
 			self.outgoing = data.msg.outgoing;

diff --git a/src/main/zapHomeFiles/hud/tools/history.js b/src/main/zapHomeFiles/hud/tools/history.js
@@ -125,11 +125,10 @@ const History = (function () {
 
 		const message = {};
 
-		const date = new Date(Number(event.detail.timeSentInMs));
-		const dateString = date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds() + '.' + date.getMilliseconds();
+		const timeString = utils.timestampToTimeString(event.detail.timeSentInMs);
 
 		message.timeInMs = event.detail.timeSentInMs;
-		message.time = dateString;
+		message.time = timeString;
 		message.method = event.detail.method;
 		message.url = event.detail.uri;
 		message.code = event.detail.statusCode;

diff --git a/src/main/zapHomeFiles/hud/tools/websockets.js b/src/main/zapHomeFiles/hud/tools/websockets.js
@@ -79,11 +79,10 @@ const WebSockets = (function () {
 		if (eventType === 'ws.message') {
 			const message = {};
 
-			const date = new Date(Number(event.detail.timeSentInMs));
-			const dateString = date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds() + '.' + date.getMilliseconds();
+			const timeString = utils.timestampToTimeString(event.detail.timeSentInMs);
 
 			message.timeInMs = event.detail.timeSentInMs;
-			message.time = dateString;
+			message.time = timeString;
 			message.direction = event.detail.direction;
 			message.length = event.detail.length;
 			message.messageSummary = event.detail.messageSummary;

diff --git a/src/main/zapHomeFiles/hud/utils.js b/src/main/zapHomeFiles/hud/utils.js
@@ -726,6 +726,14 @@ const utils = (function () {
 		}
 	}
 
+	/*
+	 * Convert timestamp to time string
+	 */
+	function timestampToTimeString(timestamp) {
+		const dateObject = new Date(Number(timestamp));
+		return dateObject.toISOString().slice(11, 23);
+	}
+
 	return {
 		parseRequestHeader,
 		parseResponseHeader,
@@ -757,6 +765,7 @@ const utils = (function () {
 		getZapFilePath,
 		getZapImagePath,
 		zapApiErrorDialog,
-		log
+		log,
+		timestampToTimeString
 	};
 })();