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

Fixes following code smell reported by SonarQube:

Browse Source 
1) Replace this if-then-else flow by a single return statement
 2) Remove the unnecessary boolean literals.
This commit is contained in:
Akshay Joshi
2022-09-08 19:56:02 +05:30
parent 7086719640
commit b8f63adf41
47 changed files with 193 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
web/pgadmin/browser/server_groups/servers/static/js/server.js
View File

@@ -60,9 +60,7 @@ define('pgadmin.node.server', [
label: gettext('Server'),
canDrop: function(node){
let serverOwner = node.user_id;
if (serverOwner != current_user.id && !_.isUndefined(serverOwner))
return false;
return true;
return !(serverOwner != current_user.id && !_.isUndefined(serverOwner));
},
dropAsRemove: true,
dropPriority: 5,
@@ -146,11 +144,8 @@ define('pgadmin.node.server', [
label: gettext('Clear Saved Password'), icon: 'fa fa-eraser',
priority: 11,
enable: function(node) {
if (node && node._type === 'server' &&
node.is_password_saved) {
return true;
}
return false;
return (node && node._type === 'server' &&
node.is_password_saved);
},
},{
name: 'clear_sshtunnel_password', node: 'server', module: this,
@@ -158,11 +153,8 @@ define('pgadmin.node.server', [
label: gettext('Clear SSH Tunnel Password'), icon: 'fa fa-eraser',
priority: 12,
enable: function(node) {
if (node && node._type === 'server' &&
node.is_tunnel_password_saved) {
return true;
}
return false;
return (node && node._type === 'server' &&
node.is_tunnel_password_saved);
},
data: {
data_disabled: gettext('SSH Tunnel password is not saved for selected server.'),
@@ -175,54 +167,38 @@ define('pgadmin.node.server', [
);
},
is_not_connected: function(node) {
return (node && node.connected != true);
return (node && !node.connected);
},
canCreate: function(node){
let serverOwner = node.user_id;
if (serverOwner == current_user.id || _.isUndefined(serverOwner))
return true;
return false;
return (serverOwner == current_user.id || _.isUndefined(serverOwner));
},
is_connected: function(node) {
return (node && node.connected == true);
return (node && node.connected);
},
enable_reload_config: function(node) {
// Must be connected & is Super user
if (node && node._type == 'server' &&
node.connected && node.user.is_superuser) {
return true;
}
return false;
return (node && node._type == 'server' &&
node.connected && node.user.is_superuser);
},
is_applicable: function(node) {
// Must be connected & super user & not in recovery mode
if (node && node._type == 'server' &&
return (node && node._type == 'server' &&
node.connected && node.user.is_superuser
&& node.in_recovery == false) {
return true;
}
return false;
&& !node.in_recovery);
},
wal_pause_enabled: function(node) {
// Must be connected & is Super user & in Recovery mode
if (node && node._type == 'server' &&
return (node && node._type == 'server' &&
node.connected && node.user.is_superuser
&& node.in_recovery == true
&& node.wal_pause == false) {
return true;
}
return false;
&& node.in_recovery && !node.wal_pause);
},
wal_resume_enabled: function(node) {
// Must be connected & is Super user & in Recovery mode
if (node && node._type == 'server' &&
return (node && node._type == 'server' &&
node.connected && node.user.is_superuser
&& node.in_recovery == true
&& node.wal_pause == true) {
return true;
}
return false;
&& node.in_recovery && node.wal_pause);
},
callbacks: {
/* Connect the server */

21
web/pgadmin/browser/server_groups/servers/static/js/vacuum.ui.js
View File

@@ -74,11 +74,7 @@ export default class VacuumSettingsSchema extends BaseUISchema {
return true;
}
if(obj.inCatalog)
{
return false;
}
return true;
return !obj.inCatalog;
},
depChange(state) {
if(state.is_partitioned) {
@@ -96,10 +92,7 @@ export default class VacuumSettingsSchema extends BaseUISchema {
],
deps: ['autovacuum_custom'],
disabled: function(state) {
if(obj.inCatalog && state.autovacuum_custom) {
return false;
}
return true;
return !(obj.inCatalog && state.autovacuum_custom);
},
depChange: function(state) {
if(obj.inCatalog && state.autovacuum_custom) {
@@ -122,10 +115,7 @@ export default class VacuumSettingsSchema extends BaseUISchema {
disabled: function(state) {
// We need to check additional condition to toggle enable/disable
// for table auto-vacuum
if(obj.inCatalog && (obj.top.isNew() || state.hastoasttable)) {
return false;
}
return true;
return !(obj.inCatalog && (obj.top.isNew() || state.hastoasttable));
}
},
{
@@ -139,10 +129,7 @@ export default class VacuumSettingsSchema extends BaseUISchema {
],
deps:['toast_autovacuum'],
disabled: function(state) {
if(obj.inCatalog && state.toast_autovacuum) {
return false;
}
return true;
return !(obj.inCatalog && state.toast_autovacuum);
},
depChange: function(state) {
if(obj.inCatalog && state.toast_autovacuum) {