mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2026-09-03 20:52:57 -05:00
Fixed following SonarQube issues:
- Refactor functions to not always return the same value. - Rename "cls" to "self" or add the missing "self" parameter. - Remove useless assignment to variables.
This commit is contained in:
Aditya Toshniwal
committed by
Akshay Joshi
Akshay Joshi
parent
dd7eb54e90
commit
56cf64ad22
@@ -31,7 +31,6 @@ define('pgadmin.browser', [
|
||||
// Generally the one, which do no have AMD support.
|
||||
var wcDocker = window.wcDocker;
|
||||
$ = $ || window.jQuery || window.$;
|
||||
Bootstrap = Bootstrap || window.Bootstrap;
|
||||
var CodeMirror = codemirror.default;
|
||||
|
||||
var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};
|
||||
|
||||
@@ -154,7 +154,6 @@ define([
|
||||
|
||||
if (_.isUndefined(options) || _.isNull(options)) {
|
||||
options = attributes || {};
|
||||
attributes = null;
|
||||
}
|
||||
|
||||
self.sessAttrs = {};
|
||||
@@ -1029,129 +1028,125 @@ define([
|
||||
return (_.findIndex(this.sessAttrs[type], comparator));
|
||||
},
|
||||
onModelAdd: function(obj) {
|
||||
if (!this.trackChanges)
|
||||
return true;
|
||||
if (this.trackChanges) {
|
||||
var self = this,
|
||||
msg,
|
||||
idx = self.objFindInSession(obj, 'deleted');
|
||||
|
||||
var self = this,
|
||||
msg,
|
||||
idx = self.objFindInSession(obj, 'deleted');
|
||||
// Hmm.. - it was originally deleted from this collection, we should
|
||||
// remove it from the 'deleted' list.
|
||||
if (idx >= 0) {
|
||||
var origObj = self.sessAttrs['deleted'][idx];
|
||||
|
||||
// Hmm.. - it was originally deleted from this collection, we should
|
||||
// remove it from the 'deleted' list.
|
||||
if (idx >= 0) {
|
||||
var origObj = self.sessAttrs['deleted'][idx];
|
||||
obj.origSessAttrs = _.clone(origObj.origSessAttrs);
|
||||
obj.attributes = _.extend(obj.attributes, origObj.attributes);
|
||||
obj.sessAttrs = _.clone(origObj.sessAttrs);
|
||||
|
||||
obj.origSessAttrs = _.clone(origObj.origSessAttrs);
|
||||
obj.attributes = _.extend(obj.attributes, origObj.attributes);
|
||||
obj.sessAttrs = _.clone(origObj.sessAttrs);
|
||||
self.sessAttrs['deleted'].splice(idx, 1);
|
||||
|
||||
self.sessAttrs['deleted'].splice(idx, 1);
|
||||
|
||||
// It has been changed originally!
|
||||
if ((!('sessChanged' in obj)) || obj.sessChanged()) {
|
||||
self.sessAttrs['changed'].push(obj);
|
||||
}
|
||||
|
||||
(self.handler || self).trigger('pgadmin-session:added', self, obj);
|
||||
|
||||
|
||||
if ('default_validate' in obj && typeof(obj.default_validate) == 'function') {
|
||||
msg = obj.default_validate();
|
||||
}
|
||||
|
||||
if (_.isString(msg)) {
|
||||
(self.sessAttrs['invalid'])[obj.cid] = msg;
|
||||
} else if ('validate' in obj && typeof(obj.validate) === 'function') {
|
||||
msg = obj.validate();
|
||||
|
||||
if (msg) {
|
||||
(self.sessAttrs['invalid'])[obj.cid] = msg;
|
||||
// It has been changed originally!
|
||||
if ((!('sessChanged' in obj)) || obj.sessChanged()) {
|
||||
self.sessAttrs['changed'].push(obj);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
if ('default_validate' in obj && typeof(obj.default_validate) == 'function') {
|
||||
msg = obj.default_validate();
|
||||
}
|
||||
(self.handler || self).trigger('pgadmin-session:added', self, obj);
|
||||
|
||||
if (_.isString(msg)) {
|
||||
(self.sessAttrs['invalid'])[obj.cid] = msg;
|
||||
} else if ('validate' in obj && typeof(obj.validate) === 'function') {
|
||||
msg = obj.validate();
|
||||
|
||||
if (msg) {
|
||||
(self.sessAttrs['invalid'])[obj.cid] = msg;
|
||||
if ('default_validate' in obj && typeof(obj.default_validate) == 'function') {
|
||||
msg = obj.default_validate();
|
||||
}
|
||||
}
|
||||
self.sessAttrs['added'].push(obj);
|
||||
|
||||
/*
|
||||
* Session has been changed
|
||||
*/
|
||||
(self.handler || self).trigger('pgadmin-session:added', self, obj);
|
||||
if (_.isString(msg)) {
|
||||
(self.sessAttrs['invalid'])[obj.cid] = msg;
|
||||
} else if ('validate' in obj && typeof(obj.validate) === 'function') {
|
||||
msg = obj.validate();
|
||||
|
||||
if (msg) {
|
||||
(self.sessAttrs['invalid'])[obj.cid] = msg;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
if ('default_validate' in obj && typeof(obj.default_validate) == 'function') {
|
||||
msg = obj.default_validate();
|
||||
}
|
||||
|
||||
if (_.isString(msg)) {
|
||||
(self.sessAttrs['invalid'])[obj.cid] = msg;
|
||||
} else if ('validate' in obj && typeof(obj.validate) === 'function') {
|
||||
msg = obj.validate();
|
||||
|
||||
if (msg) {
|
||||
(self.sessAttrs['invalid'])[obj.cid] = msg;
|
||||
}
|
||||
}
|
||||
self.sessAttrs['added'].push(obj);
|
||||
|
||||
/*
|
||||
* Session has been changed
|
||||
*/
|
||||
(self.handler || self).trigger('pgadmin-session:added', self, obj);
|
||||
}
|
||||
|
||||
// Let the parent/listener know about my status (valid/invalid).
|
||||
this.triggerValidationEvent.apply(this);
|
||||
}
|
||||
|
||||
// Let the parent/listener know about my status (valid/invalid).
|
||||
this.triggerValidationEvent.apply(this);
|
||||
|
||||
return true;
|
||||
},
|
||||
onModelRemove: function(obj) {
|
||||
if (!this.trackChanges)
|
||||
return true;
|
||||
if (this.trackChanges) {
|
||||
/* Once model is removed from collection clear its errorModel as it's no longer relevant
|
||||
* for us. Otherwise it creates problem in 'clearInvalidSessionIfModelValid' function.
|
||||
*/
|
||||
obj.errorModel.clear();
|
||||
|
||||
/* Once model is removed from collection clear its errorModel as it's no longer relevant
|
||||
* for us. Otherwise it creates problem in 'clearInvalidSessionIfModelValid' function.
|
||||
*/
|
||||
obj.errorModel.clear();
|
||||
var self = this,
|
||||
invalidModels = self.sessAttrs['invalid'],
|
||||
copy = _.clone(obj),
|
||||
idx = self.objFindInSession(obj, 'added');
|
||||
|
||||
var self = this,
|
||||
invalidModels = self.sessAttrs['invalid'],
|
||||
copy = _.clone(obj),
|
||||
idx = self.objFindInSession(obj, 'added');
|
||||
// We need to remove it from the invalid object list first.
|
||||
if (obj.cid in invalidModels) {
|
||||
delete invalidModels[obj.cid];
|
||||
}
|
||||
|
||||
// We need to remove it from the invalid object list first.
|
||||
if (obj.cid in invalidModels) {
|
||||
delete invalidModels[obj.cid];
|
||||
// Hmm - it was newly added, we can safely remove it.
|
||||
if (idx >= 0) {
|
||||
self.sessAttrs['added'].splice(idx, 1);
|
||||
|
||||
(self.handler || self).trigger('pgadmin-session:removed', self, copy);
|
||||
|
||||
self.checkDuplicateWithModel(copy);
|
||||
|
||||
// Let the parent/listener know about my status (valid/invalid).
|
||||
this.triggerValidationEvent.apply(this);
|
||||
} else {
|
||||
// Hmm - it was changed in this session, we should remove it from the
|
||||
// changed models.
|
||||
idx = self.objFindInSession(obj, 'changed');
|
||||
|
||||
if (idx >= 0) {
|
||||
self.sessAttrs['changed'].splice(idx, 1);
|
||||
(self.handler || self).trigger('pgadmin-session:removed', self, copy);
|
||||
} else {
|
||||
(self.handler || self).trigger('pgadmin-session:removed', self, copy);
|
||||
}
|
||||
|
||||
self.sessAttrs['deleted'].push(obj);
|
||||
|
||||
self.checkDuplicateWithModel(obj);
|
||||
|
||||
// Let the parent/listener know about my status (valid/invalid).
|
||||
this.triggerValidationEvent.apply(this);
|
||||
}
|
||||
|
||||
/*
|
||||
* This object has been remove, we need to check (if we still have any
|
||||
* other invalid message pending).
|
||||
*/
|
||||
}
|
||||
|
||||
// Hmm - it was newly added, we can safely remove it.
|
||||
if (idx >= 0) {
|
||||
self.sessAttrs['added'].splice(idx, 1);
|
||||
|
||||
(self.handler || self).trigger('pgadmin-session:removed', self, copy);
|
||||
|
||||
self.checkDuplicateWithModel(copy);
|
||||
|
||||
// Let the parent/listener know about my status (valid/invalid).
|
||||
this.triggerValidationEvent.apply(this);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// Hmm - it was changed in this session, we should remove it from the
|
||||
// changed models.
|
||||
idx = self.objFindInSession(obj, 'changed');
|
||||
|
||||
if (idx >= 0) {
|
||||
self.sessAttrs['changed'].splice(idx, 1);
|
||||
(self.handler || self).trigger('pgadmin-session:removed', self, copy);
|
||||
} else {
|
||||
(self.handler || self).trigger('pgadmin-session:removed', self, copy);
|
||||
}
|
||||
|
||||
self.sessAttrs['deleted'].push(obj);
|
||||
|
||||
self.checkDuplicateWithModel(obj);
|
||||
|
||||
// Let the parent/listener know about my status (valid/invalid).
|
||||
this.triggerValidationEvent.apply(this);
|
||||
|
||||
/*
|
||||
* This object has been remove, we need to check (if we still have any
|
||||
* other invalid message pending).
|
||||
*/
|
||||
|
||||
return true;
|
||||
},
|
||||
triggerValidationEvent: function() {
|
||||
@@ -1194,52 +1189,39 @@ define([
|
||||
onModelChange: function(obj) {
|
||||
var self = this;
|
||||
|
||||
if (!this.trackChanges || !(obj instanceof pgBrowser.Node.Model))
|
||||
return true;
|
||||
|
||||
var idx = self.objFindInSession(obj, 'added');
|
||||
|
||||
// It was newly added model, we don't need to add into the changed
|
||||
// list.
|
||||
if (idx >= 0) {
|
||||
(self.handler || self).trigger('pgadmin-session:changed', self, obj);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
idx = self.objFindInSession(obj, 'changed');
|
||||
|
||||
if (!('sessChanged' in obj)) {
|
||||
(self.handler || self).trigger('pgadmin-session:changed', self, obj);
|
||||
if (this.trackChanges && obj instanceof pgBrowser.Node.Model) {
|
||||
var idx = self.objFindInSession(obj, 'added');
|
||||
|
||||
// It was newly added model, we don't need to add into the changed
|
||||
// list.
|
||||
if (idx >= 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
self.sessAttrs['changed'].push(obj);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
if (idx >= 0) {
|
||||
|
||||
if (!obj.sessChanged()) {
|
||||
// This object is no more updated, removing it from the changed
|
||||
// models list.
|
||||
self.sessAttrs['changed'].splice(idx, 1);
|
||||
|
||||
(self.handler || self).trigger('pgadmin-session:changed', self, obj);
|
||||
return true;
|
||||
} else {
|
||||
idx = self.objFindInSession(obj, 'changed');
|
||||
|
||||
if (!('sessChanged' in obj)) {
|
||||
(self.handler || self).trigger('pgadmin-session:changed', self, obj);
|
||||
|
||||
if (idx < 0) {
|
||||
self.sessAttrs['changed'].push(obj);
|
||||
}
|
||||
} else {
|
||||
if (idx >= 0) {
|
||||
if (!obj.sessChanged()) {
|
||||
// This object is no more updated, removing it from the changed
|
||||
// models list.
|
||||
self.sessAttrs['changed'].splice(idx, 1);
|
||||
|
||||
(self.handler || self).trigger('pgadmin-session:changed', self, obj);
|
||||
} else {
|
||||
(self.handler || self).trigger('pgadmin-session:changed', self, obj);
|
||||
}
|
||||
} else if (obj.sessChanged()) {
|
||||
self.sessAttrs['changed'].push(obj);
|
||||
(self.handler || self).trigger('pgadmin-session:changed', self, obj);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
(self.handler || self).trigger('pgadmin-session:changed', self, obj);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
if (obj.sessChanged()) {
|
||||
self.sessAttrs['changed'].push(obj);
|
||||
(self.handler || self).trigger('pgadmin-session:changed', self, obj);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
Reference in New Issue
Block a user