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

Fixed code smell 'Update this function so that its implementation is not identical' reported by SonarQube.

Browse Source
This commit is contained in:
Akshay Joshi
2022-01-25 20:10:31 +05:30
parent 094129e2be
commit 0ce3434631
33 changed files with 603 additions and 1055 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,19 +239,7 @@ define('pgadmin.dashboard', [
$(div).html(data);
})
.fail(function(xhr, error) {
Notify.pgNotifier(
error, xhr,
gettext('An error occurred whilst loading the dashboard.'),
function(msg) {
if(msg === 'CRYPTKEY_SET') {
ajaxHook();
} else {
$(div).html(
'<div class="pg-panel-message" role="alert">' + gettext('An error occurred whilst loading the dashboard.') + '</div>'
);
}
}
);
self.onFail(xhr, error, div, ajaxHook);
});
};
$(div).html(
@@ -266,6 +254,22 @@ define('pgadmin.dashboard', [
}
},
onFail: function(xhr, error, div, ajaxHook) {
Notify.pgNotifier(
error, xhr,
gettext('An error occurred whilst loading the dashboard.'),
function(msg) {
if(msg === 'CRYPTKEY_SET') {
ajaxHook();
} else {
$(div).html(
'<div class="pg-panel-message" role="alert">' + gettext('An error occurred whilst loading the dashboard.') + '</div>'
);
}
}
);
},
// Handle Server Disconnect
object_disconnected: function() {
let item = pgBrowser.tree.selected(),
@@ -358,19 +362,7 @@ define('pgadmin.dashboard', [
self.init_dashboard();
})
.fail(function(xhr, error) {
Notify.pgNotifier(
error, xhr,
gettext('An error occurred whilst loading the dashboard.'),
function(msg) {
if(msg === 'CRYPTKEY_SET') {
ajaxHook();
} else {
$(div).html(
'<div class="pg-panel-message" role="alert">' + gettext('An error occurred whilst loading the dashboard.') + '</div>'
);
}
}
);
self.onFail(xhr, error, div, ajaxHook);
});
};
$(div).html(
@@ -631,6 +623,16 @@ define('pgadmin.dashboard', [
}
}
},
renderTab: function(e, tab_grid_map) {
let prevGrid = tab_grid_map[$(e.relatedTarget).attr('aria-controls')];
$(prevGrid).data('filtertext', $('#txtGridSearch').val());
let currGrid = tab_grid_map[$(e.target).attr('aria-controls')];
$('#txtGridSearch').val($(currGrid).data('filtertext'));
pgAdmin.Dashboard.render_grid_data(currGrid);
},
reflectPreferencesServer: function() {
var self = this;
var $dashboardContainer = $('.dashboard-container');
@@ -895,12 +897,7 @@ define('pgadmin.dashboard', [
// (Re)render the appropriate tab
$('a[data-toggle="tab"]').on('shown.bs.tab', function(e) {
let prevGrid = tab_grid_map[$(e.relatedTarget).attr('aria-controls')];
$(prevGrid).data('filtertext', $('#txtGridSearch').val());
let currGrid = tab_grid_map[$(e.target).attr('aria-controls')];
$('#txtGridSearch').val($(currGrid).data('filtertext'));
pgAdmin.Dashboard.render_grid_data(currGrid);
self.renderTab(e, tab_grid_map);
});
$('#btn_refresh').off('click').on('click', () => {
@@ -1123,12 +1120,7 @@ define('pgadmin.dashboard', [
// (Re)render the appropriate tab
$('a[data-toggle="tab"]').on('shown.bs.tab', function(e) {
let prevGrid = tab_grid_map[$(e.relatedTarget).attr('aria-controls')];
$(prevGrid).data('filtertext', $('#txtGridSearch').val());
let currGrid = tab_grid_map[$(e.target).attr('aria-controls')];
$('#txtGridSearch').val($(currGrid).data('filtertext'));
pgAdmin.Dashboard.render_grid_data(currGrid);
self.renderTab(e, tab_grid_map);
});
$('#btn_refresh').off('click').on('click', () => {