You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/09/09 10:52:42 UTC
svn commit: r1759981 - in
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources:
js/qpid/common/JsonRest.js js/qpid/management/Queue.js showQueue.html
Author: orudyy
Date: Fri Sep 9 10:52:42 2016
New Revision: 1759981
URL: http://svn.apache.org/viewvc?rev=1759981&view=rev
Log:
QPID-7380: [Java Broker, WMC] Remove dead code and display correct total number of messages
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/JsonRest.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showQueue.html
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/JsonRest.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/JsonRest.js?rev=1759981&r1=1759980&r2=1759981&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/JsonRest.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/JsonRest.js Fri Sep 9 10:52:42 2016
@@ -23,23 +23,22 @@ define(["dojo/_base/lang", "dojo/json",
function (lang, json, declare, QueryResults)
{
return declare("qpid.common.JsonRest", null, {
- headers: {},
+ headers: null,
idProperty: "id",
firstProperty: "first",
lastProperty: "last",
accepts: "application/javascript, application/json",
+
+ // constructor arguments
queryOperation: null,
modelObject: null,
management: null,
queryParams: null,
+ totalRetriever: null,
constructor: function (options)
{
this.headers = {};
- this.management = options.management;
- this.modelObject = options.modelObject;
- this.queryOperation = options.queryOperation;
- this.queryParams = options.queryParams;
declare.safeMixin(this, options);
},
@@ -57,15 +56,6 @@ define(["dojo/_base/lang", "dojo/json",
query[this.firstProperty] = options.start >= 0 ? options.start : -1;
query[this.lastProperty] = options.count >= 0 && query.first >= 0 ? options.count + query.first : -1;
- if (options.start >= 0 || options.count >= 0)
- {
- headers["X-Range"] =
- "items=" + (options.start || '0') + '-' + (("count" in options && options.count != Infinity)
- ? (options.count + (options.start || 0) - 1)
- : '');
- headers.Range = headers["X-Range"];
- }
-
var modelObj = {
name: this.queryOperation,
parent: this.modelObject,
@@ -73,15 +63,10 @@ define(["dojo/_base/lang", "dojo/json",
};
var results = management.load(modelObj, query, {headers: headers});
- results.total = results.response.then(function (response)
+ if (this.totalRetriever)
{
- var range = response.getHeader("Content-Range");
- if (!range)
- {
- range = response.getHeader("X-Content-Range");
- }
- return range && (range = range.match(/\/(.*)/)) && +range[1];
- });
+ results.total = this.totalRetriever();
+ }
return QueryResults(results);
}
});
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1759981&r1=1759980&r2=1759981&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js Fri Sep 9 10:52:42 2016
@@ -109,7 +109,28 @@ define(["dojo/_base/declare",
management: that.management,
modelObject: that.modelObj,
queryOperation: "getMessageInfo",
- queryParams : {includeHeaders: false}
+ queryParams: {includeHeaders: false},
+ totalRetriever: function ()
+ {
+ if (that.queueUpdater.queueData && that.queueUpdater.queueData.queueDepthMessages != undefined)
+ {
+ return that.queueUpdater.queueData.queueDepthMessages;
+ }
+ return that.management.query(
+ {
+ parent: that.modelObj.parent,
+ category: "queue",
+ select: "queueDepthMessages",
+ where: "name='" + that.modelObj.name.replace(/'/g, "'''") + "'"
+ })
+ .then(function (data)
+ {
+ return data && data.results && data.results[0] ? data.results[0][0] : 0;
+ }, function (error)
+ {
+ return undefined;
+ });
+ }
});
var messageGridDiv = query(".messages", contentPane.containerNode)[0];
that.dataStore = new ObjectStore({objectStore: myStore});
@@ -192,6 +213,13 @@ define(["dojo/_base/declare",
that.moveOrCopyMessages({move: false});
});
+ var refreshMessagesButton = query(".refreshMessagesButton", contentPane.containerNode)[0];
+ connect.connect(registry.byNode(refreshMessagesButton), "onClick", function (evt)
+ {
+ event.stop(evt);
+ that.refreshMessages();
+ });
+
var addBindingButton = query(".addBindingButton", contentPane.containerNode)[0];
connect.connect(registry.byNode(addBindingButton), "onClick", function (evt)
{
@@ -268,7 +296,7 @@ define(["dojo/_base/declare",
});
}
};
- Queue.prototype.reloadGridData = function ()
+ Queue.prototype.refreshMessages = function ()
{
var currentPage = this.grid.pagination.currentPage;
var currentPageSize = this.grid.pagination.currentPageSize;
@@ -278,6 +306,10 @@ define(["dojo/_base/declare",
first: first,
last: last
});
+ };
+ Queue.prototype.reloadGridData = function ()
+ {
+ this.refreshMessages();
this.queueUpdater.update();
};
Queue.prototype.moveOrCopyMessages = function (obj)
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showQueue.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showQueue.html?rev=1759981&r1=1759980&r2=1759981&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showQueue.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/showQueue.html Fri Sep 9 10:52:42 2016
@@ -151,6 +151,7 @@
<button data-dojo-type="dijit.form.Button" class="clearQueueButton" type="button">Clear Queue</button>
<button data-dojo-type="dijit.form.Button" class="moveMessagesButton" type="button">Move Messages</button>
<button data-dojo-type="dijit.form.Button" class="copyMessagesButton" type="button">Copy Messages</button>
+ <button data-dojo-type="dijit.form.Button" class="refreshMessagesButton" type="button">Refresh</button>
</div>
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Flow Control Settings', open: false">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org