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 SonarQube issues.

Browse Source
This commit is contained in:
Akshay Joshi
2022-09-08 18:08:58 +05:30
parent 603ce21d24
commit 7086719640
129 changed files with 945 additions and 981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
View File

@@ -76,12 +76,12 @@ define('pgadmin.node.cast', [
return new Promise((resolve, reject)=>{
const api = getApiInstance();
var _url = pgBrowser.Nodes['cast'].generate_url.apply(
let _url = pgBrowser.Nodes['cast'].generate_url.apply(
pgBrowser.Nodes['cast'], [
null, 'get_functions', itemNodeData, false,
treeNodeInfo,
]);
var data = {'srctyp' : srcTyp, 'trgtyp' : trgtyp};
let data = {'srctyp' : srcTyp, 'trgtyp' : trgtyp};
if(srcTyp != undefined && srcTyp != '' &&
trgtyp != undefined && trgtyp != ''){

4
web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.ui.js
View File

@@ -30,8 +30,8 @@ export default class CastSchema extends BaseUISchema {
}
getCastName(state) {
var srctype = state.srctyp;
var trgtype = state.trgtyp;
let srctype = state.srctyp;
let trgtype = state.trgtyp;
if(srctype != undefined && srctype != '' &&
trgtype != undefined && trgtype != '')
return state.name = srctype+'->'+trgtype;

8
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.js
View File

@@ -96,10 +96,10 @@ define('pgadmin.node.user_mapping', [
// Default values!
initialize: function(attrs, args) {
var isNew = (_.size(attrs) === 0);
let isNew = (_.size(attrs) === 0);
if (isNew) {
var userInfo = pgBrowser.serverInfo[args.node_info.server._id].user;
let userInfo = pgBrowser.serverInfo[args.node_info.server._id].user;
this.set({'name': userInfo.name}, {silent: true});
}
@@ -114,9 +114,9 @@ define('pgadmin.node.user_mapping', [
mode: ['edit', 'create', 'properties'], select2: { allowClear: false },
disabled: function(m) { return !m.isNew(); },
transform: function() {
var self = this,
let self = this,
node = self.field.get('schema_node');
var res =
let res =
Backform.NodeListByNameControl.prototype.defaults.transform.apply(
this, arguments
);

4
web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.ui.js
View File

@@ -83,7 +83,7 @@ export default class PublicationSchema extends BaseUISchema {
}
isAllTable(state) {
var allTable = state.all_table;
let allTable = state.all_table;
if(allTable){
state.pubtable = '';
return true;
@@ -92,7 +92,7 @@ export default class PublicationSchema extends BaseUISchema {
}
isTable(state) {
var allTable = state.all_table,
let allTable = state.all_table,
table = state.pubtable;
if(allTable){
state.only_table = false;

4
web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.ui.js
View File

@@ -135,7 +135,7 @@ export default class DomainSchema extends BaseUISchema {
readonly: function(state) {return !obj.isNew(state);},
disabled: function(state) {
// We will store type from selected from combobox
var of_type = state.basetype;
let of_type = state.basetype;
if(obj.type_options) {
// iterating over all the types
_.each(obj.type_options, function(o) {
@@ -167,7 +167,7 @@ export default class DomainSchema extends BaseUISchema {
readonly: function(state) {return !obj.isNew(state);},
disabled: function(state) {
// We will store type from selected from combobox
var of_type = state.basetype;
let of_type = state.basetype;
if(obj.type_options) {
// iterating over all the types
_.each(obj.type_options, function(o) {

12
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/__init__.py
View File

@@ -637,10 +637,6 @@ class ForeignTableView(PGChildNodeView, DataTypeReader,
except Exception:
exc_type, exc_value, exc_traceback = sys.exc_info()
current_app.logger.error(
traceback.print_exception(exc_type,
exc_value, exc_traceback, limit=2))
return internal_server_error(errormsg=str(exc_value))
@check_precondition
@@ -680,14 +676,6 @@ class ForeignTableView(PGChildNodeView, DataTypeReader,
)
except Exception:
exc_type, exc_value, exc_traceback = sys.exc_info()
current_app.logger.error(traceback.print_exception(
exc_type,
exc_value,
exc_traceback,
limit=2
)
)
return internal_server_error(errormsg=str(exc_value))
@check_precondition

10
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.ui.js
View File

@@ -116,7 +116,7 @@ export default class ForeignTableSchema extends BaseUISchema {
let newColInherits = state.inherits || [];
let oldColInherits = actionObj.oldState.inherits || [];
var tabName = undefined;
let tabName = undefined;
let tabColsResponse;
// Add columns logic
@@ -328,7 +328,7 @@ export class ColumnSchema extends BaseUISchema {
id: 'typlen', label: gettext('Length'), cell: 'int',
deps: ['datatype'], type: 'int', group: gettext('Definition'), width: 120, minWidth: 120,
disabled: (state) => {
var val = state.typlen;
let val = state.typlen;
// We will store type from selected from combobox
if(!(_.isUndefined(state.inheritedid)
|| _.isNull(state.inheritedid)
@@ -341,7 +341,7 @@ export class ColumnSchema extends BaseUISchema {
return true;
}
var of_type = state.datatype,
let of_type = state.datatype,
has_length = false;
if(obj.type_options) {
state.is_tlength = false;
@@ -378,7 +378,7 @@ export class ColumnSchema extends BaseUISchema {
id: 'precision', label: gettext('Precision'), cell: 'int', minWidth: 60,
deps: ['datatype'], type: 'int', group: gettext('Definition'),
disabled: (state) => {
var val = state.precision;
let val = state.precision;
if(!(_.isUndefined(state.inheritedid)
|| _.isNull(state.inheritedid)
|| _.isUndefined(state.inheritedfrom)
@@ -390,7 +390,7 @@ export class ColumnSchema extends BaseUISchema {
return true;
}
var of_type = state.datatype,
let of_type = state.datatype,
has_precision = false;
if(obj.type_options) {

4
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.ui.js
View File

@@ -131,7 +131,7 @@ export default class FTSConfigurationSchema extends BaseUISchema {
options: this.fieldOptions.parsers,
//disable parser when user select copy_config manually and vica-versa
disabled: function(state) {
var copy_config = state.copy_config;
let copy_config = state.copy_config;
return (_.isNull(copy_config) ||
_.isUndefined(copy_config) ||
copy_config === '') ? false : true;
@@ -144,7 +144,7 @@ export default class FTSConfigurationSchema extends BaseUISchema {
options: this.fieldOptions.copyConfig,
//disable copy_config when user select parser manually and vica-versa
disabled: function(state) {
var parser = state.prsname;
let parser = state.prsname;
return (_.isNull(parser) ||
_.isUndefined(parser) ||
parser === '') ? false : true;

8
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
View File

@@ -786,14 +786,6 @@ class FunctionView(PGChildNodeView, DataTypeReader, SchemaDiffObjectCompare):
)
except Exception:
exc_type, exc_value, exc_traceback = sys.exc_info()
current_app.logger.error(traceback.print_exception(
exc_type,
exc_value,
exc_traceback,
limit=2
)
)
return internal_server_error(errormsg=str(exc_value))
@check_precondition

4
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
View File

@@ -71,14 +71,14 @@ export class DefaultArgumentSchema extends BaseUISchema {
}
isEditable() {
var node_info = this.node_info;
let node_info = this.node_info;
if(node_info && 'catalog' in node_info) {
return false;
}
return _.isUndefined(this.isNew) ? true : this.isNew();
}
isInCatalog(state){
var node_info = this.node_info;
let node_info = this.node_info;
if(node_info && 'catalog' in node_info) {
return false;
}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/procedure.js
View File

@@ -77,7 +77,7 @@ define('pgadmin.node.procedure', [
]);
},
canCreateProc: function(itemData, item) {
var node_hierarchy = pgBrowser.tree.getTreeNodeHierarchy(item);
let node_hierarchy = pgBrowser.tree.getTreeNodeHierarchy(item);
// Do not provide Create option in catalog
if ('catalog' in node_hierarchy)

4
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.js
View File

@@ -78,7 +78,7 @@ define('pgadmin.node.package', [
if (data && data.check == false)
return true;
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
server = treeData['server'];
if (server && server.server_type === 'pg')
@@ -92,7 +92,7 @@ define('pgadmin.node.package', [
return true;
},
getSchema: (treeNodeInfo, itemNodeData) => {
var nodeObj = pgBrowser.Nodes['package'];
let nodeObj = pgBrowser.Nodes['package'];
return new PackageSchema(
(privileges)=>getNodePrivilegeRoleSchema(nodeObj, treeNodeInfo, itemNodeData, privileges),
{

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.ui.js
View File

@@ -241,7 +241,7 @@ export default class SequenceSchema extends BaseUISchema {
}
}
var min_lt = gettext('Minimum value must be less than maximum value.'),
let min_lt = gettext('Minimum value must be less than maximum value.'),
start_lt = gettext('Start value cannot be less than minimum value.'),
start_gt = gettext('Start value cannot be greater than maximum value.');

18
web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.js
View File

@@ -26,12 +26,12 @@ define('pgadmin.node.schema', [
initialize: function() {
Backform.Control.prototype.initialize.apply(this, arguments);
var self = this,
let self = this,
m = this.model,
url = self.field.get('url');
if (url && m.isNew()) {
var node = self.field.get('node'),
let node = self.field.get('node'),
node_data = self.field.get('node_data'),
node_info = self.field.get('node_info'),
full_url = node.generate_url.apply(
@@ -79,7 +79,7 @@ define('pgadmin.node.schema', [
},
render: function() {
var self = this,
let self = this,
attributes = self.field.attributes;
// remove grid
@@ -91,7 +91,7 @@ define('pgadmin.node.schema', [
self.$el.empty();
var gridHeader = _.template([
let gridHeader = _.template([
'<div class="subnode-header">',
'<% if (label && label != "") %> {',
' <span class="control-label col-sm-4"><%-label%></span>',
@@ -102,7 +102,7 @@ define('pgadmin.node.schema', [
);
// Initialize a new Grid instance
var grid = self.grid = new Backgrid.Grid({
let grid = self.grid = new Backgrid.Grid({
columns: self.grid_columns,
collection: self.model.get(self.field.get('name')),
className: 'backgrid table table-bordered table-noouter-border table-hover',
@@ -119,7 +119,7 @@ define('pgadmin.node.schema', [
// We will use this function in VacuumSettings Control
// to convert data type on the fly
Backform.cellFunction = function(model) {
var vartype = model.get('column_type');
let vartype = model.get('column_type');
switch(vartype) {
case 'integer':
@@ -146,7 +146,7 @@ define('pgadmin.node.schema', [
},
toJSON: function(){
var d = pgBrowser.Node.Model.prototype.toJSON.apply(this);
let d = pgBrowser.Node.Model.prototype.toJSON.apply(this);
delete d.label;
delete d.setting;
delete d.column_type;
@@ -363,7 +363,7 @@ define('pgadmin.node.schema', [
return pgBrowser.Nodes['database'].is_conn_allow.call(this, node);
},
getSchema: function(treeNodeInfo, itemNodeData) {
var schemaObj = pgBrowser.Nodes['schema'];
let schemaObj = pgBrowser.Nodes['schema'];
return new PGSchema(
(privileges)=>getNodePrivilegeRoleSchema(schemaObj, treeNodeInfo, itemNodeData, privileges),
{
@@ -393,7 +393,7 @@ define('pgadmin.node.schema', [
Backgrid.Extension.DependentCell.prototype.initialize.apply(this, arguments);
},
dependentChanged: function () {
var model = this.model,
let model = this.model,
column = this.column,
editable = this.column.get('editable'),
input = this.$el.find('input[type=checkbox]').first(),

2
web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.ui.js
View File

@@ -94,7 +94,7 @@ export default class PGSchema extends BaseUISchema {
}
validate(state, setError) {
var errmsg = null;
let errmsg = null;
// Validation of mandatory fields
if (isEmptyString(state.name)) {

4
web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
View File

@@ -83,7 +83,7 @@ define('pgadmin.node.synonym', [
}),
synobjschema: ()=>getNodeListByName('schema', treeNodeInfo, itemNodeData, {}, (m)=>{
// Exclude PPAS catalogs
var exclude_catalogs = ['pg_catalog', 'sys', 'dbo', 'pgagent', 'information_schema', 'dbms_job_procedure'];
let exclude_catalogs = ['pg_catalog', 'sys', 'dbo', 'pgagent', 'information_schema', 'dbms_job_procedure'];
return m && _.indexOf(exclude_catalogs, m.label) == -1;
}),
getTargetObjectOptions: (targettype, synobjschema) =>
@@ -105,7 +105,7 @@ define('pgadmin.node.synonym', [
if (data && data.check == false)
return true;
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
server = treeData['server'];
if (server && server.server_type === 'pg')

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js
View File

@@ -103,7 +103,7 @@ define('pgadmin.node.column', [
if (data && data.check == false)
return true;
var t = pgBrowser.tree, i = item, d = itemData, parents = [];
let t = pgBrowser.tree, i = item, d = itemData, parents = [];
// To iterate over tree to check parent node
while (i) {
// If it is schema then allow user to create table

10
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.ui.js
View File

@@ -198,7 +198,7 @@ export default class ColumnSchema extends BaseUISchema {
return true;
}
var name = state.name;
let name = state.name;
if(!obj.inSchemaWithColumnCheck(state)
&& (_.isUndefined(name) || _.isNull(name) || name == '')) {
@@ -387,11 +387,11 @@ export default class ColumnSchema extends BaseUISchema {
type: 'text', group: gettext('Constraints'), deps: ['cltype', 'colconstype'],
readonly: obj.inSchemaWithColumnCheck,
disabled: function(state) {
var isDisabled = ['serial', 'bigserial', 'smallserial'].indexOf(state.cltype) > -1;
let isDisabled = ['serial', 'bigserial', 'smallserial'].indexOf(state.cltype) > -1;
isDisabled = isDisabled || state.colconstype != 'n';
return isDisabled;
}, depChange: (state)=>{
var isDisabled = false;
let isDisabled = false;
if(!obj.inSchemaWithModelCheck(state)) {
isDisabled = ['serial', 'bigserial', 'smallserial'].indexOf(state.cltype) > -1;
}
@@ -424,7 +424,7 @@ export default class ColumnSchema extends BaseUISchema {
cell: 'text',
group: gettext('Constraints'),
type: (state)=>{
var options = [
let options = [
{'label': gettext('NONE'), 'value': 'n'},
{'label': gettext('IDENTITY'), 'value': 'i'},
];
@@ -559,7 +559,7 @@ export default class ColumnSchema extends BaseUISchema {
}
validate(state, setError) {
var msg = undefined;
let msg = undefined;
if (!_.isUndefined(state.cltype) && !isEmptyString(state.attlen)) {
// Validation for Length field

14
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.js
View File

@@ -102,7 +102,7 @@ define('pgadmin.node.compound_trigger', [
callbacks: {
/* Enable compound trigger */
enable_compound_trigger: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -111,7 +111,7 @@ define('pgadmin.node.compound_trigger', [
if (!d)
return false;
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'enable' , d, true),
type:'PUT',
@@ -140,7 +140,7 @@ define('pgadmin.node.compound_trigger', [
},
/* Disable compound trigger */
disable_compound_trigger: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -149,7 +149,7 @@ define('pgadmin.node.compound_trigger', [
if (!d)
return false;
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'enable' , d, true),
type:'PUT',
@@ -194,7 +194,7 @@ define('pgadmin.node.compound_trigger', [
if (data && data.check == false)
return true;
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
server = treeData['server'];
if (server && (server.server_type === 'pg' || server.version < 120000))
@@ -209,7 +209,7 @@ define('pgadmin.node.compound_trigger', [
},
// Check to whether trigger is disable ?
canCreate_with_compound_trigger_enable: function(itemData, item, data) {
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
if ('view' in treeData) {
return false;
}
@@ -219,7 +219,7 @@ define('pgadmin.node.compound_trigger', [
},
// Check to whether trigger is enable ?
canCreate_with_compound_trigger_disable: function(itemData, item, data) {
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
if ('view' in treeData) {
return false;
}

10
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.ui.js
View File

@@ -31,7 +31,7 @@ export class ForEventsSchema extends BaseUISchema {
id: 'evnt_insert', label: gettext('INSERT'),
type: 'switch',
readonly: function(state) {
var evn_insert = state.evnt_insert;
let evn_insert = state.evnt_insert;
if (!_.isUndefined(evn_insert) && obj.nodeInfo.server.server_type == 'ppas')
return false;
return obj.inCatalog();
@@ -40,7 +40,7 @@ export class ForEventsSchema extends BaseUISchema {
id: 'evnt_update', label: gettext('UPDATE'),
type: 'switch',
readonly: function(state) {
var evn_update = state.evnt_update;
let evn_update = state.evnt_update;
if (!_.isUndefined(evn_update) && obj.nodeInfo.server.server_type == 'ppas')
return false;
return obj.inCatalog();
@@ -49,7 +49,7 @@ export class ForEventsSchema extends BaseUISchema {
id: 'evnt_delete', label: gettext('DELETE'),
type: 'switch',
readonly: function(state) {
var evn_delete = state.evnt_delete;
let evn_delete = state.evnt_delete;
if (!_.isUndefined(evn_delete) && obj.nodeInfo.server.server_type == 'ppas')
return false;
return obj.inCatalog();
@@ -58,7 +58,7 @@ export class ForEventsSchema extends BaseUISchema {
id: 'evnt_truncate', label: gettext('TRUNCATE'),
type: 'switch',
readonly: function(state) {
var evn_truncate = state.evnt_truncate;
let evn_truncate = state.evnt_truncate;
// Views cannot have TRUNCATE triggers.
if ('view' in obj.nodeInfo)
return true;
@@ -127,7 +127,7 @@ export default class CompoundTriggerSchema extends BaseUISchema {
return true;
}
// Enable column only if update event is set true
var isUpdate = state.evnt_update;
let isUpdate = state.evnt_update;
if(!_.isUndefined(isUpdate) && isUpdate) {
return false;
}

6
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js
View File

@@ -62,14 +62,14 @@ define('pgadmin.node.check_constraint', [
},
callbacks: {
validate_check_constraint: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
d = i ? t.itemData(i) : undefined;
if (d) {
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'validate', d, true),
type:'GET',
@@ -103,7 +103,7 @@ define('pgadmin.node.check_constraint', [
if (data && data.check == false)
return true;
var t = pgBrowser.tree, i = item, d = itemData, parents = [];
let t = pgBrowser.tree, i = item, d = itemData, parents = [];
// To iterate over tree to check parent node
while (i) {
// If it is schema then allow user to c reate table

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js
View File

@@ -61,7 +61,7 @@ define('pgadmin.node.exclusion_constraint', [
if (data && data.check == false)
return true;
var t = pgBrowser.tree, i = item, d = itemData, parents = [],
let t = pgBrowser.tree, i = item, d = itemData, parents = [],
immediate_parent_table_found = false,
is_immediate_parent_table_partitioned = false;
// To iterate over tree to check parent node

6
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
View File

@@ -58,14 +58,14 @@ define('pgadmin.node.foreign_key', [
},
callbacks: {
validate_foreign_key: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
d = i ? t.itemData(i) : undefined;
if (d) {
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'validate', d, true),
type:'GET',
@@ -97,7 +97,7 @@ define('pgadmin.node.foreign_key', [
if (data && data.check == false)
return true;
var t = pgBrowser.tree, i = item, d = itemData, parents = [],
let t = pgBrowser.tree, i = item, d = itemData, parents = [],
immediate_parent_table_found = false,
is_immediate_parent_table_partitioned = false,
s_version = t.getTreeNodeHierarchy(i).server.version;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.ui.js
View File

@@ -325,7 +325,7 @@ export default class ForeignKeySchema extends BaseUISchema {
controlProps: {
formatter: {
fromRaw: (rawValue)=>{
var cols = [],
let cols = [],
remoteCols = [];
if (rawValue?.length > 0) {
rawValue.forEach((col)=>{

64
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.js
View File

@@ -56,7 +56,7 @@ define('pgadmin.node.primary_key', [
if (data && data.check == false)
return true;
var t = pgBrowser.tree, i = item, d = itemData, parents = [],
let t = pgBrowser.tree, i = item, d = itemData, parents = [],
immediate_parent_table_found = false,
is_immediate_parent_table_partitioned = false,
s_version = t.getTreeNodeHierarchy(i).server.version;
@@ -78,7 +78,7 @@ define('pgadmin.node.primary_key', [
}
// There should be only one primary key per table.
var children = t.children(arguments[1], false),
let children = t.children(arguments[1], false),
primary_key_found = false;
_.each(children, function(child){
@@ -128,7 +128,7 @@ define('pgadmin.node.primary_key', [
},
genResetColOptions: function() {
var self = this;
let self = this;
setTimeout(function () {
self.custom_options();
@@ -138,12 +138,12 @@ define('pgadmin.node.primary_key', [
genCustomOptions: function() {
// We will add all the columns entered by user in table model
var columns = this.model.top.get('columns'),
let columns = this.model.top.get('columns'),
added_columns_from_tables = [];
if (columns.length > 0) {
_.each(columns.models, function(m) {
var col = m.get('name');
let col = m.get('name');
if(!_.isUndefined(col) && !_.isNull(col)) {
added_columns_from_tables.push(
{label: col, value: col, image:'icon-column'}
@@ -186,7 +186,7 @@ define('pgadmin.node.primary_key', [
id: 'comment', label: gettext('Comment'), cell: 'string',
type: 'multiline', mode: ['properties', 'create', 'edit'],
deps:['name'], disabled:function(m) {
var name = m.get('name');
let name = m.get('name');
if (!(name && name != '')) {
setTimeout(function(){
if(m.get('comment') && m.get('comment') !== '') {
@@ -206,12 +206,12 @@ define('pgadmin.node.primary_key', [
initialize: function() {
Backgrid.StringCell.prototype.initialize.apply(this, arguments);
var self = this,
let self = this,
collection = this.model.get('columns');
// Do not listen for any event(s) for existing constraint.
if (_.isUndefined(self.model.get('oid'))) {
var tableCols = self.model.top.get('columns');
let tableCols = self.model.top.get('columns');
self.listenTo(tableCols, 'remove' , self.removeColumn);
self.listenTo(tableCols, 'change:name', self.resetColOptions);
}
@@ -223,7 +223,7 @@ define('pgadmin.node.primary_key', [
self.listenTo(collection, 'remove', self.render);
},
removeColumn: function(m) {
var self = this,
let self = this,
removedCols = self.model.get('columns').where(
{column: m.get('name')}
);
@@ -233,9 +233,9 @@ define('pgadmin.node.primary_key', [
self.render();
}, 10);
var key = 'primary_key';
let key = 'primary_key';
setTimeout(function () {
var constraints = self.model.top.get(key),
let constraints = self.model.top.get(key),
removed = [];
constraints.each(function(constraint) {
if (constraint.get('columns').length == 0) {
@@ -247,7 +247,7 @@ define('pgadmin.node.primary_key', [
},
resetColOptions : function(m) {
var self = this,
let self = this,
updatedCols = self.model.get('columns').where(
{column: m.previous('name')}
);
@@ -275,7 +275,7 @@ define('pgadmin.node.primary_key', [
return Backgrid.StringCell.prototype.render.apply(this, arguments);
},
remove: function() {
var tableCols = this.model.top.get('columns'),
let tableCols = this.model.top.get('columns'),
primary_key_col = this.model.get('columns');
if (primary_key_col) {
@@ -303,7 +303,7 @@ define('pgadmin.node.primary_key', [
}
),
keyPathAccessor: function(obj, path) {
var res = obj;
let res = obj;
if(_.isArray(res)) {
return _.map(res, function(o) { return o['column'];
});
@@ -319,12 +319,12 @@ define('pgadmin.node.primary_key', [
initialize: function() {
// Here we will decide if we need to call URL
// Or fetch the data from parent columns collection
var self = this;
let self = this;
if(this.model.handler) {
Backform.Select2Control.prototype.initialize.apply(this, arguments);
// Do not listen for any event(s) for existing constraint.
if (_.isUndefined(self.model.get('oid'))) {
var tableCols = self.model.top.get('columns');
let tableCols = self.model.top.get('columns');
self.listenTo(tableCols, 'remove' , self.resetColOptions);
self.listenTo(tableCols, 'change:name', self.resetColOptions);
}
@@ -344,7 +344,7 @@ define('pgadmin.node.primary_key', [
this.genCustomOptions();
},
onChange: function() {
var self = this,
let self = this,
model = this.model,
attrArr = this.field.get('name').split('.'),
name = attrArr.shift(),
@@ -359,7 +359,7 @@ define('pgadmin.node.primary_key', [
* present in the collection.
*/
collection.each(function(m) {
var column = m.get('column'),
let column = m.get('column'),
idx = _.indexOf(vals, column);
if (idx > -1) {
@@ -374,7 +374,7 @@ define('pgadmin.node.primary_key', [
*/
_.each(vals, function(v) {
var m = new (self.field.get('model'))(
let m = new (self.field.get('model'))(
{column: v}, { silent: true,
top: self.model.top,
collection: collection,
@@ -395,7 +395,7 @@ define('pgadmin.node.primary_key', [
},
remove: function() {
if(this.model.handler) {
var self = this,
let self = this,
tableCols = self.model.top.get('columns');
self.stopListening(tableCols, 'remove' , self.resetColOptions);
self.stopListening(tableCols, 'change:name' , self.resetColOptions);
@@ -408,9 +408,9 @@ define('pgadmin.node.primary_key', [
}
},
render: function() {
var index = this.model.get('index');
let index = this.model.get('index');
if(!_.isUndefined(index) && index != '') {
var col = this.model.get('columns');
let col = this.model.get('columns');
col.reset([], {silent: true});
}
return Backform.Select2Control.prototype.render.apply(this, arguments);
@@ -426,7 +426,7 @@ define('pgadmin.node.primary_key', [
},
}),
transform : function(data){
var res = [];
let res = [];
if (data && _.isArray(data)) {
_.each(data, function(d) {
res.push({label: d.label, value: d.label, image:'icon-column'});
@@ -440,7 +440,7 @@ define('pgadmin.node.primary_key', [
},
disabled: function(m) {
// Disable if index is selected.
var index = m.get('index');
let index = m.get('index');
return !(_.isUndefined(index) || index == '');
},
},{
@@ -474,12 +474,12 @@ define('pgadmin.node.primary_key', [
initialize: function() {
// Here we will decide if we need to call URL
// Or fetch the data from parent columns collection
var self = this;
let self = this;
if(this.model.handler) {
Backform.Select2Control.prototype.initialize.apply(this, arguments);
// Do not listen for any event(s) for existing constraint.
if (_.isUndefined(self.model.get('oid'))) {
var tableCols = self.model.top.get('columns');
let tableCols = self.model.top.get('columns');
self.listenTo(tableCols, 'remove' , self.resetColOptions);
self.listenTo(tableCols, 'change:name', self.resetColOptions);
}
@@ -502,7 +502,7 @@ define('pgadmin.node.primary_key', [
},
disabled: function(m) {
// Disable if index is selected.
var index = m.get('index');
let index = m.get('index');
if(_.isUndefined(index) || index == '') {
return false;
} else {
@@ -525,7 +525,7 @@ define('pgadmin.node.primary_key', [
disabled: function(m) {
// Disable if index is selected.
m = m.top || m;
var index = m.get('index');
let index = m.get('index');
if(_.isUndefined(index) || index == '') {
return false;
} else {
@@ -564,7 +564,7 @@ define('pgadmin.node.primary_key', [
type: 'int', group: gettext('Definition'), allowNull: true,
disabled: function(m) {
// Disable if index is selected.
var index = m.get('index');
let index = m.get('index');
if(_.isUndefined(index) || index == '') {
return false;
} else {
@@ -582,7 +582,7 @@ define('pgadmin.node.primary_key', [
},
disabled: function(m) {
// Disable if index is selected.
var index = m.get('index');
let index = m.get('index');
if(_.isUndefined(index) || index == '') {
return false;
} else {
@@ -621,12 +621,12 @@ define('pgadmin.node.primary_key', [
this.top.errorModel.clear();
}
var columns = this.get('columns'),
let columns = this.get('columns'),
index = this.get('index');
if ((_.isUndefined(index) || String(index).replace(/^\s+|\s+$/g, '') == '') &&
(_.isUndefined(columns) || _.isNull(columns) || columns.length < 1)) {
var msg = gettext('Please specify columns for %s.', gettext('Primary key'));
let msg = gettext('Please specify columns for %s.', gettext('Primary key'));
this.errorModel.set('columns', msg);
return msg;
}

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js
View File

@@ -55,7 +55,7 @@ define('pgadmin.node.unique_constraint', [
if (data && data.check == false)
return true;
var t = pgBrowser.tree, i = item, d = itemData, parents = [],
let t = pgBrowser.tree, i = item, d = itemData, parents = [],
immediate_parent_table_found = false,
is_immediate_parent_table_partitioned = false,
s_version = pgBrowser.tree.getTreeNodeHierarchy(i).server.version;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js
View File

@@ -97,7 +97,7 @@ define('pgadmin.node.index', [
if (data && data.check == false)
return true;
var t = pgBrowser.tree, i = item, d = itemData, parents = [],
let t = pgBrowser.tree, i = item, d = itemData, parents = [],
immediate_parent_table_found = false,
is_immediate_parent_table_partitioned = false,
s_version = t.getTreeNodeHierarchy(i).server.version;

6
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.ui.js
View File

@@ -126,7 +126,7 @@ export class ColumnSchema extends BaseUISchema {
* to access method selected by user if not selected
* send btree related op_class options
*/
var amname = columnSchemaObj._top?._sessData ? columnSchemaObj._top?._sessData.amname : columnSchemaObj._top?._origData.amname;
let amname = columnSchemaObj._top?._sessData ? columnSchemaObj._top?._sessData.amname : columnSchemaObj._top?._origData.amname;
if(_.isUndefined(amname))
return options;
@@ -442,10 +442,10 @@ export default class IndexSchema extends BaseUISchema {
}
validate(state, setError) {
var msg;
let msg;
// Checks if columns is empty
var cols = state.columns;
let cols = state.columns;
if(_.isArray(cols) && cols.length == 0){
msg = gettext('You must specify at least one column.');
setError('columns', msg);

22
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
View File

@@ -147,18 +147,18 @@ function(
callbacks: {
/* Enable trigger(s) on table */
enable_triggers_on_table: function(args) {
var params = {'is_enable_trigger': 'O'};
let params = {'is_enable_trigger': 'O'};
this.callbacks.set_triggers.apply(this, [args, params]);
},
/* Disable trigger(s) on table */
disable_triggers_on_table: function(args) {
var params = {'is_enable_trigger': 'D'};
let params = {'is_enable_trigger': 'D'};
this.callbacks.set_triggers.apply(this, [args, params]);
},
set_triggers: function(args, params) {
// This function will send request to enable or
// disable triggers on table level
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -191,16 +191,16 @@ function(
},
/* Truncate table */
truncate_table: function(args) {
var params = {'cascade': false };
let params = {'cascade': false };
this.callbacks.truncate.apply(this, [args, params]);
},
/* Truncate table with cascade */
truncate_table_cascade: function(args) {
var params = {'cascade': true };
let params = {'cascade': true };
this.callbacks.truncate.apply(this, [args, params]);
},
truncate: function(args, params) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -213,7 +213,7 @@ function(
gettext('Truncate Table'),
gettext('Are you sure you want to truncate table %s?', d.label),
function () {
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'truncate' , d, true),
type:'PUT',
@@ -231,7 +231,7 @@ function(
);
},
reset_table_stats: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -244,7 +244,7 @@ function(
gettext('Reset statistics'),
gettext('Are you sure you want to reset the statistics for table "%s"?', d._label),
function () {
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'reset' , d, true),
type:'DELETE',
@@ -261,7 +261,7 @@ function(
);
},
detach_partition: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -281,7 +281,7 @@ function(
.done(function(res) {
if (res.success == 1) {
Notify.success(res.info);
var n = t.next(i);
let n = t.next(i);
if (!n) {
n = t.prev(i);
if (!n) {

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js
View File

@@ -281,7 +281,7 @@ export default class PartitionTableSchema extends BaseUISchema {
editable: false, type: 'select', controlProps: {allowClear: false},
group: 'partition', deps: ['is_partitioned'],
options: function() {
var options = [{
let options = [{
label: gettext('Range'), value: 'range',
},{
label: gettext('List'), value: 'list',
@@ -318,7 +318,7 @@ export default class PartitionTableSchema extends BaseUISchema {
canAddRow: function(state) {
let columnsExist = false;
var maxRowCount = 1000;
let maxRowCount = 1000;
if (state.partition_type && state.partition_type == 'list')
maxRowCount = 1;

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.js
View File

@@ -88,7 +88,7 @@ define('pgadmin.node.row_security_policy', [
},
canCreate: function(itemData, item) {
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
server = treeData['server'];
// If node is under catalog then do not allow 'create' menu

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.ui.js
View File

@@ -47,7 +47,7 @@ export default class RowSecurityPolicySchema extends BaseUISchema {
}
disableWithCheckField(state){
var event = state.event;
let event = state.event;
if ((event == 'SELECT') || (event == 'DELETE')){
state.withcheck = '';
return true;

22
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js
View File

@@ -129,7 +129,7 @@ define('pgadmin.node.rule', [
callbacks: {
/* Enable rule */
enable_rule: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -138,7 +138,7 @@ define('pgadmin.node.rule', [
if (!d)
return false;
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'obj' , d, true),
type:'PUT',
@@ -165,7 +165,7 @@ define('pgadmin.node.rule', [
},
/* Disable rule */
disable_rule: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -174,7 +174,7 @@ define('pgadmin.node.rule', [
if (!d)
return false;
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'obj' , d, true),
type:'PUT',
@@ -216,7 +216,7 @@ define('pgadmin.node.rule', [
if (data && data.check === false)
return true;
var t = pgBrowser.tree, i = item, d = itemData;
let t = pgBrowser.tree, i = item, d = itemData;
// To iterate over tree to check parent node
while (i) {
@@ -228,7 +228,7 @@ define('pgadmin.node.rule', [
if ('coll-rule' == d._type) {
//Check if we are not child of rule
var prev_i = t.hasParent(i) ? t.parent(i) : null,
let prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_j = t.hasParent(prev_i) ? t.parent(prev_i) : null,
prev_k = t.hasParent(prev_j) ? t.parent(prev_j) : null,
prev_f = prev_k ? t.itemData(prev_k) : null;
@@ -240,9 +240,9 @@ define('pgadmin.node.rule', [
then allow to create Rule
*/
else if('view' == d._type || 'table' == d._type){
prev_i = t.hasParent(i) ? t.parent(i) : null;
prev_j = t.hasParent(prev_i) ? t.parent(prev_i) : null;
var prev_e = prev_j ? t.itemData(prev_j) : null;
let prev_i = t.hasParent(i) ? t.parent(i) : null,
prev_j = t.hasParent(prev_i) ? t.parent(prev_i) : null,
prev_e = prev_j ? t.itemData(prev_j) : null;
return (!_.isNull(prev_e) && prev_e._type == 'schema');
}
i = t.hasParent(i) ? t.parent(i) : null;
@@ -255,7 +255,7 @@ define('pgadmin.node.rule', [
},
canCreate_with_rule_enable: function(itemData, item, data) {
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
if ('view' in treeData) {
return false;
}
@@ -265,7 +265,7 @@ define('pgadmin.node.rule', [
},
// Check to whether rule is enable ?
canCreate_with_rule_disable: function(itemData, item, data) {
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
if ('view' in treeData) {
return false;
}

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.ui.js
View File

@@ -314,7 +314,7 @@ export class PartitionsSchema extends BaseUISchema {
editable: false, type: 'select', controlProps: {allowClear: false},
group: 'Partition', deps: ['is_sub_partitioned'],
options: function() {
var options = [{
let options = [{
label: gettext('Range'), value: 'range',
},{
label: gettext('List'), value: 'list',
@@ -346,7 +346,7 @@ export class PartitionsSchema extends BaseUISchema {
let columnsExist = false;
let columns = obj.top.sessData.columns;
var maxRowCount = 1000;
let maxRowCount = 1000;
if (state.sub_partition_type && state.sub_partition_type == 'list')
maxRowCount = 1;

30
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
View File

@@ -156,20 +156,20 @@ define('pgadmin.node.table', [
},
/* Truncate table */
truncate_table: function(args) {
var params = {'cascade': false };
let params = {'cascade': false };
this.callbacks.truncate.apply(this, [args, params]);
},
/* Truncate table with cascade */
truncate_table_cascade: function(args) {
var params = {'cascade': true };
let params = {'cascade': true };
this.callbacks.truncate.apply(this, [args, params]);
},
truncate_table_identity: function(args) {
var params = {'identity': true };
let params = {'identity': true };
this.callbacks.truncate.apply(this, [args, params]);
},
truncate: function(args, params) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -182,7 +182,7 @@ define('pgadmin.node.table', [
gettext('Truncate Table'),
gettext('Are you sure you want to truncate table %s?', d.label),
function () {
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'truncate' , d, true),
type:'PUT',
@@ -215,7 +215,7 @@ define('pgadmin.node.table', [
);
},
reset_table_stats: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -228,7 +228,7 @@ define('pgadmin.node.table', [
gettext('Reset statistics'),
gettext('Are you sure you want to reset the statistics for table "%s"?', d._label),
function () {
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'reset' , d, true),
type:'DELETE',
@@ -257,7 +257,7 @@ define('pgadmin.node.table', [
);
},
count_table_rows: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -354,18 +354,18 @@ define('pgadmin.node.table', [
this.canCreate.apply(this, [itemData, item, data]);
},
onTableUpdated: function(_node, _oldNodeData, _newNodeData) {
var key, childIDs;
let key, childIDs;
if (
_newNodeData.is_partitioned &&
'affected_partitions' in _newNodeData
) {
var partitions = _newNodeData.affected_partitions,
let partitions = _newNodeData.affected_partitions,
newPartitionsIDs = [],
insertChildTreeNodes = [],
insertChildrenNodes = function() {
if (!insertChildTreeNodes.length)
return;
var option = insertChildTreeNodes.pop();
let option = insertChildTreeNodes.pop();
pgBrowser.addChildTreeNodes(
option.treeHierarchy, option.parent, option.type,
option.childrenIDs, insertChildrenNodes
@@ -383,7 +383,7 @@ define('pgadmin.node.table', [
schemaNode = pgBrowser.findParentTreeNodeByType(
_node, 'schema'
);
var detachedBySchema = _.groupBy(
let detachedBySchema = _.groupBy(
partitions.detached,
function(_d) { return parseInt(_d.schema_id); }
);
@@ -397,7 +397,7 @@ define('pgadmin.node.table', [
function(_d) { return parseInt(_d.oid); }
);
var tablesCollNode = pgBrowser.findChildCollectionTreeNode(
let tablesCollNode = pgBrowser.findChildCollectionTreeNode(
schemaNode, 'coll-table'
);
@@ -420,7 +420,7 @@ define('pgadmin.node.table', [
schemaNode = pgBrowser.findParentTreeNodeByType(
_node, 'schema'
);
var attachedBySchema = _.groupBy(
let attachedBySchema = _.groupBy(
partitions.attached,
function(_d) { return parseInt(_d.schema_id); }
);
@@ -449,7 +449,7 @@ define('pgadmin.node.table', [
}
if (newPartitionsIDs.length) {
var partitionsCollNode = pgBrowser.findChildCollectionTreeNode(
let partitionsCollNode = pgBrowser.findChildCollectionTreeNode(
_node, 'coll-partition'
);

6
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
View File

@@ -640,7 +640,7 @@ export default class TableSchema extends BaseUISchema {
deps: ['typname', 'is_partitioned'],
depChange: (state, source, topState, actionObj)=>{
if(source[0] === 'columns') {
/* In ERD, attnum is an imp var for setting the links
/* In ERD, attnum is an imp let for setting the links
Here, attnum is set to max avail value.
*/
let columns = state.columns;
@@ -820,7 +820,7 @@ export default class TableSchema extends BaseUISchema {
editable: false, type: 'select', controlProps: {allowClear: false},
group: 'partition', deps: ['is_partitioned'],
options: function() {
var options = [{
let options = [{
label: gettext('Range'), value: 'range',
},{
label: gettext('List'), value: 'list',
@@ -858,7 +858,7 @@ export default class TableSchema extends BaseUISchema {
canAddRow: function(state) {
let columnsExist = false;
var maxRowCount = 1000;
let maxRowCount = 1000;
if (state.partition_type && state.partition_type == 'list')
maxRowCount = 1;

12
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js
View File

@@ -98,7 +98,7 @@ define('pgadmin.node.trigger', [
callbacks: {
/* Enable trigger */
enable_trigger: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -107,7 +107,7 @@ define('pgadmin.node.trigger', [
if (!d)
return false;
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'enable' , d, true),
type:'PUT',
@@ -136,7 +136,7 @@ define('pgadmin.node.trigger', [
},
/* Disable trigger */
disable_trigger: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -145,7 +145,7 @@ define('pgadmin.node.trigger', [
if (!d)
return false;
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'enable' , d, true),
type:'PUT',
@@ -191,7 +191,7 @@ define('pgadmin.node.trigger', [
canCreate: SchemaChildTreeNode.isTreeItemOfChildOfSchema,
// Check to whether trigger is disable ?
canCreate_with_trigger_enable: function(itemData, item, data) {
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
if ('view' in treeData) {
return false;
}
@@ -201,7 +201,7 @@ define('pgadmin.node.trigger', [
},
// Check to whether trigger is enable ?
canCreate_with_trigger_disable: function(itemData, item, data) {
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item);
if ('view' in treeData) {
return false;
}

32
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
View File

@@ -52,7 +52,7 @@ export class EventSchema extends BaseUISchema {
type: 'switch', mode: ['create','edit', 'properties'],
group: gettext('Events'),
readonly: (state) => {
var evn_insert = state.evnt_insert;
let evn_insert = state.evnt_insert;
if (!_.isUndefined(evn_insert) && obj.nodeInfo && obj.nodeInfo.server.server_type == 'ppas' && obj.isNew(state))
return false;
return obj.inSchemaWithModelCheck(state);
@@ -62,7 +62,7 @@ export class EventSchema extends BaseUISchema {
type: 'switch', mode: ['create','edit', 'properties'],
group: gettext('Events'),
readonly: (state) => {
var evn_update = state.evnt_update;
let evn_update = state.evnt_update;
if (!_.isUndefined(evn_update) && obj.nodeInfo && obj.nodeInfo.server.server_type == 'ppas' && obj.isNew(state))
return false;
return obj.inSchemaWithModelCheck(state);
@@ -72,7 +72,7 @@ export class EventSchema extends BaseUISchema {
type: 'switch', mode: ['create','edit', 'properties'],
group: gettext('Events'),
readonly: (state) => {
var evn_delete = state.evnt_delete;
let evn_delete = state.evnt_delete;
if (!_.isUndefined(evn_delete) && obj.nodeInfo && obj.nodeInfo.server.server_type == 'ppas' && obj.isNew(state))
return false;
return obj.inSchemaWithModelCheck(state);
@@ -81,7 +81,7 @@ export class EventSchema extends BaseUISchema {
id: 'evnt_truncate', label: gettext('TRUNCATE'),
type: 'switch', group: gettext('Events'), deps: ['is_row_trigger', 'is_constraint_trigger'],
readonly: (state) => {
var is_constraint_trigger = state.is_constraint_trigger,
let is_constraint_trigger = state.is_constraint_trigger,
is_row_trigger = state.is_row_trigger,
server_type = obj.nodeInfo ? obj.nodeInfo.server.server_type: null;
if (is_row_trigger == true){
@@ -151,7 +151,7 @@ export default class TriggerSchema extends BaseUISchema {
disableTransition(state) {
if (!this.isNew())
return true;
var flag = false,
let flag = false,
evnt = null,
name = state.name,
evnt_count = 0;
@@ -239,7 +239,7 @@ export default class TriggerSchema extends BaseUISchema {
// If constraint trigger is set to True then row trigger will
// automatically set to True and becomes disable
var is_constraint_trigger = state.is_constraint_trigger;
let is_constraint_trigger = state.is_constraint_trigger;
if(!obj.inSchemaWithModelCheck(state)) {
if(!_.isUndefined(is_constraint_trigger) &&
is_constraint_trigger === true) {
@@ -251,7 +251,7 @@ export default class TriggerSchema extends BaseUISchema {
}
} else {
// Check if it is row trigger then enabled it.
var is_row_trigger = state.is_row_trigger;
let is_row_trigger = state.is_row_trigger;
if (!_.isUndefined(is_row_trigger) && obj.nodeInfo.server.server_type == 'ppas') {
return false;
}
@@ -267,7 +267,7 @@ export default class TriggerSchema extends BaseUISchema {
deps: ['tfunction'],
readonly: (state) => {
// Disabled if table is a partitioned table.
var tfunction = state.tfunction;
let tfunction = state.tfunction;
if (( _.has(obj.nodeInfo, 'table') && _.has(obj.nodeInfo.table, 'is_partitioned') &&
obj.nodeInfo.table.is_partitioned) || ( _.has(obj.nodeInfo, 'view')) ||
(obj.nodeInfo.server.server_type === 'ppas' && !_.isUndefined(tfunction) &&
@@ -290,7 +290,7 @@ export default class TriggerSchema extends BaseUISchema {
deps: ['is_constraint_trigger'],
readonly: (state) => {
// If constraint trigger is set to True then only enable it
var is_constraint_trigger = state.is_constraint_trigger;
let is_constraint_trigger = state.is_constraint_trigger;
if(!obj.inSchemaWithModelCheck(state)) {
if(!_.isUndefined(is_constraint_trigger) &&
is_constraint_trigger === true) {
@@ -317,7 +317,7 @@ export default class TriggerSchema extends BaseUISchema {
deps: ['tgdeferrable', 'is_constraint_trigger'],
readonly: (state) => {
// If Deferrable is set to True then only enable it
var tgdeferrable = state.tgdeferrable;
let tgdeferrable = state.tgdeferrable;
if(!obj.inSchemaWithModelCheck(state)) {
if(!_.isUndefined(tgdeferrable) && tgdeferrable) {
return false;
@@ -351,7 +351,7 @@ export default class TriggerSchema extends BaseUISchema {
readonly: (state) => {
// We will disable it when EDB PPAS and trigger function is
// set to Inline EDB-SPL
var tfunction = state.tfunction,
let tfunction = state.tfunction,
server_type = obj.nodeInfo.server.server_type;
if(!obj.inSchemaWithModelCheck(state)) {
if(server_type === 'ppas' &&
@@ -372,7 +372,7 @@ export default class TriggerSchema extends BaseUISchema {
id: 'fires', label: gettext('Fires'), deps: ['is_constraint_trigger'],
mode: ['create','edit', 'properties'], group: gettext('Events'),
options: () => {
var table_options = [
let table_options = [
{label: 'BEFORE', value: 'BEFORE'},
{label: 'AFTER', value: 'AFTER'}],
view_options = [
@@ -391,7 +391,7 @@ export default class TriggerSchema extends BaseUISchema {
if (!obj.isNew())
return true;
// If contraint trigger is set to True then only enable it
var is_constraint_trigger = state.is_constraint_trigger;
let is_constraint_trigger = state.is_constraint_trigger;
if(!obj.inSchemaWithModelCheck(state)) {
if(!_.isUndefined(is_constraint_trigger) &&
is_constraint_trigger === true) {
@@ -402,7 +402,7 @@ export default class TriggerSchema extends BaseUISchema {
}
} else {
// Check if it is row trigger then enabled it.
var fires_ = state.fires;
let fires_ = state.fires;
if (!_.isUndefined(fires_) && obj.nodeInfo.server.server_type == 'ppas') {
return false;
}
@@ -434,7 +434,7 @@ export default class TriggerSchema extends BaseUISchema {
return true;
}
// Enable column only if update event is set true
var isUpdate = state.evnt_update;
let isUpdate = state.evnt_update;
if(!_.isUndefined(isUpdate) && isUpdate) {
return false;
}
@@ -460,7 +460,7 @@ export default class TriggerSchema extends BaseUISchema {
disabled: (state) => {
// We will enable it only when EDB PPAS and trigger function is
// set to Inline EDB-SPL
var tfunction = state.tfunction,
let tfunction = state.tfunction,
server_type = obj.nodeInfo.server.server_type;
return (server_type !== 'ppas' ||

44
web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js
View File

@@ -85,12 +85,12 @@ function getRangeSchema(nodeObj, treeNodeInfo, itemNodeData) {
return new Promise((resolve, reject)=>{
const api = getApiInstance();
var _url = nodeObj.generate_url.apply(
let _url = nodeObj.generate_url.apply(
nodeObj, [
null, 'get_subopclass', itemNodeData, false,
treeNodeInfo,
]);
var data;
let data;
if(!_.isUndefined(typname) && typname != ''){
api.get(_url, {
@@ -113,12 +113,12 @@ function getRangeSchema(nodeObj, treeNodeInfo, itemNodeData) {
return new Promise((resolve, reject)=>{
const api = getApiInstance();
var _url = nodeObj.generate_url.apply(
let _url = nodeObj.generate_url.apply(
nodeObj, [
null, 'get_canonical', itemNodeData, false,
treeNodeInfo,
]);
var data = [];
let data = [];
if(!_.isUndefined(name) && name != '' && name != null){
api.get(_url, {
@@ -140,12 +140,12 @@ function getRangeSchema(nodeObj, treeNodeInfo, itemNodeData) {
return new Promise((resolve, reject)=>{
const api = getApiInstance();
var _url = nodeObj.generate_url.apply(
let _url = nodeObj.generate_url.apply(
nodeObj, [
null, 'get_stypediff', itemNodeData, false,
treeNodeInfo,
]);
var data;
let data;
if(!_.isUndefined(typname) && typname != '' &&
!_.isUndefined(opcname) && opcname != ''){
@@ -211,7 +211,7 @@ class EnumerationSchema extends BaseUISchema {
}
get baseFields() {
var obj = this;
let obj = this;
return [
{
id: 'label', label: gettext('Label'),
@@ -247,7 +247,7 @@ class RangeSchema extends BaseUISchema {
}
get baseFields() {
var obj = this;
let obj = this;
return [{
// We will disable range type control in edit mode
id: 'typname', label: gettext('Subtype'),
@@ -333,7 +333,7 @@ class RangeSchema extends BaseUISchema {
return disableCollNameControl;
// To check if collation is allowed?
var of_subtype = state.typname;
let of_subtype = state.typname;
if(!_.isUndefined(of_subtype)) {
// iterating over all the types
_.each(state.subtypes, function(s) {
@@ -473,7 +473,7 @@ class ExternalSchema extends BaseUISchema {
// Function will help us to fill combobox
external_func_combo(control) {
var result = [];
let result = [];
_.each(control, function(item) {
if(item && item.label == '') {
@@ -515,7 +515,7 @@ class ExternalSchema extends BaseUISchema {
}
get baseFields() {
var obj = this;
let obj = this;
return [{
id: 'spacer_ctrl', group: gettext('Required'), mode: ['edit', 'create'], type: 'spacer',
},{
@@ -892,7 +892,7 @@ class CompositeSchema extends BaseUISchema {
}
get baseFields() {
var obj = this;
let obj = this;
return [{
id: 'member_name', label: gettext('Member Name'),
type: 'text', cell: 'text'
@@ -951,8 +951,8 @@ class CompositeSchema extends BaseUISchema {
deps: ['type'],
editable: (state) => {
// We will store type from selected from combobox
var of_type = state.type;
var flag = false;
let of_type = state.type;
let flag = false;
if(obj.type_options) {
// iterating over all the types
_.each(obj.type_options, function(o) {
@@ -1026,7 +1026,7 @@ class DataTypeSchema extends BaseUISchema {
}
get baseFields() {
var dataTypeObj = this;
let dataTypeObj = this;
return [{
id: 'type',
label: gettext('Data Type'),
@@ -1048,7 +1048,7 @@ class DataTypeSchema extends BaseUISchema {
controlProps: {
allowClear: false,
filter: (options) => {
var data_types = [];
let data_types = [];
options.forEach((option) => {
if (!(option.value.includes('[]'))) {
data_types.push(option);
@@ -1089,7 +1089,7 @@ class DataTypeSchema extends BaseUISchema {
visible: (state) => isVisible(state, 'N'),
disabled: function(state) {
var of_type = state.type,
let of_type = state.type,
flag = true;
if (state.type_options) {
_.each(state.type_options, function (o) {
@@ -1129,7 +1129,7 @@ class DataTypeSchema extends BaseUISchema {
cell: 'int',
visible: (state) => isVisible(state, 'N'),
disabled: function(state) {
var of_type = state.type,
let of_type = state.type,
flag = true;
_.each(state.type_options, function(o) {
if ( of_type == o.value ) {
@@ -1217,7 +1217,7 @@ export default class TypeSchema extends BaseUISchema {
}
get baseFields() {
var obj = this;
let obj = this;
return [{
id: 'name', label: gettext('Name'), cell: 'string',
type: 'text', mode: ['properties', 'create', 'edit'],
@@ -1272,7 +1272,7 @@ export default class TypeSchema extends BaseUISchema {
},
controlProps: { allowClear: false },
options: function() {
var typetype = [
let typetype = [
{label: gettext('Composite'), value: 'c'},
{label: gettext('Enumeration'), value: 'e'},
{label: gettext('External'), value: 'b'},
@@ -1462,7 +1462,7 @@ export default class TypeSchema extends BaseUISchema {
// Do not allow to add when shell type is selected
// Clear acl & security label collections as well
if (state.typtype === 'p') {
var acl = state.typacl;
let acl = state.typacl;
if(acl && acl.length > 0)
acl.splice(0, acl.length);
}
@@ -1480,7 +1480,7 @@ export default class TypeSchema extends BaseUISchema {
// Do not allow to add when shell type is selected
// Clear acl & security label collections as well
if (state.typtype === 'p') {
var secLabs = state.seclabels;
let secLabs = state.seclabels;
if(secLabs && secLabs.length > 0)
secLabs.splice(0, secLabs.length);
}

6
web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
View File

@@ -149,7 +149,7 @@ define('pgadmin.node.mview', [
},
refresh_mview: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -161,7 +161,7 @@ define('pgadmin.node.mview', [
let j = i;
while (j) {
var node_data = pgBrowser.tree.itemData(j);
let node_data = pgBrowser.tree.itemData(j);
if (node_data._type == 'server') {
server_data = node_data;
break;
@@ -227,7 +227,7 @@ define('pgadmin.node.mview', [
},
is_version_supported: function(data, item) {
var t = pgAdmin.Browser.tree,
let t = pgAdmin.Browser.tree,
i = item || t.selected(),
info = t && t.getTreeNodeHierarchy(i),
version = _.isUndefined(info) ? 0 : info.server.version;

38
web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
View File

@@ -108,13 +108,13 @@ define('pgadmin.node.database', [
);
},
can_create_database: function(node, item) {
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
server = treeData['server'];
return server.connected && server.user.can_create_db;
},
canCreate: function(itemData, item) {
var treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
let treeData = pgBrowser.tree.getTreeNodeHierarchy(item),
server = treeData['server'];
// If server is less than 10 then do not allow 'create' menu
@@ -139,7 +139,7 @@ define('pgadmin.node.database', [
},
connection_lost: function(i, resp, server_connected) {
if (pgBrowser.tree) {
var t = pgBrowser.tree,
let t = pgBrowser.tree,
d = i && t.itemData(i),
self = this;
@@ -153,7 +153,7 @@ define('pgadmin.node.database', [
if (_.isUndefined(d.is_connecting) || !d.is_connecting) {
d.is_connecting = true;
var disconnect = function(_i, _d) {
let disconnect = function(_i, _d) {
if (_d._id == this._id) {
d.is_connecting = false;
pgBrowser.Events.off(
@@ -187,7 +187,7 @@ define('pgadmin.node.database', [
d.is_connecting = false;
t.unload(i);
t.setInode(i);
var dbIcon = d.isTemplate ? 'icon-database-template-not-connected':'icon-database-not-connected';
let dbIcon = d.isTemplate ? 'icon-database-template-not-connected':'icon-database-not-connected';
t.addIcon(i, {icon: dbIcon});
pgBrowser.Events.trigger(
'pgadmin:database:connect:cancelled', i, d, self
@@ -200,7 +200,7 @@ define('pgadmin.node.database', [
callbacks: {
/* Connect the database */
connect_database: function(args){
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -218,7 +218,7 @@ define('pgadmin.node.database', [
},
/* Disconnect the database */
disconnect_database: function(args) {
var input = args || {},
let input = args || {},
obj = this,
t = pgBrowser.tree,
i = input.item || t.selected(),
@@ -229,14 +229,14 @@ define('pgadmin.node.database', [
gettext('Disconnect from database'),
gettext('Are you sure you want to disconnect from database - %s?', d.label),
function() {
var data = d;
let data = d;
$.ajax({
url: obj.generate_url(i, 'connect', d, true),
type:'DELETE',
})
.done(function(res) {
if (res.success == 1) {
var prv_i = t.parent(i);
let prv_i = t.parent(i);
if(res.data.info_prefix) {
res.info = `${_.escape(res.data.info_prefix)} - ${res.info}`;
}
@@ -275,7 +275,7 @@ define('pgadmin.node.database', [
/* Generate the ERD */
generate_erd: function(args) {
var input = args || {},
let input = args || {},
t = pgBrowser.tree,
i = input.item || t.selected(),
d = i ? t.itemData(i) : undefined;
@@ -311,7 +311,7 @@ define('pgadmin.node.database', [
},
refresh: function(cmd, i) {
var t = pgBrowser.tree,
let t = pgBrowser.tree,
item = i || t.selected(),
d = t.itemData(item);
@@ -367,18 +367,18 @@ define('pgadmin.node.database', [
if (args && 'node_info' in args) {
// If node_info is not present in current object then it might in its
// parent in case if we used sub node control
var node_info = args.node_info || args.handler.node_info;
let node_info = args.node_info || args.handler.node_info;
return 'catalog' in node_info ? false : true;
}
return true;
},
};
var connect_to_database = function(obj, data, tree, item, _wasConnected) {
let connect_to_database = function(obj, data, tree, item, _wasConnected) {
connect(obj, data, tree, item, _wasConnected);
},
connect = function (obj, data, tree, item, _wasConnected) {
var wasConnected = _wasConnected || data.connected,
let wasConnected = _wasConnected || data.connected,
onFailure = function(
xhr, status, error, _model, _data, _tree, _item, _status
) {
@@ -392,7 +392,7 @@ define('pgadmin.node.database', [
},
function(fun_error) {
tree.setInode(_item);
var dbIcon = data.isTemplate ? 'icon-database-template-not-connected':'icon-database-not-connected';
let dbIcon = data.isTemplate ? 'icon-database-template-not-connected':'icon-database-not-connected';
tree.addIcon(_item, {icon: dbIcon});
Notify.pgNotifier(fun_error, xhr, gettext('Connect to database.'));
}
@@ -400,7 +400,7 @@ define('pgadmin.node.database', [
} else {
if (!_status) {
tree.setInode(_item);
var dbIcon = data.isTemplate ? 'icon-database-template-not-connected':'icon-database-not-connected';
let dbIcon = data.isTemplate ? 'icon-database-template-not-connected':'icon-database-not-connected';
tree.addIcon(_item, {icon: dbIcon});
}
@@ -430,7 +430,7 @@ define('pgadmin.node.database', [
if (typeof res.data.icon == 'string') {
_tree.removeIcon(_item);
_data.icon = res.data.icon;
var dbIcon = _data.isTemplate ? 'icon-database-template-connected':_data.icon;
let dbIcon = _data.isTemplate ? 'icon-database-template-connected':_data.icon;
_tree.addIcon(_item, {icon: dbIcon});
}
if(res.data.already_connected) {
@@ -462,11 +462,11 @@ define('pgadmin.node.database', [
},
onCancel = function(_tree, _item, _data) {
_data.is_connecting = false;
var server = _tree.parent(_item);
let server = _tree.parent(_item);
_tree.unload(_item);
_tree.setInode(_item);
_tree.removeIcon(_item);
var dbIcon = data.isTemplate ? 'icon-database-template-not-connected':'icon-database-not-connected';
let dbIcon = data.isTemplate ? 'icon-database-template-not-connected':'icon-database-not-connected';
_tree.addIcon(_item, {icon: dbIcon});
obj.trigger('connect:cancelled', obj, _item, _data);
pgBrowser.Events.trigger(

2
web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.js
View File

@@ -86,7 +86,7 @@ define('pgadmin.node.subscription', [
return new Promise((resolve, reject)=>{
const api = getApiInstance();
if(host != undefined && port!= undefined && username!= undefined && db != undefined){
var _url = pgBrowser.Nodes['cast'].generate_url.apply(
let _url = pgBrowser.Nodes['cast'].generate_url.apply(
pgBrowser.Nodes['subscription'], [
null, 'get_publications', itemNodeData, false,
treeNodeInfo,

8
web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js
View File

@@ -258,7 +258,7 @@ export default class SubscriptionSchema extends BaseUISchema{
group: gettext('SSL'), mode: ['properties'],
deps: ['sslmode'],
visible: function(state) {
var sslcert = state.sslcert;
let sslcert = state.sslcert;
return !_.isUndefined(sslcert) && !_.isNull(sslcert);
},
},{
@@ -266,7 +266,7 @@ export default class SubscriptionSchema extends BaseUISchema{
group: gettext('SSL'), mode: ['properties'],
deps: ['sslmode'],
visible: function(state) {
var sslkey = state.sslkey;
let sslkey = state.sslkey;
return !_.isUndefined(sslkey) && !_.isNull(sslkey);
},
},{
@@ -274,7 +274,7 @@ export default class SubscriptionSchema extends BaseUISchema{
group: gettext('SSL'), mode: ['properties'],
deps: ['sslmode'],
visible: function(state) {
var sslrootcert = state.sslrootcert;
let sslrootcert = state.sslrootcert;
return !_.isUndefined(sslrootcert) && !_.isNull(sslrootcert);
},
},{
@@ -282,7 +282,7 @@ export default class SubscriptionSchema extends BaseUISchema{
group: gettext('SSL'), mode: ['properties'],
deps: ['sslmode'],
visible: function(state) {
var sslcrl = state.sslcrl;
let sslcrl = state.sslcrl;
return !_.isUndefined(sslcrl) && !_.isNull(sslcrl);
},
},{