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

This closes #3350

This commit is contained in:
Clebert Suconic 2020-11-18 21:03:25 -05:00
parent bfca1c59de bfc07062a9
commit 8259441725
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,15 +80,19 @@ var Artemis;
</div> </div>
<div class="form-group" ng-show="$ctrl.showMessageDetails"> <div class="form-group" ng-show="$ctrl.showMessageDetails">
<button class="btn btn-primary" ng-click="$ctrl.showMessageDetails = false">Back</button> <button class="btn btn-primary" ng-click="$ctrl.showMessageDetails = false">Back</button>
<h2>MessageID: {{$ctrl.currentMessage.messageID}}</h2> <h4>Message ID: {{$ctrl.currentMessage.messageID}}</h4>
<h2>Headers</h2>
<h4>Displaying body as <span ng-bind="$ctrl.currentMessage.textMode"></span></h4>
<div hawtio-editor="$ctrl.currentMessage.bodyText" read-only="true" mode='mode'></div>
<h4>Headers</h4>
<pf-toolbar config="$ctrl.messageToolbarConfig"></pf-toolbar> <pf-toolbar config="$ctrl.messageToolbarConfig"></pf-toolbar>
<pf-table-view config="$ctrl.messageTableConfig" <pf-table-view config="$ctrl.messageTableConfig"
columns="$ctrl.messageTableColumns" columns="$ctrl.messageTableColumns"
items="$ctrl.currentMessage.headers"> items="$ctrl.currentMessage.headers">
</pf-table-view> </pf-table-view>
<h2>Properties</h2> <h4>Properties</h4>
<div ng-show="$ctrl.showMessageDetails"> <div ng-show="$ctrl.showMessageDetails">
<pf-toolbar config="$ctrl.messagePToolbarConfig"></pf-toolbar> <pf-toolbar config="$ctrl.messagePToolbarConfig"></pf-toolbar>
<pf-table-view config="$ctrl.messagePTableConfig" <pf-table-view config="$ctrl.messagePTableConfig"
@ -96,9 +100,6 @@ var Artemis;
items="$ctrl.currentMessage.properties"> items="$ctrl.currentMessage.properties">
</pf-table-view> </pf-table-view>
</div> </div>
<h3>Displaying body as <span ng-bind="$ctrl.currentMessage.textMode"></span></h3>
<div hawtio-editor="$ctrl.currentMessage.bodyText" read-only="true" mode='mode'></div>
</div> </div>
<div hawtio-confirm-dialog="$ctrl.deleteDialog" title="Delete messages?" <div hawtio-confirm-dialog="$ctrl.deleteDialog" title="Delete messages?"
@ -597,7 +598,7 @@ var Artemis;
var bytesArr = []; var bytesArr = [];
var textArr = []; var textArr = [];
message.BodyPreview.forEach(function(b) { message.BodyPreview.forEach(function(b) {
if (code === 1 || code === 2) { if (code === 1 || code === 2 || code === 16) {
// text // text
textArr.push(String.fromCharCode(b)); textArr.push(String.fromCharCode(b));
} }
@ -622,6 +623,12 @@ var Artemis;
var lenTxt = "" + textArr.length; var lenTxt = "" + textArr.length;
body = "bytes:\n" + bytesData + "\n\ntext:\n" + textData; body = "bytes:\n" + bytesData + "\n\ntext:\n" + textData;
message.textMode = "bytes (" + len + " bytes) and text (" + lenTxt + " chars)"; message.textMode = "bytes (" + len + " bytes) and text (" + lenTxt + " chars)";
} else if (code === 16) {
// text only
var len = message.BodyPreview.length;
var lenTxt = "" + textArr.length;
body = "text:\n" + textData;
message.textMode = "text (" + lenTxt + " chars)";
} else { } else {
// bytes only // bytes only
var len = message.BodyPreview.length; var len = message.BodyPreview.length;

1
artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/preferences.js
View File

@ -97,6 +97,7 @@ var Artemis;
<div class="col-md-6"> <div class="col-md-6">
<select id="ArtemisBrowseBytesMessages" class="form-control" ng-model="ArtemisBrowseBytesMessages"> <select id="ArtemisBrowseBytesMessages" class="form-control" ng-model="ArtemisBrowseBytesMessages">
<option value="99">Off</option> <option value="99">Off</option>
<option value="16">Text</option>
<option value="8">Decimal</option> <option value="8">Decimal</option>
<option value="4">Hex</option> <option value="4">Hex</option>
<option value="2">Decimal and Text</option> <option value="2">Decimal and Text</option>