pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed dashboard reloading even if subnodes under a dashboard or server selected.

pull/14/head
Aditya Toshniwal 2018-07-25 13:11:00 +01:00 committed by Dave Page
parent 53b5043520
commit be3f9570e3
1 changed files with 81 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
web/pgadmin/dashboard/static/js/dashboard.js
View File

@ -249,8 +249,6 @@ define('pgadmin.dashboard', [
// Handle treeview clicks // Handle treeview clicks
object_selected: function(item, itemData, node) { object_selected: function(item, itemData, node) {
let self = this; let self = this;
/* Clear all the interval functions of previous dashboards */
self.clearIntervalId();
if (itemData && itemData._type && dashboardVisible) { if (itemData && itemData._type && dashboardVisible) {
var treeHierarchy = node.getTreeNodeHierarchy(item), var treeHierarchy = node.getTreeNodeHierarchy(item),
@ -291,6 +289,8 @@ define('pgadmin.dashboard', [
url += self.sid; url += self.sid;
cancel_query_url += self.sid + '/'; cancel_query_url += self.sid + '/';
terminate_session_url += self.sid + '/'; terminate_session_url += self.sid + '/';
} else {
is_server_dashboard = is_database_dashboard = false;
} }
} }
@ -306,8 +306,10 @@ define('pgadmin.dashboard', [
if (url !== $(dashboardPanel).data('dashboard_url') || ( if (url !== $(dashboardPanel).data('dashboard_url') || (
url === $(dashboardPanel).data('dashboard_url') && url === $(dashboardPanel).data('dashboard_url') &&
$(dashboardPanel).data('server_status') == false)) { $(dashboardPanel).data('server_status') == false)) {
// Clear out everything so any existing timers die off
$(div).empty(); $(div).empty();
/* Clear all the interval functions of previous dashboards */
self.clearIntervalId();
$.ajax({ $.ajax({
url: url, url: url,
@ -325,9 +327,6 @@ define('pgadmin.dashboard', [
}); });
$(dashboardPanel).data('server_status', true); $(dashboardPanel).data('server_status', true);
} }
else {
self.init_dashboard();
}
} else { } else {
$(div).empty(); $(div).empty();
$(div).html( $(div).html(
@ -655,10 +654,6 @@ define('pgadmin.dashboard', [
init_dashboard: function() { init_dashboard: function() {
let self = this; let self = this;
if(self.sid === -1 && self.did === -1) {
return;
}
/* Cache may take time to load for the first time /* Cache may take time to load for the first time
* Keep trying till available * Keep trying till available
*/ */
@ -683,30 +678,7 @@ define('pgadmin.dashboard', [
}, },
reflectPreferences: function() { reflectPreferences: function() {
/* Common things can come here */
var self = this; var self = this;
var div_sessions = $('.dashboard-container').find('#graph-sessions')[0];
var div_tps = $('.dashboard-container').find('#graph-tps')[0];
var div_ti = $('.dashboard-container').find('#graph-ti')[0];
var div_to = $('.dashboard-container').find('#graph-to')[0];
var div_bio = $('.dashboard-container').find('#graph-bio')[0];
var options_line = {
parseFloat: false,
xaxis: {
min: 100,
max: 0,
autoscale: 0,
},
yaxis: {
autoscale: 1,
},
legend: {
position: 'nw',
backgroundColor: '#D2E8FF',
},
shadowSize: 0,
resolution : 5,
};
/* We will use old preferences for selective graph updates on preference change */ /* We will use old preferences for selective graph updates on preference change */
if(self.preferences) { if(self.preferences) {
@ -718,60 +690,86 @@ define('pgadmin.dashboard', [
self.old_preferences = self.preferences; self.old_preferences = self.preferences;
} }
if(self.preferences.show_graphs && $('#dashboard-graphs').hasClass('dashboard-hidden')) { if(is_server_dashboard || is_database_dashboard) {
$('#dashboard-graphs').removeClass('dashboard-hidden'); /* Common things can come here */
} var div_sessions = $('.dashboard-container').find('#graph-sessions')[0];
else if(!self.preferences.show_graphs) { var div_tps = $('.dashboard-container').find('#graph-tps')[0];
$('#dashboard-graphs').addClass('dashboard-hidden'); var div_ti = $('.dashboard-container').find('#graph-ti')[0];
self.clearIntervalId(); var div_to = $('.dashboard-container').find('#graph-to')[0];
} var div_bio = $('.dashboard-container').find('#graph-bio')[0];
var options_line = {
parseFloat: false,
xaxis: {
min: 100,
max: 0,
autoscale: 0,
},
yaxis: {
autoscale: 1,
},
legend: {
position: 'nw',
backgroundColor: '#D2E8FF',
},
shadowSize: 0,
resolution : 5,
};
if (self.preferences.show_activity && $('#dashboard-activity').hasClass('dashboard-hidden')) { if(self.preferences.show_graphs && $('#dashboard-graphs').hasClass('dashboard-hidden')) {
$('#dashboard-activity').removeClass('dashboard-hidden'); $('#dashboard-graphs').removeClass('dashboard-hidden');
} }
else if(!self.preferences.show_activity) { else if(!self.preferences.show_graphs) {
$('#dashboard-activity').addClass('dashboard-hidden'); $('#dashboard-graphs').addClass('dashboard-hidden');
} self.clearIntervalId();
}
if(self.preferences.show_graphs) { if (self.preferences.show_activity && $('#dashboard-activity').hasClass('dashboard-hidden')) {
// Render the graphs $('#dashboard-activity').removeClass('dashboard-hidden');
pgAdmin.Dashboard.render_chart( }
div_sessions, url_for('dashboard.session_stats'), options_line, false, else if(!self.preferences.show_activity) {
'session_stats', 'session_stats_refresh' $('#dashboard-activity').addClass('dashboard-hidden');
); }
pgAdmin.Dashboard.render_chart(
div_tps, url_for('dashboard.tps_stats'), options_line, true,
'tps_stats','tps_stats_refresh'
);
pgAdmin.Dashboard.render_chart(
div_ti, url_for('dashboard.ti_stats'), options_line, true,
'ti_stats', 'ti_stats_refresh'
);
pgAdmin.Dashboard.render_chart(
div_to, url_for('dashboard.to_stats'), options_line, true,
'to_stats','to_stats_refresh'
);
pgAdmin.Dashboard.render_chart(
div_bio, url_for('dashboard.bio_stats'), options_line, true,
'bio_stats','bio_stats_refresh'
);
}
/* Dashboard specific preferences can be updated in the if(self.preferences.show_graphs) {
* appropriate functions // Render the graphs
*/ pgAdmin.Dashboard.render_chart(
if(is_server_dashboard) { div_sessions, url_for('dashboard.session_stats'), options_line, false,
self.reflectPreferencesServer(); 'session_stats', 'session_stats_refresh'
} );
else if(is_database_dashboard) { pgAdmin.Dashboard.render_chart(
self.reflectPreferencesDatabase(); div_tps, url_for('dashboard.tps_stats'), options_line, true,
} 'tps_stats','tps_stats_refresh'
);
pgAdmin.Dashboard.render_chart(
div_ti, url_for('dashboard.ti_stats'), options_line, true,
'ti_stats', 'ti_stats_refresh'
);
pgAdmin.Dashboard.render_chart(
div_to, url_for('dashboard.to_stats'), options_line, true,
'to_stats','to_stats_refresh'
);
pgAdmin.Dashboard.render_chart(
div_bio, url_for('dashboard.bio_stats'), options_line, true,
'bio_stats','bio_stats_refresh'
);
}
if(!self.preferences.show_graphs && !self.preferences.show_activity) { if(!self.preferences.show_graphs && !self.preferences.show_activity) {
$('#dashboard-none-show').removeClass('dashboard-hidden'); $('#dashboard-none-show').removeClass('dashboard-hidden');
} }
else { else {
$('#dashboard-none-show').addClass('dashboard-hidden'); $('#dashboard-none-show').addClass('dashboard-hidden');
}
/* Dashboard specific preferences can be updated in the
* appropriate functions
*/
if(is_server_dashboard) {
self.reflectPreferencesServer();
}
else if(is_database_dashboard) {
self.reflectPreferencesDatabase();
}
} }
}, },
reflectPreferencesServer: function() { reflectPreferencesServer: function() {
@ -1313,12 +1311,7 @@ define('pgadmin.dashboard', [
} }
}, },
toggleVisibility: function(flag) { toggleVisibility: function(flag) {
// let self = this;
dashboardVisible = flag; dashboardVisible = flag;
// if(dashboardVisible) {
// self.init_dashboard();
// }
}, },
can_take_action: function(m) { can_take_action: function(m) {
// We will validate if user is allowed to cancel the active query // We will validate if user is allowed to cancel the active query