IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Consistent busy indication. Fixes #1242

Browse Source
This commit is contained in:
Surinder Kumar
2016-06-29 12:16:02 +01:00
committed by Dave Page
parent 9396cb03d5
commit 53434030c1
13 changed files with 194 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
web/pgadmin/misc/statistics/static/js/statistics.js
View File

@@ -139,14 +139,15 @@ function(_, $, pgBrowser, Backgrid) {
},
// Fetch the actual data and update the collection
__updateCollection: function(url, node) {
__updateCollection: function(url, node, item, node_type) {
var $container = this.panel[0].layout().scene().find('.pg-panel-content'),
$msgContainer = $container.find('.pg-panel-statistics-message'),
$gridContainer = $container.find('.pg-panel-statistics-container'),
collection = this.collection,
panel = this.panel,
self = this,
msg = '';
msg = '',
n_type = node_type;
if (node) {
msg = pgBrowser.messages.NODE_HAS_NO_STATISTICS;
@@ -154,6 +155,24 @@ function(_, $, pgBrowser, Backgrid) {
* showStatistics function.
*/
if (node.hasStatistics) {
// Avoid unnecessary reloads
var treeHierarchy = node.getTreeNodeHierarchy(item);
if (_.isUndefined(treeHierarchy[n_type]) ||
_.isUndefined(treeHierarchy[n_type]._id)) {
n_value = undefined,
n_value = -1;
} else {
n_value = treeHierarchy[n_type]._id;
}
if (n_value == $(this.panel[0]).data(n_type)) {
return;
}
// Cache the current IDs for next time
$(this.panel[0]).data(n_type, n_value);
/* Set the message because ajax request may take time to
* fetch the information from the server.
*/
@@ -236,7 +255,7 @@ function(_, $, pgBrowser, Backgrid) {
self.timeout = setTimeout(
function() {
self.__updateCollection.call(
self, node.generate_url(item, 'stats', data, true), node
self, node.generate_url(item, 'stats', data, true), node, item, data._type
);
}, 400);
}