Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-3621 show 'zero' timestamp as 'N/A' (instead of 1970...)

This commit is contained in:
Erwin Dondorp 2021-12-24 17:09:53 +01:00 committed by Clebert Suconic
parent 055d05b9f1
commit 9b450558d9
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
View File

@ -481,7 +481,7 @@ var Artemis;
// "HH:mm:ss ago" // "HH:mm:ss ago"
return hours + ":" + mins + ":" + secs + " ago"; return hours + ":" + mins + ":" + secs + " ago";
} }
// "in HH:mm:ss ago" // "in HH:mm:ss"
return "in " + hours + ":" + mins + ":" + secs; return "in " + hours + ":" + mins + ":" + secs;
} }
return formatTimestamp(timestamp); return formatTimestamp(timestamp);
@ -491,6 +491,9 @@ var Artemis;
if (isNaN(timestamp) || typeof timestamp !== "number") { if (isNaN(timestamp) || typeof timestamp !== "number") {
return timestamp; return timestamp;
} }
if (timestamp === 0) {
return "N/A";
}
var d = new Date(timestamp); var d = new Date(timestamp);
// "yyyy-MM-dd HH:mm:ss" // "yyyy-MM-dd HH:mm:ss"
//add 1 to month as getmonth returns the position not the actual month //add 1 to month as getmonth returns the position not the actual month
@ -526,7 +529,7 @@ var Artemis;
} }
function formatPersistentSize(bytes) { function formatPersistentSize(bytes) {
if(isNaN(bytes) || typeof bytes !== "number" || bytes < 0) return "n/a"; if(isNaN(bytes) || typeof bytes !== "number" || bytes < 0) return "N/A";
if(bytes < 10240) return bytes.toLocaleString() + " Bytes"; if(bytes < 10240) return bytes.toLocaleString() + " Bytes";
if(bytes < 1048576) return (bytes / 1024).toFixed(2) + " KB"; if(bytes < 1048576) return (bytes / 1024).toFixed(2) + " KB";
if(bytes < 1073741824) return (bytes / 1048576).toFixed(2) + " MB"; if(bytes < 1073741824) return (bytes / 1048576).toFixed(2) + " MB";