From 37082a955b427e029bf0af0c2ed113b403657ef3 Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Fri, 26 Aug 2022 10:07:59 +0100
Subject: [PATCH] Sonarqube fixes.

---
 web/pgacloud/providers/biganimal.py                         | 6 +++---
 web/pgacloud/providers/rds.py                               | 6 +++---
 .../server_groups/servers/databases/schemas/tables/utils.py | 2 +-
 .../browser/server_groups/servers/static/js/server.js       | 1 -
 web/pgadmin/misc/bgprocess/processes.py                     | 1 -
 web/pgadmin/misc/bgprocess/static/js/Processes.jsx          | 3 +--
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/web/pgacloud/providers/biganimal.py b/web/pgacloud/providers/biganimal.py
index 5185741b2..acd74846a 100644
--- a/web/pgacloud/providers/biganimal.py
+++ b/web/pgacloud/providers/biganimal.py
@@ -83,11 +83,11 @@ class BigAnimalProvider(AbsProvider):
         try:
             private_network = True if args.private_network == '1' else False
             ip = args.public_ip if args.public_ip else '0.0.0.0/0'
-            IpRanges = []
+            ip_ranges = []
 
             ip = ip.split(',')
             for i in ip:
-                IpRanges.append([i, 'pgcloud client {}'.format(i)])
+                ip_ranges.append([i, 'pgcloud client {}'.format(i)])
 
             debug('Creating BigAnimal cluster: {}...'.format(args.name))
 
@@ -114,7 +114,7 @@ class BigAnimalProvider(AbsProvider):
             }
 
             if not private_network:
-                _data['allowIpRangeMap'] = IpRanges
+                _data['allowIpRangeMap'] = ip_ranges
 
             cluster_resp = requests.post(_url,
                                          headers=_headers,
diff --git a/web/pgacloud/providers/rds.py b/web/pgacloud/providers/rds.py
index 7381917cc..8d327196a 100644
--- a/web/pgacloud/providers/rds.py
+++ b/web/pgacloud/providers/rds.py
@@ -162,11 +162,11 @@ class RdsProvider(AbsProvider):
         ip = args.public_ip if args.public_ip else\
             '{}/32'.format(get_my_ip())
         port = args.db_port or 5432
-        IpRanges = []
+        ip_ranges = []
 
         ip = ip.split(',')
         for i in ip:
-            IpRanges.append({
+            ip_ranges.append({
                 'CidrIp': i,
                 'Description': 'pgcloud client {}'.format(i)
             })
@@ -180,7 +180,7 @@ class RdsProvider(AbsProvider):
                         'FromPort': port,
                         'ToPort': port,
                         'IpProtocol': 'tcp',
-                        'IpRanges': IpRanges
+                        'IpRanges': ip_ranges
                     },
                 ]
             )
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py
index 6e26c4c34..aca4716ec 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/utils.py
@@ -104,7 +104,7 @@ class BaseTableView(PGChildNodeView, BasePartitionTable, VacuumSettings):
             # Here args[0] will hold self & kwargs will hold gid,sid,did
             self = args[0]
             driver = get_driver(PG_DEFAULT_DRIVER)
-            did = kwargs['did']
+
             self.manager = driver.connection_manager(kwargs['sid'])
             if "conn_id" in kwargs:
                 self.conn = self.manager.connection(
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js
index 3befa6482..a651f7fa4 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -653,7 +653,6 @@ define('pgadmin.node.server', [
           else if (res.cloud_status == -1) {
             pgAdmin.Browser.BgProcessManager.recheckCloudServer(data._id);
           }
-          return;
         }).always(function(){
           data.is_connecting = false;
         });
diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py
index 81dfcc9f2..4db0c4938 100644
--- a/web/pgadmin/misc/bgprocess/processes.py
+++ b/web/pgadmin/misc/bgprocess/processes.py
@@ -503,7 +503,6 @@ class BatchProcess(object):
         """
         Parse the output to get the cloud instance details
         """
-        _server = {}
         _pid = self.id
 
         _process = Process.query.filter_by(
diff --git a/web/pgadmin/misc/bgprocess/static/js/Processes.jsx b/web/pgadmin/misc/bgprocess/static/js/Processes.jsx
index 02c13f5ce..acd4e0686 100644
--- a/web/pgadmin/misc/bgprocess/static/js/Processes.jsx
+++ b/web/pgadmin/misc/bgprocess/static/js/Processes.jsx
@@ -7,7 +7,7 @@
 //
 //////////////////////////////////////////////////////////////
 
-import React, { useEffect } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import PgTable from 'sources/components/PgTable';
 import gettext from 'sources/gettext';
 import PropTypes from 'prop-types';
@@ -21,7 +21,6 @@ import DeleteIcon from '@material-ui/icons/Delete';
 import HelpIcon from '@material-ui/icons/HelpRounded';
 import url_for from 'sources/url_for';
 import { Box } from '@material-ui/core';
-import { useMemo } from 'react';
 import Notifier from '../../../../static/js/helpers/Notifier';