[activemq-artemis] branch master updated: ARTEMIS-3124 readability for 'Expires' when browsing via console

[clebertsuconic]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 3296d43  ARTEMIS-3124 readability for 'Expires' when browsing via 
console
     new 91e37a6  This closes #3458
3296d43 is described below

commit 3296d431cfea41ed1863cc05d7d56cf197546d8d
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Wed Feb 17 13:12:13 2021 -0600

    ARTEMIS-3124 readability for 'Expires' when browsing via console
---
 .../artemis-plugin/src/main/webapp/plugin/js/components/browse.js      | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js 
b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
index 4780a2a..87b8114 100644
--- 
a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
+++ 
b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js
@@ -425,6 +425,9 @@ var Artemis;
              if (isNaN(timestamp)) {
                 return timestamp;
              }
+             if (timestamp == 0) {
+                return "never";
+             }
              var expiresIn = timestamp - Date.now();
              if (Math.abs(expiresIn) < MS_PER_DAY) {
                 var duration = expiresIn < 0 ? -expiresIn : expiresIn;