Bit of work on #613, sort the JMX headers first alphabetically misc p…

…roperties at the end of the list. Also fix #696.
hawtio · Oct 31, 2013 · 5ffccc8 · 5ffccc8
1 parent ada4c74
commit 5ffccc8
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 8 deletions.
diff --git a/hawtio-web/src/main/webapp/app/activemq/html/browseQueue.html b/hawtio-web/src/main/webapp/app/activemq/html/browseQueue.html
@@ -40,7 +40,11 @@
         <div class="pull-right">
           <form class="form-horizontal no-bottom-margin">
 
-            <div class="btn-group" hawtio-pager="messages" on-index-change="selectRowIndex" row-index="rowIndex"></div>
+            <div class="btn-group"
+                 style="margin-top: 9px;"
+                 hawtio-pager="messages"
+                 on-index-change="selectRowIndex"
+                 row-index="rowIndex"></div>
 
             <button class="btn" ng-disabled="!gridOptions.selectedItems.length" ng-click="moveDialog = true"
                     title="Move the selected messages to another destination" data-placement="bottom">
@@ -64,7 +68,7 @@
       <div class="row-fluid">
         <div class="expandable closed">
           <div title="Headers" class="title">
-            <i class="expandable-indicator"></i> Headers
+            <i class="expandable-indicator"></i> Headers & Properties
           </div>
           <div class="expandable-body well">
             <table class="table table-condensed table-striped">

diff --git a/hawtio-web/src/main/webapp/app/activemq/js/browse.ts b/hawtio-web/src/main/webapp/app/activemq/js/browse.ts
@@ -183,15 +183,45 @@ module ActiveMQ {
      */
     function createHeaderHtml(message) {
       var headers = createHeaders(message);
-      var buffer = "";
-      angular.forEach(headers, (value, key) => {
-        buffer += "<tr><td class='property-name'>" + key + "</td>" +
-                "<td class='property-value'>" + value + "</td></tr>";
-      });
-      return buffer;
+
+      var keys = Object.extended(headers).keys();
+
+      function sort(a, b) {
+        if (a > b) return 1;
+        if (a < b) return -1;
+        return 0;
+      }
+
+      var jmsHeaders = keys.filter((key) => {
+        return key.startsWith("JMS");
+      }).sort(sort);
+
+      var remaining = keys.subtract(jmsHeaders).sort(sort);
+
+      var buffer = [];
+
+      function append(key) {
+
+        var value = headers[key];
+        if (value === null) {
+          value = '';
+        }
+
+        buffer.push('<tr><td class="propertyName">' +
+            key +
+            '</td><td class="property-value">' +
+            value +
+            '</td></tr>');
+      }
+
+      jmsHeaders.forEach(append);
+      remaining.forEach(append);
+
+      return buffer.join("\n");
     }
 
     function createHeaders(row) {
+      log.debug("headers: ", row);
       var answer = {};
       angular.forEach(row, (value, key) => {
         if (!ignoreColumns.any(key)) {