IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-08-11 05:24:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

More code cleanup for SonarQube.

Browse Source
This commit is contained in:
Akshay Joshi
2020-06-18 16:20:34 +01:00
committed by Dave Page
parent 6d3f13076f
commit bc24e3643f
13 changed files with 73 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/pgadmin/static/js/tree/pgadmin_tree_save_state.js
+7 -7
View File
@@ -211,7 +211,7 @@ _.extend(pgBrowser.browserTreeState, {
node = data && pgBrowser.Nodes[data._type],
treeHierarchy = node && node.getTreeNodeHierarchy(item);
if (treeHierarchy === null || !pgBrowser.tree.hasParent(item) || !(self.parent in treeHierarchy))
if (treeHierarchy === null || !pgBrowser.tree.hasParent(item) || !(treeHierarchy.hasOwnProperty(self.parent)))
return;
let topParent = treeHierarchy && treeHierarchy[self.parent]['_id'],
@@ -231,7 +231,7 @@ _.extend(pgBrowser.browserTreeState, {
let tmpTreeData = self.current_state[topParent]['paths'],
databaseId = undefined;
if ('database' in treeHierarchy)
if (treeHierarchy.hasOwnProperty('database'))
databaseId = treeHierarchy['database']['id'];
if (!_.isUndefined(tmpTreeData) && !_.isUndefined(tmpTreeData.length)) {
@@ -269,7 +269,7 @@ _.extend(pgBrowser.browserTreeState, {
treeHierarchy = node && node.getTreeNodeHierarchy(item);
if (treeHierarchy === null || !pgBrowser.tree.hasParent(item) || !(self.parent in treeHierarchy))
if (treeHierarchy === null || !pgBrowser.tree.hasParent(item) || !(treeHierarchy.hasOwnProperty(self.parent)))
return;
// If the server node is open then only we should populate the tree
@@ -290,7 +290,7 @@ _.extend(pgBrowser.browserTreeState, {
let tmpTreeDataPaths = [...tmpTreeData['paths']],
databaseId = undefined;
if ('database' in treeHierarchy)
if (treeHierarchy.hasOwnProperty('database'))
databaseId = treeHierarchy['database']['id'];
_.each(tmpTreeDataPaths, function(tData) {
@@ -325,7 +325,7 @@ _.extend(pgBrowser.browserTreeState, {
node = data && pgBrowser.Nodes[data._type],
treeHierarchy = node.getTreeNodeHierarchy(item);
if ('database' in treeHierarchy) {
if (treeHierarchy.hasOwnProperty('database')) {
let databaseItem = treeHierarchy['database']['id'],
topParent = treeHierarchy && treeHierarchy[this.parent]['_id'];
@@ -358,7 +358,7 @@ _.extend(pgBrowser.browserTreeState, {
selectedItem = selectedItem ? selectedItem.id : undefined;
if ('database' in treeHierarchy) {
if (treeHierarchy.hasOwnProperty('database')) {
databaseItem = treeHierarchy['database']['id'];
}
@@ -379,7 +379,7 @@ _.extend(pgBrowser.browserTreeState, {
tmpTreeData = treeData[treeHierarchy[this.parent]['_id']];
if ('database' in treeHierarchy) {
if (treeHierarchy.hasOwnProperty('database')) {
let databaseItem = treeHierarchy['database']['id'];
if (tmpTreeData && 'selected' in tmpTreeData && databaseItem in tmpTreeData['selected']) {
web/pgadmin/static/js/tree/tree.js
+3 -1
View File
@@ -324,7 +324,9 @@ export class Tree {
if (parent === this.rootNode) {
node.parentNode = null;
}
parent.children.push(node);
if (parent !== null && parent !== undefined)
parent.children.push(node);
return node;
}