mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2025-02-25 18:55:31 -06:00
Fixed the following code smells:
1) useState call is not destructured into value + setter pair. 2) A fragment with only one child is redundant. 3) Unnecessary '.apply()' and '.call()'. 4) Expected the Promise rejection reason to be an Error.
This commit is contained in:
@@ -76,11 +76,10 @@ define('pgadmin.node.cast', [
|
||||
return new Promise((resolve, reject)=>{
|
||||
const api = getApiInstance();
|
||||
|
||||
let _url = pgBrowser.Nodes['cast'].generate_url.apply(
|
||||
pgBrowser.Nodes['cast'], [
|
||||
null, 'get_functions', itemNodeData, false,
|
||||
treeNodeInfo,
|
||||
]);
|
||||
let _url = pgBrowser.Nodes['cast'].generate_url(
|
||||
null, 'get_functions', itemNodeData, false,
|
||||
treeNodeInfo,
|
||||
);
|
||||
let data = {'srctyp' : srcTyp, 'trgtyp' : trgtyp};
|
||||
|
||||
if(srcTyp != undefined && srcTyp != '' &&
|
||||
|
||||
@@ -191,7 +191,7 @@ define('pgadmin.node.compound_trigger', [
|
||||
}
|
||||
|
||||
return itemData.icon === 'icon-compound_trigger-bad' &&
|
||||
this.canCreate.apply(this, [itemData, item, data]);
|
||||
this.canCreate(itemData, item, data);
|
||||
},
|
||||
// Check to whether trigger is enable ?
|
||||
canCreate_with_compound_trigger_disable: function(itemData, item, data) {
|
||||
@@ -201,7 +201,7 @@ define('pgadmin.node.compound_trigger', [
|
||||
}
|
||||
|
||||
return itemData.icon === 'icon-compound_trigger' &&
|
||||
this.canCreate.apply(this, [itemData, item, data]);
|
||||
this.canCreate(itemData, item, data);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@@ -322,14 +322,14 @@ function(
|
||||
canCreate: SchemaChildTreeNode.isTreeItemOfChildOfSchema,
|
||||
// Check to whether table has disable trigger(s)
|
||||
canCreate_with_trigger_enable: function(itemData, item, data) {
|
||||
if(this.canCreate.apply(this, [itemData, item, data])) {
|
||||
if(this.canCreate(itemData, item, data)) {
|
||||
// We are here means we can create menu, now let's check condition
|
||||
return (itemData.tigger_count > 0);
|
||||
}
|
||||
},
|
||||
// Check to whether table has enable trigger(s)
|
||||
canCreate_with_trigger_disable: function(itemData, item, data) {
|
||||
if(this.canCreate.apply(this, [itemData, item, data])) {
|
||||
if(this.canCreate(itemData, item, data)) {
|
||||
// We are here means we can create menu, now let's check condition
|
||||
return (itemData.tigger_count > 0 && itemData.has_enable_triggers > 0);
|
||||
}
|
||||
|
||||
@@ -234,7 +234,7 @@ define('pgadmin.node.rule', [
|
||||
}
|
||||
|
||||
return itemData.icon === 'icon-rule-bad' &&
|
||||
this.canCreate.apply(this,[itemData, item, data]);
|
||||
this.canCreate(itemData, item, data);
|
||||
},
|
||||
// Check to whether rule is enable ?
|
||||
canCreate_with_rule_disable: function(itemData, item, data) {
|
||||
|
||||
@@ -183,7 +183,7 @@ define('pgadmin.node.trigger', [
|
||||
}
|
||||
|
||||
return itemData.icon === 'icon-trigger-bad' &&
|
||||
this.canCreate.apply(this, [itemData, item, data]);
|
||||
this.canCreate(itemData, item, data);
|
||||
},
|
||||
// Check to whether trigger is enable ?
|
||||
canCreate_with_trigger_disable: function(itemData, item, data) {
|
||||
@@ -193,7 +193,7 @@ define('pgadmin.node.trigger', [
|
||||
}
|
||||
|
||||
return itemData.icon === 'icon-trigger' &&
|
||||
this.canCreate.apply(this, [itemData, item, data]);
|
||||
this.canCreate(itemData, item, data);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@@ -85,11 +85,10 @@ function getRangeSchema(nodeObj, treeNodeInfo, itemNodeData) {
|
||||
return new Promise((resolve, reject)=>{
|
||||
const api = getApiInstance();
|
||||
|
||||
let _url = nodeObj.generate_url.apply(
|
||||
nodeObj, [
|
||||
null, 'get_subopclass', itemNodeData, false,
|
||||
treeNodeInfo,
|
||||
]);
|
||||
let _url = nodeObj.generate_url(
|
||||
null, 'get_subopclass', itemNodeData, false,
|
||||
treeNodeInfo,
|
||||
);
|
||||
let data;
|
||||
|
||||
if(!_.isUndefined(typname) && typname != ''){
|
||||
@@ -113,11 +112,10 @@ function getRangeSchema(nodeObj, treeNodeInfo, itemNodeData) {
|
||||
return new Promise((resolve, reject)=>{
|
||||
const api = getApiInstance();
|
||||
|
||||
let _url = nodeObj.generate_url.apply(
|
||||
nodeObj, [
|
||||
null, 'get_canonical', itemNodeData, false,
|
||||
treeNodeInfo,
|
||||
]);
|
||||
let _url = nodeObj.generate_url(
|
||||
null, 'get_canonical', itemNodeData, false,
|
||||
treeNodeInfo,
|
||||
);
|
||||
let data = [];
|
||||
|
||||
if(!_.isUndefined(name) && name != '' && name != null){
|
||||
@@ -140,11 +138,10 @@ function getRangeSchema(nodeObj, treeNodeInfo, itemNodeData) {
|
||||
return new Promise((resolve, reject)=>{
|
||||
const api = getApiInstance();
|
||||
|
||||
let _url = nodeObj.generate_url.apply(
|
||||
nodeObj, [
|
||||
null, 'get_stypediff', itemNodeData, false,
|
||||
treeNodeInfo,
|
||||
]);
|
||||
let _url = nodeObj.generate_url(
|
||||
null, 'get_stypediff', itemNodeData, false,
|
||||
treeNodeInfo,
|
||||
);
|
||||
let data;
|
||||
|
||||
if(!_.isUndefined(typname) && typname != '' &&
|
||||
|
||||
@@ -462,7 +462,7 @@ define('pgadmin.node.database', [
|
||||
);
|
||||
/* Call enable/disable menu function after database is connected.
|
||||
To make sure all the menus for database is in the right state */
|
||||
pgBrowser.enable_disable_menus.apply(pgBrowser, [_item]);
|
||||
pgBrowser.enable_disable_menus(_item);
|
||||
pgBrowser.Nodes['database'].callbacks.selected(_item, _data);
|
||||
|
||||
if (!_connected) {
|
||||
|
||||
@@ -713,7 +713,7 @@ define('pgadmin.node.server', [
|
||||
|
||||
/* Call enable/disable menu function after database is connected.
|
||||
To make sure all the menus for database is in the right state */
|
||||
pgBrowser.enable_disable_menus.apply(pgBrowser, [_item]);
|
||||
pgBrowser.enable_disable_menus(_item);
|
||||
|
||||
// We're not reconnecting
|
||||
if (!_wasConnected) {
|
||||
|
||||
Reference in New Issue
Block a user