Fixed SonarQube issues.

web/pgadmin/static/bundle/app.js

@@ -10,9 +10,9 @@
 define('app', [
   'sources/pgadmin', 'bundled_browser',
 ], function(pgAdmin) {
-  var initializeModules = function(Object) {
-    for (var key in Object) {
-      var module = Object[key];
+  let initializeModules = function(Object) {
+    for (let key in Object) {
+      let module = Object[key];
 
       if (module && module.init && typeof module.init == 'function') {
         try {

web/pgadmin/static/bundle/codemirror.js

@@ -26,7 +26,7 @@ import 'codemirror/addon/comment/comment';
 import 'sources/codemirror/addon/fold/pgadmin-sqlfoldcode';
 import 'sources/codemirror/extension/centre_on_line';
 
-var cmds = CodeMirror.commands;
+let cmds = CodeMirror.commands;
 cmds.focusOut = function(){
   event.stopPropagation();
   document.activeElement.blur();

web/pgadmin/static/js/SchemaView/FormView.jsx

@@ -165,7 +165,7 @@ export default function FormView({
   let isOnScreen = useOnScreen(formRef);
   if(isOnScreen) {
     /* Don't do it when the form is alredy visible */
-    if(onScreenTracker.current == false) {
+    if(!onScreenTracker.current) {
       /* Re-select the tab. If form is hidden then sometimes it is not selected */
       setTabValue(tabValue);
       onScreenTracker.current = true;

web/pgadmin/static/js/check_node_visibility.js

@@ -24,14 +24,14 @@ define([],
       }
 
       // Exclude non-applicable nodes
-      var nodes_not_supported = [
+      let nodes_not_supported = [
         'server_group', 'server', 'catalog_object_column',
       ];
       if(_.indexOf(nodes_not_supported, node_type) >= 0) {
         return true;
       }
 
-      var preference = pgBrowser.get_preference('browser', 'show_node_'+node_type);
+      let preference = pgBrowser.get_preference('browser', 'show_node_'+node_type);
 
       if (preference) {
         return preference.value;

web/pgadmin/static/js/codemirror/addon/fold/pgadmin-sqlfoldcode.js

@@ -17,20 +17,21 @@
 })(function(CodeMirror) {
   'use strict';
 
-  var pgadminKeywordRangeFinder = function(cm, start, tokenSet) {
-    var line = start.line,
+  let pgadminKeywordRangeFinder = function(cm, start, tokenSet) {
+    let line = start.line,
       lineText = cm.getLine(line);
-    var at = lineText.length,
+    let at = lineText.length,
       startChar, tokenType;
 
-    let tokenSetNo = 0;
+    let tokenSetNo = 0,
+      startToken, endToken;
     let startTkn = tokenSet[tokenSetNo].start,
       endTkn = tokenSet[tokenSetNo].end;
     while (at > 0) {
-      var found = lineText.toUpperCase().lastIndexOf(startTkn, at);
+      let found = lineText.toUpperCase().lastIndexOf(startTkn, at);
       found = checkStartTokenFoundOnEndToken(found, lineText.toUpperCase(), endTkn, startTkn);
-      var startToken = startTkn;
-      var endToken = endTkn;
+      startToken = startTkn;
+      endToken = endTkn;
 
       if (found < start.ch) {
         /* If the start token is not found then search for the next set of token */
@@ -52,18 +53,18 @@
       at = found - 1;
     }
     if (startChar == null || lineText.toUpperCase().lastIndexOf(startToken) > startChar) return;
-    var count = 1,
+    let count = 1,
       lastLine = cm.lineCount(),
       end, endCh;
-    outer: for (var i = line + 1; i < lastLine; ++i) {
-      var text = cm.getLine(i).toUpperCase(),
+    outer: for (let i = line + 1; i < lastLine; ++i) {
+      let text = cm.getLine(i).toUpperCase(),
         pos = 0;
-      var whileloopvar = 0;
+      let whileloopvar = 0;
       while (whileloopvar < 1) {
-        var nextOpen = text.indexOf(startToken, pos);
+        let nextOpen = text.indexOf(startToken, pos);
         nextOpen = checkStartTokenFoundOnEndToken(nextOpen, text, endToken, startToken);
 
-        var nextClose = text.indexOf(endToken, pos);
+        let nextClose = text.indexOf(endToken, pos);
         if (nextOpen < 0) nextOpen = text.length;
         if (nextClose < 0) nextClose = text.length;
         pos = Math.min(nextOpen, nextClose);

web/pgadmin/static/js/codemirror/extension/centre_on_line.js

@@ -10,7 +10,7 @@
 import CodeMirror from 'codemirror/lib/codemirror';
 
 CodeMirror.defineExtension('centerOnLine', function(line) {
-  var ht = this.getScrollInfo().clientHeight;
-  var coords = this.charCoords({line: line, ch: 0}, 'local');
+  let ht = this.getScrollInfo().clientHeight;
+  let coords = this.charCoords({line: line, ch: 0}, 'local');
   this.scrollTo(null, (coords.top + coords.bottom - ht) / 2);
 });

web/pgadmin/static/js/csrf.js

@@ -19,7 +19,7 @@ export function setPGCSRFToken(header, token) {
 
   // Configure Backbone.sync to set CSRF-Token-header request header for
   // every requests except GET.
-  var origBackboneSync = Backbone.sync;
+  let origBackboneSync = Backbone.sync;
   Backbone.sync = function(method, model, options) {
     options.beforeSend = function(xhr) {
       xhr.setRequestHeader(header, token);
@@ -30,7 +30,7 @@ export function setPGCSRFToken(header, token) {
 
   // Configure Backbone.get to set 'X-CSRFToken' request header for
   // GET requests.
-  var origBackboneGet = Backbone.get;
+  let origBackboneGet = Backbone.get;
   Backbone.get = function(method, model, options) {
     options.beforeSend = function(xhr) {
       xhr.setRequestHeader(header, token);

web/pgadmin/static/js/dialog_tab_navigator.js

@@ -33,7 +33,7 @@ class dialogTabNavigator {
   }
 
   onKeyboardEvent(event, shortcut) {
-    var currentTabPane =  this.dialogContainer
+    let currentTabPane =  this.dialogContainer
         .find('.tab-content:first > .tab-pane.active:first:visible'),
       childTabData = this.isActivePaneHasChildTabs(currentTabPane);
 
@@ -44,7 +44,7 @@ class dialogTabNavigator {
     this.tabSwitching = true;
 
     if(childTabData) {
-      var res = this.navigate(shortcut, childTabData.childTab,
+      let res = this.navigate(shortcut, childTabData.childTab,
         childTabData.childTabPane, event);
 
       if (!res) {
@@ -56,7 +56,7 @@ class dialogTabNavigator {
   }
 
   isActivePaneHasChildTabs(currentTabPane) {
-    var childTab = currentTabPane.find('.nav-tabs:first:visible'),
+    let childTab = currentTabPane.find('.nav-tabs:first:visible'),
       childTabPane;
 
     if (childTab.length > 0) {
@@ -82,7 +82,7 @@ class dialogTabNavigator {
   }
 
   navigateBackward(tabs, tab_pane, event) {
-    var self = this,
+    let self = this,
       nextTabPane,
       innerTabContainer,
       prevtab = $(tabs).find('li').has('a.active').prev('li');
@@ -113,7 +113,7 @@ class dialogTabNavigator {
   }
 
   navigateForward(tabs, tab_pane, event) {
-    var self = this,
+    let self = this,
       nextTabPane,
       innerTabContainer,
       nexttab = $(tabs).find('li').has('a.active').next('li');

web/pgadmin/static/js/gettext.js

@@ -19,7 +19,7 @@ define(['translations'], function (translations) {
    */
   return function gettext(text) {
 
-    var rawTranslation = translations[text] ? translations[text] : text;
+    let rawTranslation = translations[text] ? translations[text] : text;
 
     if(arguments.length == 1) {
       return rawTranslation;

web/pgadmin/static/js/is_native.js

@@ -4,17 +4,17 @@
 (function() {
 
   // Used to resolve the internal `[[Class]]` of values
-  var toString = Object.prototype.toString;
+  let toString = Object.prototype.toString;
 
   // Used to resolve the decompiled source of functions
-  var fnToString = Function.prototype.toString;
+  let fnToString = Function.prototype.toString;
 
   // Used to detect host constructors (Safari > 4; really typed array specific)
-  var reHostCtor = /^\[object .+?Constructor\]$/;
+  let reHostCtor = /^\[object .+?Constructor\]$/;
 
   // Compile a regexp using a common native method as a template.
   // We chose `Object#toString` because there's a good chance it is not being mucked with.
-  var reNative = RegExp('^' +
+  let reNative = RegExp('^' +
     // Coerce `Object#toString` to a string
     String(toString)
     // Escape any special regexp characters
@@ -26,7 +26,7 @@
   );
 
   function isNative(value) {
-    var type = typeof value;
+    let type = typeof value;
     return type == 'function'
       // Use `Function#toString` to bypass the value's own `toString` method
       // and avoid being faked out.

web/pgadmin/static/js/pgadmin.js

@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////
 
 define([], function() {
-  var pgAdmin = window.pgAdmin = window.pgAdmin || {};
+  let pgAdmin = window.pgAdmin = window.pgAdmin || {};
 
   // Reference:
   // https://github.com/heygrady/Units/blob/master/Length.min.js
@@ -57,7 +57,7 @@ define([], function() {
       else('auto' === _o || _i && 'px' !== _i) && m ? _o = 0 : _i && 'px' !== _i && !m && (_o = r(_t, _o) + 'px');
       return _o;
     }
-    var p, n = e.createElement('test'),
+    let p, n = e.createElement('test'),
       i = e.documentElement,
       l = e.defaultView,
       m = l && l.getComputedStyle,
@@ -76,7 +76,7 @@ define([], function() {
   pgAdmin.natural_sort = function(a, b, options) {
     options = options || {};
 
-    var re = /(^-?[0-9]+(\.?[0-9]*)[df]?e?[0-9]?$|^0x[0-9a-f]+$|[0-9]+)/gi,
+    let re = /(^-?[0-9]+(\.?[0-9]*)[df]?e?[0-9]?$|^0x[0-9a-f]+$|[0-9]+)/gi,
       sre = /(^[ ]*|[ ]*$)/g,
       dre = /(^([\w ]+,?[\w ]+)?[\w ]+,?[\w ]+\d+:\d+(:\d+)?[\w ]?|^\d{1,4}[\/\-]\d{1,4}[\/\-]\d{1,4}|^\w+, \w+ \d+, \d{4})/,
       hre = /^0x[0-9a-f]+$/i,
@@ -102,7 +102,7 @@ define([], function() {
       else if (xD > yD) return 1 * mult;
 
     // natural sorting through split numeric strings and default strings
-    for (var cLoc = 0, numS = Math.max(xN.length, yN.length); cLoc < numS; cLoc++) {
+    for (let cLoc = 0, numS = Math.max(xN.length, yN.length); cLoc < numS; cLoc++) {
       // find floats not starting with '0', string or 0 if not defined (Clint Priest)
       oFxNcL = !(xN[cLoc] || '').match(ore) && parseFloat(xN[cLoc]) || xN[cLoc] || 0;
       oFyNcL = !(yN[cLoc] || '').match(ore) && parseFloat(yN[cLoc]) || yN[cLoc] || 0;

web/pgadmin/static/js/select2/configure_show_on_scroll.js

@@ -26,24 +26,24 @@ export default function (options) {
     Utils.Extend(ScrollDataAdapter, BaseAdapter);
 
     ScrollDataAdapter.prototype.query = function (params, callback) {
-      var data = [];
-      var self = this;
+      let data = [];
+      let self = this;
       if (!params.page) {
         params.page = 1;
       }
-      var pageSize = 20;
+      let pageSize = 20;
 
-      var $options = this.$element.children();
+      let $options = this.$element.children();
       $options.each(function () {
-        var $option = $(this);
+        let $option = $(this);
 
         if (!$option.is('option') && !$option.is('optgroup')) {
           return;
         }
 
-        var option = self.item($option);
+        let option = self.item($option);
 
-        var matches = self.matches(params, option);
+        let matches = self.matches(params, option);
 
         if (matches !== null) {
           data.push(matches);

web/pgadmin/static/js/selection/clipboard.js

@@ -12,7 +12,7 @@ import Notify from '../helpers/Notifier';
 define(['sources/gettext'], function (gettext) {
   return {
     copyTextToClipboard: function (text) {
-      var textArea = document.createElement('textarea');
+      let textArea = document.createElement('textarea');
 
       //
       // *** This styling is an extra step which is likely not required. ***
@@ -54,7 +54,7 @@ define(['sources/gettext'], function (gettext) {
       textArea.textContent = text;
       textArea.select();
 
-      var copyTextToClipboardHandler = function(e) {
+      let copyTextToClipboardHandler = function(e) {
         /* Remove oncopy event listener from document as we add listener for
          * oncopy event on each copy operation.
          * Also we don't want this listener to be persistent; Otherwise it'll get
@@ -62,7 +62,7 @@ define(['sources/gettext'], function (gettext) {
          * this document.
          */
         document.removeEventListener('copy', copyTextToClipboardHandler);
-        var clipboardData = e.clipboardData || window.clipboardData;
+        let clipboardData = e.clipboardData || window.clipboardData;
 
         if (clipboardData) {
           clipboardData.setData('text', text);

web/pgadmin/static/js/selection/range_boundary_navigator.js

@@ -16,10 +16,10 @@ define(['sources/selection/range_selection_helper', 'json-bignumber'],
         }
 
         allRanges.sort(firstElementNumberComparator);
-        var unionedRanges = [allRanges[0]];
+        let unionedRanges = [allRanges[0]];
 
         allRanges.forEach(function (range) {
-          var maxBeginningOfRange = _.last(unionedRanges);
+          let maxBeginningOfRange = _.last(unionedRanges);
           if (isStartInsideRange(range, maxBeginningOfRange)) {
             if (!isEndInsideRange(range, maxBeginningOfRange)) {
               maxBeginningOfRange[1] = range[1];
@@ -45,9 +45,9 @@ define(['sources/selection/range_selection_helper', 'json-bignumber'],
       },
 
       mapDimensionBoundaryUnion: function (unionedDimensionBoundaries, iteratee) {
-        var mapResult = [];
+        let mapResult = [];
         unionedDimensionBoundaries.forEach(function (subrange) {
-          for (var index = subrange[0]; index <= subrange[1]; index += 1) {
+          for (let index = subrange[0]; index <= subrange[1]; index += 1) {
             mapResult.push(iteratee(index));
           }
         });
@@ -55,11 +55,11 @@ define(['sources/selection/range_selection_helper', 'json-bignumber'],
       },
 
       mapOver2DArray: function (rowRangeBounds, colRangeBounds, processCell, rowCollector) {
-        var unionedRowRanges = this.getUnion(rowRangeBounds);
-        var unionedColRanges = this.getUnion(colRangeBounds);
+        let unionedRowRanges = this.getUnion(rowRangeBounds);
+        let unionedColRanges = this.getUnion(colRangeBounds);
 
         return this.mapDimensionBoundaryUnion(unionedRowRanges, function (rowId) {
-          var rowData = this.mapDimensionBoundaryUnion(unionedColRanges, function (colId) {
+          let rowData = this.mapDimensionBoundaryUnion(unionedColRanges, function (colId) {
             return processCell(rowId, colId);
           });
           return rowCollector(rowData);
@@ -67,7 +67,7 @@ define(['sources/selection/range_selection_helper', 'json-bignumber'],
       },
 
       getHeaderData: function (columnDefinitions, CSVOptions) {
-        var headerData = [],
+        let headerData = [],
           field_separator = CSVOptions.field_separator || '\t',
           quote_char = CSVOptions.quote_char || '"';
 
@@ -82,10 +82,10 @@ define(['sources/selection/range_selection_helper', 'json-bignumber'],
 
       rangesToCsv: function (data, columnDefinitions, selectedRanges, CSVOptions, copyWithHeader) {
 
-        var rowRangeBounds = selectedRanges.map(function (range) {
+        let rowRangeBounds = selectedRanges.map(function (range) {
           return [range.fromRow, range.toRow];
         });
-        var colRangeBounds = selectedRanges.map(function (range) {
+        let colRangeBounds = selectedRanges.map(function (range) {
           return [range.fromCell, range.toCell];
         });
 
@@ -93,13 +93,13 @@ define(['sources/selection/range_selection_helper', 'json-bignumber'],
           colRangeBounds = this.removeFirstColumn(colRangeBounds);
         }
 
-        var csvRows = this.mapOver2DArray(rowRangeBounds, colRangeBounds, this.csvCell.bind(this, data, columnDefinitions, CSVOptions), function (rowData) {
-          var field_separator = CSVOptions.field_separator || '\t';
+        let csvRows = this.mapOver2DArray(rowRangeBounds, colRangeBounds, this.csvCell.bind(this, data, columnDefinitions, CSVOptions), function (rowData) {
+          let field_separator = CSVOptions.field_separator || '\t';
           return rowData.join(field_separator);
         });
 
         if (copyWithHeader) {
-          var headerData = '';
+          let headerData = '';
           headerData = this.getHeaderData(columnDefinitions, CSVOptions);
 
           return headerData + '\n' + csvRows.join('\n');
@@ -109,13 +109,13 @@ define(['sources/selection/range_selection_helper', 'json-bignumber'],
       },
 
       removeFirstColumn: function (colRangeBounds) {
-        var unionedColRanges = this.getUnion(colRangeBounds);
+        let unionedColRanges = this.getUnion(colRangeBounds);
 
         if(unionedColRanges.length == 0) {
           return [];
         }
 
-        var firstSubrangeStartsAt0 = function () {
+        let firstSubrangeStartsAt0 = function () {
           return unionedColRanges[0][0] == 0;
         };
 
@@ -134,7 +134,7 @@ define(['sources/selection/range_selection_helper', 'json-bignumber'],
       },
 
       csvCell: function (data, columnDefinitions, CSVOptions, rowId, colId) {
-        var val = data[rowId][columnDefinitions[colId].field],
+        let val = data[rowId][columnDefinitions[colId].field],
           cell_type = columnDefinitions[colId].cell || '',
           quoting = CSVOptions.quoting || 'strings',
           quote_char = CSVOptions.quote_char || '"';

web/pgadmin/static/js/selection/set_staged_rows.js

@@ -24,11 +24,11 @@ define(
 
     function getRowPrimaryKeyValuesToStage(selectedRows, primaryKeys, dataView, client_primary_key) {
       return _.reduce(selectedRows, function (primaryKeyValuesToStage, dataGridRowIndex) {
-        var gridRow = dataView.getItem(dataGridRowIndex);
+        let gridRow = dataView.getItem(dataGridRowIndex);
         if (isRowMissingPrimaryKeys(gridRow, primaryKeys)) {
           return primaryKeyValuesToStage;
         }
-        var tempPK = gridRow[client_primary_key];
+        let tempPK = gridRow[client_primary_key];
         primaryKeyValuesToStage[tempPK] = getSingleRowPrimaryKeyValueToStage(primaryKeys, gridRow);
         return primaryKeyValuesToStage;
       }, {});
@@ -47,7 +47,7 @@ define(
     }
 
     function getSingleRowPrimaryKeyValueToStage(primaryKeys, gridRow) {
-      var rowToStage = {};
+      let rowToStage = {};
       if (primaryKeys && primaryKeys.length) {
         _.each(_.keys(gridRow), function (columnNames) {
           if (_.contains(primaryKeys, columnNames))
@@ -58,12 +58,12 @@ define(
     }
 
     function getPrimaryKeysForSelectedRows(self, selectedRows) {
-      var dataView = self.grid.getData();
+      let dataView = self.grid.getData();
       return getRowPrimaryKeyValuesToStage(selectedRows, _.keys(self.keys), dataView, self.client_primary_key);
     }
 
     return function () {
-      var self = this;
+      let self = this;
 
       function setStagedRows(rowsToStage) {
         self.editor.handler.data_store.staged_rows = rowsToStage;
@@ -81,15 +81,15 @@ define(
           self.selection.getSelectedRanges());
       }
 
-      var selectedRanges = this.selection.getSelectedRanges();
+      let selectedRanges = this.selection.getSelectedRanges();
 
       if (selectedRanges.length > 0) {
         enableButton('#btn-copy-row');
       }
 
       if (areAllSelectionsEntireRows()) {
-        var selectedRows = RangeSelectionHelper.getIndexesOfCompleteRows(this.grid, this.selection.getSelectedRanges());
-        var stagedRows = getPrimaryKeysForSelectedRows(self, selectedRows);
+        let selectedRows = RangeSelectionHelper.getIndexesOfCompleteRows(this.grid, this.selection.getSelectedRanges());
+        let stagedRows = getPrimaryKeysForSelectedRows(self, selectedRows);
         setStagedRows(stagedRows);
         if (_.isEmpty(stagedRows)) {
           this.selection.setSelectedRows([]);

web/pgadmin/static/js/tree/pgadmin_tree_save_state.js

@@ -75,11 +75,11 @@ _.extend(pgBrowser.browserTreeState, {
         type: 'DELETE',
       })
         .fail(function(jqx) {
-          var msg = jqx.responseText;
+          let msg = jqx.responseText;
           /* Error from the server */
           if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) {
             try {
-              var data = JSON.parse(jqx.responseText);
+              let data = JSON.parse(jqx.responseText);
               msg = data.errormsg;
             } catch (e) {
               console.warn(e.stack || e);
@@ -93,7 +93,7 @@ _.extend(pgBrowser.browserTreeState, {
   },
   save_state: function() {
 
-    var self = pgBrowser.browserTreeState;
+    let self = pgBrowser.browserTreeState;
     if(self.last_state == JSON.stringify(self.current_state))
       return;
 
@@ -108,11 +108,11 @@ _.extend(pgBrowser.browserTreeState, {
         self.fetch_state();
       })
       .fail(function(jqx) {
-        var msg = jqx.responseText;
+        let msg = jqx.responseText;
         /* Error from the server */
         if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) {
           try {
-            var data = JSON.parse(jqx.responseText);
+            let data = JSON.parse(jqx.responseText);
             msg = data.errormsg;
           } catch (e) {
             console.warn(e.stack || e);
@@ -125,7 +125,7 @@ _.extend(pgBrowser.browserTreeState, {
   },
   fetch_state: function() {
 
-    var self = this;
+    let self = this;
     $.ajax({
       url: url_for('settings.get_tree_state'),
       type: 'GET',
@@ -136,11 +136,11 @@ _.extend(pgBrowser.browserTreeState, {
         self.stored_state = res;
       })
       .fail(function(jqx) {
-        var msg = jqx.responseText;
+        let msg = jqx.responseText;
         /* Error from the server */
         if (jqx.status == 417 || jqx.status == 410 || jqx.status == 500) {
           try {
-            var data = JSON.parse(jqx.responseText);
+            let data = JSON.parse(jqx.responseText);
             msg = data.errormsg;
           } catch (e) {
             console.warn(e.stack || e);

web/pgadmin/static/js/url_for.js

@@ -22,10 +22,10 @@ define(['pgadmin.browser.endpoints'], function(endpoints) {
    */
   return function url_for(endpoint, substitutions) {
 
-    var rawURL = endpoints[endpoint];
+    let rawURL = endpoints[endpoint];
 
     // captures things of the form <path:substitutionName>
-    var substitutionGroupsRegExp = /([<])([^:^>]*:)?([^>]+)([>])/g,
+    let substitutionGroupsRegExp = /([<])([^:^>]*:)?([^>]+)([>])/g,
       interpolated = rawURL;
 
     if (!rawURL)

web/pgadmin/static/js/utils.js

@@ -15,10 +15,10 @@ import Notify from './helpers/Notifier';
 import { hasTrojanSource } from 'anti-trojan-source';
 import convert from 'convert-units';
 
-var wcDocker = window.wcDocker;
+let wcDocker = window.wcDocker;
 
 export function parseShortcutValue(obj) {
-  var shortcut = '';
+  let shortcut = '';
   if (obj.alt) { shortcut += 'alt+'; }
   if (obj.shift) { shortcut += 'shift+'; }
   if (obj.control) { shortcut += 'ctrl+'; }
@@ -89,7 +89,7 @@ export function findAndSetFocus(container) {
     return;
   }
   setTimeout(function() {
-    var first_el = container
+    let first_el = container
       .find('button.fa-plus:first');
 
     /* Adding the tabindex condition makes sure that
@@ -263,7 +263,7 @@ export function getRandomInt(min, max) {
   const intArray = new Uint32Array(1);
   crypto.getRandomValues(intArray);
 
-  var range = max - min + 1;
+  let range = max - min + 1;
   return min + (intArray[0] % range);
 }
 
@@ -303,7 +303,7 @@ export function CSVToArray(strData, strDelimiter, quoteChar){
   quoteChar = quoteChar || '"';
 
   // Create a regular expression to parse the CSV values.
-  var objPattern = new RegExp(
+  let objPattern = new RegExp(
     (
     // Delimiters.
       '(\\' + strDelimiter + '|\\r?\\n|\\r|^)' +
@@ -317,7 +317,7 @@ export function CSVToArray(strData, strDelimiter, quoteChar){
 
   // Create an array to hold our data. Give the array
   // a default empty first row.
-  var arrData = [[]];
+  let arrData = [[]];
 
   // The regex doesn't handle and skips start value if
   // string starts with delimiter
@@ -327,13 +327,13 @@ export function CSVToArray(strData, strDelimiter, quoteChar){
 
   // Create an array to hold our individual pattern
   // matching groups.
-  var arrMatches = null;
+  let arrMatches = null;
 
   // Keep looping over the regular expression matches
   // until we can no longer find a match.
   while ((arrMatches = objPattern.exec( strData ))){
     // Get the delimiter that was found.
-    var strMatchedDelimiter = arrMatches[ 1 ];
+    let strMatchedDelimiter = arrMatches[ 1 ];
 
     // Check to see if the given delimiter has a length
     // (is not the start of string) and if it matches
@@ -345,7 +345,7 @@ export function CSVToArray(strData, strDelimiter, quoteChar){
       arrData.push( [] );
     }
 
-    var strMatchedValue;
+    let strMatchedValue;
 
     // Now that we have our delimiter out of the way,
     // let's check to see which kind of value we
@@ -429,11 +429,11 @@ export function registerDetachEvent(panel){
     });
   });
   panel.on(wcDocker.EVENT.ORDER_CHANGED, function() {
-    var docker = this.docker(this._panel);
-    var dockerPos = docker.$container.offset();
-    var pos = this.$container.offset();
-    var width = this.$container.width();
-    var height = this.$container.height();
+    let docker = this.docker(this._panel);
+    let dockerPos = docker.$container.offset();
+    let pos = this.$container.offset();
+    let width = this.$container.width();
+    let height = this.$container.height();
 
     $((this.$container)[0].ownerDocument).find('.wcIFrameFloating').css('top', pos.top - dockerPos.top);
     $((this.$container)[0].ownerDocument).find('.wcIFrameFloating').css('left', pos.left - dockerPos.left);
@@ -446,7 +446,7 @@ export function registerDetachEvent(panel){
 }
 
 export function getBrowser() {
-  var ua=navigator.userAgent,tem,M=ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
+  let ua=navigator.userAgent,tem,M=ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
   if(/trident/i.test(M[1])) {
     tem=/\brv[ :]+(\d+)/g.exec(ua) || [];
     return {name:'IE', version:(tem[1]||'')};
@@ -536,13 +536,13 @@ export function calcFontSize(fontSize) {
 }
 
 export function pgHandleItemError(xhr, args) {
-  var pgBrowser = window.pgAdmin.Browser;
+  let pgBrowser = window.pgAdmin.Browser;
 
   if (!xhr || !pgBrowser) {
     return;
   }
 
-  var contentType = xhr.getResponseHeader('Content-Type'),
+  let contentType = xhr.getResponseHeader('Content-Type'),
     jsonResp = contentType &&
     contentType.indexOf('application/json') == 0 &&
     JSON.parse(xhr.responseText);
@@ -568,14 +568,14 @@ export function pgHandleItemError(xhr, args) {
     }
 
     // Check the status of the maintenance server connection.
-    var server = pgBrowser.Nodes['server'],
+    let server = pgBrowser.Nodes['server'],
       ctx = {
         resp: jsonResp,
         xhr: xhr,
         args: args,
       },
       reconnectServer = function() {
-        var ctx_local = this,
+        let ctx_local = this,
           onServerConnect = function(_sid, _i, _d) {
             // Yay - server is reconnected.
             if (this.args.info.server._id == _sid) {

web/pgadmin/static/js/validators.js

@@ -27,7 +27,7 @@ export function minMaxValidator(label, value, minValue, maxValue) {
 export function numberValidator(label, value) {
   if((_.isUndefined(value) || _.isNull(value) || String(value) === ''))
     return null;
-  var pattern = new RegExp('^-?[0-9]+(\.?[0-9]*)?$');
+  let pattern = new RegExp('^-?[0-9]+(\.?[0-9]*)?$');
   if (!pattern.test(value)) {
     return sprintf(pgAdmin.Browser.messages.MUST_BE_NUM, label);
   }
@@ -38,7 +38,7 @@ export function numberValidator(label, value) {
 export function integerValidator(label, value) {
   if((_.isUndefined(value) || _.isNull(value) || String(value) === ''))
     return null;
-  var pattern = new RegExp('^-?[0-9]*$');
+  let pattern = new RegExp('^-?[0-9]*$');
   if (!pattern.test(value)) {
     return sprintf(pgAdmin.Browser.messages.MUST_BE_INT, label);
   }