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 following code smells reported by SonarQube:

Browse Source 
1) Immediately return this expression instead of assigning it to the temporary variable.
 2) Extract this nested ternary operation into an independent statement.
 3) Expected a `for-of` loop instead of a `for` loop with this simple iteration.
This commit is contained in:
Akshay Joshi
2022-01-18 14:49:54 +05:30
parent e3807ec3d6
commit 9f836f5433
62 changed files with 367 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/tools/debugger/static/js/debugger.js
View File

@@ -447,7 +447,7 @@ define([
panelTitleFunc.refresh_db_node(message, dbNode);
}
var label = treeInfo.function ? treeInfo.function.label : treeInfo.trigger_function ? treeInfo.trigger_function.label : treeInfo.trigger ? treeInfo.trigger.label : treeInfo.procedure.label;
var label = debuggerUtils.getAppropriateLabel(treeInfo);
debuggerUtils.setDebuggerTitle(panel, browser_preferences, label, db_label, db_label, null, pgBrowser);
panel.focus();
@@ -472,7 +472,7 @@ define([
// Remove the leading and trailing white spaces.
value = value.trim();
let preferences = pgBrowser.get_preferences_for_module('browser');
var name = treeInfo.function ? treeInfo.function.label : treeInfo.trigger_function ? treeInfo.trigger_function.label : treeInfo.trigger ? treeInfo.trigger.label : treeInfo.procedure.label;
var name = debuggerUtils.getAppropriateLabel(treeInfo);
debuggerUtils.setDebuggerTitle(panel, preferences, name, treeInfo.schema.label, treeInfo.database.label, value, pgBrowser);
}
},
@@ -621,7 +621,7 @@ define([
panelTitleFunc.refresh_db_node(message, dbNode);
}
var label = newTreeInfo.function ? newTreeInfo.function.label : newTreeInfo.trigger_function ? newTreeInfo.trigger_function.label : newTreeInfo.trigger ? newTreeInfo.trigger.label : newTreeInfo.procedure.label;
var label = debuggerUtils.getAppropriateLabel(newTreeInfo);
debuggerUtils.setDebuggerTitle(panel, browser_preferences, label, newTreeInfo.schema.label, db_label, null, pgBrowser);
panel.focus();
@@ -646,7 +646,7 @@ define([
// Remove the leading and trailing white spaces.
value = value.trim();
let preferences = pgBrowser.get_preferences_for_module('browser');
var name = treeInfo.function ? treeInfo.function.label : treeInfo.trigger_function ? treeInfo.trigger_function.label : treeInfo.trigger ? treeInfo.trigger.label : treeInfo.procedure.label;
var name = debuggerUtils.getAppropriateLabel(treeInfo);
debuggerUtils.setDebuggerTitle(panel, preferences, name, treeInfo.schema.label, treeInfo.database.label, value, pgBrowser);
}
},

8
web/pgadmin/tools/debugger/static/js/debugger_ui.js
View File

@@ -167,7 +167,7 @@ define([
}
};
var res = function(debugInfo, restartDebug, isEdbProc, transId) {
return function(debugInfo, restartDebug, isEdbProc, transId) {
if (!Alertify.debuggerInputArgsDialog) {
Alertify.dialog('debuggerInputArgsDialog', function factory() {
return {
@@ -782,7 +782,7 @@ define([
'frm_debugger', wcDocker.DOCK.STACKED, dashboardPanel[0]
);
var browser_pref = pgBrowser.get_preferences_for_module('browser');
var label = treeInfo.function ? treeInfo.function.label : treeInfo.trigger_function ? treeInfo.trigger_function.label : treeInfo.trigger ? treeInfo.trigger.label : treeInfo.procedure.label;
var label = debuggerUtils.getAppropriateLabel(treeInfo);
debuggerUtils.setDebuggerTitle(panel, browser_pref, label, treeInfo.schema.label, treeInfo.database.label, null, pgBrowser);
panel.focus();
@@ -805,7 +805,7 @@ define([
if(value) {
// Remove the leading and trailing white spaces.
value = value.trim();
var name = treeInfo.function ? treeInfo.function.label : treeInfo.trigger_function ? treeInfo.trigger_function.label : treeInfo.trigger ? treeInfo.trigger.label : treeInfo.procedure.label;
var name = debuggerUtils.getAppropriateLabel(treeInfo);
debuggerUtils.setDebuggerTitle(panel, self.preferences, name, treeInfo.schema.label, treeInfo.database.label, value, pgBrowser);
}
},
@@ -1054,6 +1054,4 @@ define([
).resizeTo(pgBrowser.stdW.md,pgBrowser.stdH.md);
};
return res;
});

12
web/pgadmin/tools/debugger/static/js/debugger_utils.js
View File

@@ -86,10 +86,22 @@ function get_function_name(function_name) {
}
return func_name;
}
function getAppropriateLabel(treeInfo) {
if (treeInfo.function) {
return treeInfo.function.label;
} else if (treeInfo.trigger_function) {
return treeInfo.trigger_function.label;
} else if (treeInfo.trigger) {
return treeInfo.trigger.label;
} else {
return treeInfo.procedure.label;
}
}
module.exports = {
setFocusToDebuggerEditor: setFocusToDebuggerEditor,
getFunctionId: getFunctionId,
getProcedureId: getProcedureId,
setDebuggerTitle: setDebuggerTitle,
getAppropriateLabel: getAppropriateLabel,
};

46
web/pgadmin/tools/debugger/static/js/direct.js
View File

@@ -104,19 +104,19 @@ define([
var breakpoint_list = new Array();
for (var i = 0; i < br_list.length; i++) {
if (br_list[i].linenumber != -1) {
breakpoint_list.push(br_list[i].linenumber);
for (let val of br_list) {
if (val.linenumber != -1) {
breakpoint_list.push(val.linenumber);
}
}
for (i = 0; i < breakpoint_list.length; i++) {
var info = pgTools.DirectDebug.editor.lineInfo((breakpoint_list[i] - 1));
for (let brk_val of breakpoint_list) {
var info = pgTools.DirectDebug.editor.lineInfo((brk_val - 1));
if (info.gutterMarkers != undefined) {
pgTools.DirectDebug.editor.setGutterMarker((breakpoint_list[i] - 1), 'breakpoints', null);
pgTools.DirectDebug.editor.setGutterMarker((brk_val - 1), 'breakpoints', null);
} else {
pgTools.DirectDebug.editor.setGutterMarker((breakpoint_list[i] - 1), 'breakpoints', function() {
pgTools.DirectDebug.editor.setGutterMarker((brk_val - 1), 'breakpoints', function() {
var marker = document.createElement('div');
marker.style.color = '#822';
marker.innerHTML = '●';
@@ -937,9 +937,9 @@ define([
var breakpoint_list = new Array();
for (var i = 0; i < br_list.length; i++) {
if (br_list[i].linenumber != -1) {
breakpoint_list.push(br_list[i].linenumber);
for (let val of br_list) {
if (val.linenumber != -1) {
breakpoint_list.push(val.linenumber);
}
}
@@ -957,12 +957,12 @@ define([
})
.done(function(res) {
if (res.data.status) {
for (var j = 0; j < breakpoint_list.length; j++) {
var info = pgTools.DirectDebug.editor.lineInfo((breakpoint_list[j] - 1));
for (let brk_val of breakpoint_list) {
var info = pgTools.DirectDebug.editor.lineInfo((brk_val - 1));
if (info) {
if (info.gutterMarkers != undefined) {
pgTools.DirectDebug.editor.setGutterMarker((breakpoint_list[j] - 1), 'breakpoints', null);
pgTools.DirectDebug.editor.setGutterMarker((brk_val - 1), 'breakpoints', null);
}
}
}
@@ -1168,12 +1168,12 @@ define([
var my_obj = [];
if (result.length != 0) {
for (var i = 0; i < result.length; i++) {
if (result[i].varclass == 'L') {
for (let res_val of result) {
if (res_val.varclass == 'L') {
my_obj.push({
'name': result[i].name,
'type': result[i].dtype,
'value': result[i].value,
'name': res_val.name,
'type': res_val.dtype,
'value': res_val.value,
});
}
}
@@ -1254,12 +1254,12 @@ define([
var param_obj = [];
if (result.length != 0) {
for (var i = 0; i < result.length; i++) {
if (result[i].varclass == 'A') {
for (let res_val of result) {
if (res_val.varclass == 'A') {
param_obj.push({
'name': result[i].name,
'type': result[i].dtype,
'value': result[i].value,
'name': res_val.name,
'type': res_val.dtype,
'value': res_val.value,
});
}
}