mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Fixed following SonarQube issues:
1. Boolean checks should not be inverted. 2. The comma operator should not be used. 3. Arguments to built-in functions should match documented types. 4. Redundant pairs of parentheses should be removed. 5. A conditionally executed single line should be denoted by indentation, 6. A while loop should be used instead of a 'for' loop.
This commit is contained in:
committed by
Akshay Joshi
parent
6a63279396
commit
707ff450b5
@@ -776,7 +776,7 @@ define('pgadmin.node.type', [
|
|||||||
if(acl.length > 0)
|
if(acl.length > 0)
|
||||||
acl.reset();
|
acl.reset();
|
||||||
}
|
}
|
||||||
return !(m.get('typtype') === 'p');
|
return (m.get('typtype') !== 'p');
|
||||||
},
|
},
|
||||||
},{
|
},{
|
||||||
id: 'seclabels', label: gettext('Security labels'),
|
id: 'seclabels', label: gettext('Security labels'),
|
||||||
@@ -792,7 +792,7 @@ define('pgadmin.node.type', [
|
|||||||
if(secLabs.length > 0)
|
if(secLabs.length > 0)
|
||||||
secLabs.reset();
|
secLabs.reset();
|
||||||
}
|
}
|
||||||
return !(m.get('typtype') === 'p');
|
return (m.get('typtype') !== 'p');
|
||||||
},
|
},
|
||||||
}],
|
}],
|
||||||
validate: function() {
|
validate: function() {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
let tokenSetNo = 0;
|
let tokenSetNo = 0;
|
||||||
let startTkn = tokenSet[tokenSetNo].start,
|
let startTkn = tokenSet[tokenSetNo].start,
|
||||||
endTkn = tokenSet[tokenSetNo].end;
|
endTkn = tokenSet[tokenSetNo].end;
|
||||||
for (; at > 0;) {
|
while (at > 0) {
|
||||||
var found = lineText.lastIndexOf(startTkn, at);
|
var found = lineText.lastIndexOf(startTkn, at);
|
||||||
var startToken = startTkn;
|
var startToken = startTkn;
|
||||||
var endToken = endTkn;
|
var endToken = endTkn;
|
||||||
@@ -57,7 +57,8 @@
|
|||||||
outer: for (var i = line + 1; i < lastLine; ++i) {
|
outer: for (var i = line + 1; i < lastLine; ++i) {
|
||||||
var text = cm.getLine(i),
|
var text = cm.getLine(i),
|
||||||
pos = 0;
|
pos = 0;
|
||||||
for (;;) {
|
var whileloopvar = 0;
|
||||||
|
while (whileloopvar < 1) {
|
||||||
var nextOpen = text.indexOf(startToken, pos),
|
var nextOpen = text.indexOf(startToken, pos),
|
||||||
nextClose = text.indexOf(endToken, pos);
|
nextClose = text.indexOf(endToken, pos);
|
||||||
if (nextOpen < 0) nextOpen = text.length;
|
if (nextOpen < 0) nextOpen = text.length;
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ define([], function() {
|
|||||||
c = [1 / 25.4, 1 / 2.54, 1 / 72, 1 / 6],
|
c = [1 / 25.4, 1 / 2.54, 1 / 72, 1 / 6],
|
||||||
f = ['mm', 'cm', 'pt', 'pc', 'in', 'mozmm'],
|
f = ['mm', 'cm', 'pt', 'pc', 'in', 'mozmm'],
|
||||||
u = 6;
|
u = 6;
|
||||||
for (i.appendChild(n), m && (n.style.marginTop = '1%', p = '1%' === m(n).marginTop); u--;) d[f[u] + 'toPx'] = c[u] ? c[u] * d.inToPx : r(n, '1' + f[u]);
|
for (i.appendChild(n), m && ((n.style.marginTop = '1%'), (p = '1%' === m(n).marginTop)); u--;) d[f[u] + 'toPx'] = c[u] ? c[u] * d.inToPx : r(n, '1' + f[u]);
|
||||||
i.removeChild(n); t.toPx = r;
|
i.removeChild(n); t.toPx = r;
|
||||||
})(pgAdmin, window.document);
|
})(pgAdmin, window.document);
|
||||||
|
|
||||||
|
|||||||
@@ -191,7 +191,8 @@ define(['jquery', 'underscore', 'sources/gettext', 'sources/url_for'],
|
|||||||
|
|
||||||
calcFontSize: function(fontSize) {
|
calcFontSize: function(fontSize) {
|
||||||
if(fontSize) {
|
if(fontSize) {
|
||||||
let rounded = Number((Math.round(fontSize + 'e+2') + 'e-2'));
|
fontSize = parseFloat((Math.round(parseFloat(fontSize + 'e+2')) + 'e-2'));
|
||||||
|
let rounded = Number(fontSize);
|
||||||
if(rounded > 0) {
|
if(rounded > 0) {
|
||||||
return rounded + 'em';
|
return rounded + 'em';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -210,7 +210,7 @@ define([
|
|||||||
type: 'int',
|
type: 'int',
|
||||||
deps: ['format'],
|
deps: ['format'],
|
||||||
disabled: function(m) {
|
disabled: function(m) {
|
||||||
return !(m.get('format') === 'directory');
|
return (m.get('format') !== 'directory');
|
||||||
},
|
},
|
||||||
visible: function(m) {
|
visible: function(m) {
|
||||||
if (!_.isUndefined(m.get('type')) && m.get('type') === 'server')
|
if (!_.isUndefined(m.get('type')) && m.get('type') === 'server')
|
||||||
|
|||||||
@@ -1590,8 +1590,9 @@ define([
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else
|
} else {
|
||||||
this.intializePanels();
|
this.intializePanels();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
// Read the messages of the database server and get the port ID and attach
|
// Read the messages of the database server and get the port ID and attach
|
||||||
|
|||||||
@@ -3536,8 +3536,9 @@ define('tools.querytool', [
|
|||||||
return 2000;
|
return 2000;
|
||||||
} else if (seconds >= 90) {
|
} else if (seconds >= 90) {
|
||||||
return 5000;
|
return 5000;
|
||||||
} else
|
} else {
|
||||||
return 1;
|
return 1;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -3857,8 +3858,9 @@ define('tools.querytool', [
|
|||||||
if (res.data.status) {
|
if (res.data.status) {
|
||||||
// Refresh the sql grid
|
// Refresh the sql grid
|
||||||
queryToolActions.executeQuery(self);
|
queryToolActions.executeQuery(self);
|
||||||
} else
|
} else {
|
||||||
alertify.alert(gettext('Change limit Error'), res.data.result);
|
alertify.alert(gettext('Change limit Error'), res.data.result);
|
||||||
|
}
|
||||||
}, 10
|
}, 10
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -535,8 +535,8 @@ define([
|
|||||||
} else {
|
} else {
|
||||||
if ((_.isUndefined(this.get('newPassword')) || _.isNull(this.get('newPassword')) ||
|
if ((_.isUndefined(this.get('newPassword')) || _.isNull(this.get('newPassword')) ||
|
||||||
this.get('newPassword') == '') &&
|
this.get('newPassword') == '') &&
|
||||||
((_.isUndefined(this.get('confirmPassword')) || _.isNull(this.get('confirmPassword')) ||
|
(_.isUndefined(this.get('confirmPassword')) || _.isNull(this.get('confirmPassword')) ||
|
||||||
this.get('confirmPassword') == ''))) {
|
this.get('confirmPassword') == '')) {
|
||||||
|
|
||||||
this.errorModel.unset('newPassword');
|
this.errorModel.unset('newPassword');
|
||||||
if (this.get('newPassword') == '') {
|
if (this.get('newPassword') == '') {
|
||||||
|
|||||||
Reference in New Issue
Block a user