From b73aa6d000f9b9263d27f1cf023614eb5d524abe Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Thu, 8 Sep 2022 20:28:43 +0530 Subject: [PATCH] Fixed 'Remove the unnecessary boolean literals' code smell --- .../schemas/static/js/schema_child_tree_node.js | 2 +- .../schemas/tables/columns/static/js/column.js | 2 +- .../static/js/check_constraint.js | 2 +- .../static/js/exclusion_constraint.js | 2 +- .../foreign_key/static/js/foreign_key.js | 2 +- .../static/js/unique_constraint.js | 2 +- .../schemas/tables/indexes/static/js/index.js | 2 +- .../server_groups/servers/static/js/variable.js | 4 ++-- web/pgadmin/browser/static/js/frame.js | 2 +- web/pgadmin/browser/static/js/node.js | 6 +++--- .../static/js/quick_search/trigger_search.js | 16 ++++++++-------- web/pgadmin/misc/cloud/static/js/biganimal.js | 2 +- web/pgadmin/static/js/backform.pgadmin.js | 10 +++++----- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema_child_tree_node.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema_child_tree_node.js index a6ad959de..67594982e 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema_child_tree_node.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema_child_tree_node.js @@ -13,7 +13,7 @@ let pgBrowser = pgAdmin.Browser; export function childCreateMenuEnabled(itemData, item, data) { // If check is false then , we will allow create menu - if (data && data.check === false) { + if (data && !data.check) { return true; } diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js index d06367d8d..aa0bdad9d 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js @@ -100,7 +100,7 @@ define('pgadmin.node.column', [ // Below function will enable right click menu for creating column canCreate: function(itemData, item, data) { // If check is false then , we will allow create menu - if (data && data.check == false) + if (data && !data.check) return true; let t = pgBrowser.tree, i = item, d = itemData, parents = []; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js index 45b1170aa..a3e136073 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js @@ -100,7 +100,7 @@ define('pgadmin.node.check_constraint', [ // Below function will enable right click menu for creating check constraint. canCreate: function(itemData, item, data) { // If check is false then , we will allow create menu - if (data && data.check == false) + if (data && !data.check) return true; let t = pgBrowser.tree, i = item, d = itemData, parents = []; diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js index 7b475709c..b0b114db0 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js @@ -58,7 +58,7 @@ define('pgadmin.node.exclusion_constraint', [ canCreate: function(itemData, item, data) { // If check is false then , we will allow create menu - if (data && data.check == false) + if (data && !data.check) return true; let t = pgBrowser.tree, i = item, d = itemData, parents = [], diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js index 037ae9c33..b2ccf7547 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js @@ -94,7 +94,7 @@ define('pgadmin.node.foreign_key', [ }, canCreate: function(itemData, item, data) { // If check is false then , we will allow create menu - if (data && data.check == false) + if (data && !data.check) return true; let t = pgBrowser.tree, i = item, d = itemData, parents = [], diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js index 367f60972..8102ce636 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.js @@ -52,7 +52,7 @@ define('pgadmin.node.unique_constraint', [ }, canCreate: function(itemData, item, data) { // If check is false then , we will allow create menu - if (data && data.check == false) + if (data && !data.check) return true; let t = pgBrowser.tree, i = item, d = itemData, parents = [], diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js index 4bd91dc10..7c5198864 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.js @@ -94,7 +94,7 @@ define('pgadmin.node.index', [ // Below function will enable right click menu for creating column canCreate: function(itemData, item, data) { // If check is false then , we will allow create menu - if (data && data.check == false) + if (data && !data.check) return true; let t = pgBrowser.tree, i = item, d = itemData, parents = [], diff --git a/web/pgadmin/browser/server_groups/servers/static/js/variable.js b/web/pgadmin/browser/server_groups/servers/static/js/variable.js index f10559582..30191e1db 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/variable.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/variable.js @@ -361,7 +361,7 @@ function(gettext, $, Backbone, Backform, Backgrid, pgNode) { }); // Insert Delete Cell into Grid - if (data.disabled == false && data.canDelete) { + if (data.disabled && data.canDelete) { gridSchema.columns.unshift({ name: 'pg-backform-delete width_percent_5', label: '', cell: Backgrid.Extension.DeleteCell, @@ -404,7 +404,7 @@ function(gettext, $, Backbone, Backform, Backgrid, pgNode) { $gridBody.append(self.$grid); // Add button callback - if (!(data.disabled || data.canAdd == false)) { + if (!(data.disabled || !data.canAdd)) { $gridBody.find('button.add').first().on('click',(e) => { e.preventDefault(); let canAddRow = _.isFunction(data.canAddRow) ? diff --git a/web/pgadmin/browser/static/js/frame.js b/web/pgadmin/browser/static/js/frame.js index f671ceb48..39b1d6512 100644 --- a/web/pgadmin/browser/static/js/frame.js +++ b/web/pgadmin/browser/static/js/frame.js @@ -49,7 +49,7 @@ define([ $(myPanel).data('pgAdminName', that.name); myPanel.initSize(that.width, that.height); - if (myPanel.showTitle == false) + if (!myPanel.showTitle) myPanel.title(false); myPanel.icon(that.icon); diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js index 49c8198fc..854432fae 100644 --- a/web/pgadmin/browser/static/js/node.js +++ b/web/pgadmin/browser/static/js/node.js @@ -64,7 +64,7 @@ define('pgadmin.browser.node', [ child.callbacks = _.extend({}, parent.callbacks, props.callbacks); // Let's not bind the callbacks, or initialize the child. - if (initialize === false) + if (!initialize) return child; var bindToChild = function(cb) { @@ -1140,11 +1140,11 @@ define('pgadmin.browser.node', [ let tree = pgBrowser.tree, auto_expand = pgBrowser.get_preference('browser', 'auto_expand_sole_children'); - if (auto_expand && auto_expand.value == true && tree.children(item).length == 1) { + if (auto_expand && auto_expand.value && tree.children(item).length == 1) { // Automatically expand the child node, if a treeview node has only a single child. const first_child = tree.first(item); - if (first_child._loaded == true) { + if (first_child._loaded) { tree.open(first_child); } else { const openSoleItem = setInterval(() => { diff --git a/web/pgadmin/browser/static/js/quick_search/trigger_search.js b/web/pgadmin/browser/static/js/quick_search/trigger_search.js index 509b15fcf..ecbcb77fd 100644 --- a/web/pgadmin/browser/static/js/quick_search/trigger_search.js +++ b/web/pgadmin/browser/static/js/quick_search/trigger_search.js @@ -49,11 +49,11 @@ export function Search() { // Below will be called when any changes has been made to state useEffect(() => { - if(menuSearchResult.fetched == true){ + if(menuSearchResult.fetched){ setIsMenuLoading(false); } - if(helpSearchResult.fetched == true){ + if(helpSearchResult.fetched){ setIsHelpLoading(false); } }, [menuSearchResult, helpSearchResult]); @@ -97,11 +97,11 @@ export function Search() { for(let i=0; i < items.length; i++){ Object.keys(items[i]).forEach( (value) => { if(value != 'element' && value != 'No object selected'){ - menuItemsHtmlElement.push(
  • {items[i]['element'].click(); toggleDropdownMenu();}}> + menuItemsHtmlElement.push(
  • {items[i]['element'].click(); toggleDropdownMenu();}}> {value} {refactorPathToMenu(items[i][value])} - { ((items[i]['element'].classList.contains('disabled') == true && items[i]['element'].getAttribute('data-disabled') != undefined) ? : '' )} + { ((items[i]['element'].classList.contains('disabled') && items[i]['element'].getAttribute('data-disabled') != undefined) ? : '' )}
    • ); } }); @@ -200,7 +200,7 @@ export function Search() { :''}
    - { (menuSearchResult.fetched == true && isMenuLoading == false ) ? + { (menuSearchResult.fetched && !isMenuLoading ) ?
     {gettext('MENU ITEMS')} ({menuSearchResult.data.length}) @@ -210,9 +210,9 @@ export function Search() { {refactorMenuItems(menuSearchResult.data)}
    : ( (isMenuLoading) ? (
    {gettext('Searching...')}
    ) : '')} - {(menuSearchResult.data.length == 0 && menuSearchResult.fetched == true && isMenuLoading == false) ? (
    {gettext('No search results')}
    ):''} + {(menuSearchResult.data.length == 0 && menuSearchResult.fetched && !isMenuLoading) ? (
    {gettext('No search results')}
    ):''} - { (helpSearchResult.fetched == true && isHelpLoading == false) ? + { (helpSearchResult.fetched && !isHelpLoading) ?
     {gettext('HELP ARTICLES')} {Object.keys(helpSearchResult.data).length > 10 ? @@ -228,7 +228,7 @@ export function Search() { })} {(Object.keys(helpSearchResult.data).length == 0) ? (
    {gettext('No search results')}
    ):''} -
    : ( (isHelpLoading && isMenuLoading == false) ? ( +
    : ( (isHelpLoading && !isMenuLoading) ? (
    diff --git a/web/pgadmin/misc/cloud/static/js/biganimal.js b/web/pgadmin/misc/cloud/static/js/biganimal.js index 2420eb8a3..f53bfa156 100644 --- a/web/pgadmin/misc/cloud/static/js/biganimal.js +++ b/web/pgadmin/misc/cloud/static/js/biganimal.js @@ -214,7 +214,7 @@ export function validateBigAnimalStep3(cloudDBDetails, nodeInfo) { isError = true; } - if(cloudDBDetails.high_availability == true && (isEmptyString(cloudDBDetails.replicas) || cloudDBDetails.replicas <= 0)) { + if(cloudDBDetails.high_availability && (isEmptyString(cloudDBDetails.replicas) || cloudDBDetails.replicas <= 0)) { isError = true; } if (isEmptyString(cloudDBDetails.gid)) cloudDBDetails.gid = nodeInfo['server_group']._id; diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js index 935a3dbc7..df5019218 100644 --- a/web/pgadmin/static/js/backform.pgadmin.js +++ b/web/pgadmin/static/js/backform.pgadmin.js @@ -1442,7 +1442,7 @@ define([ } // Insert Edit Cell into Grid - if (data.disabled == false && data.canEdit) { + if (!data.disabled && data.canEdit) { let editCell = Backgrid.Extension.ObjectCell.extend({ schema: gridSchema.schema, }); @@ -1521,7 +1521,7 @@ define([ } // Add button callback - if (!(data.disabled || data.canAdd == false)) { + if (!(data.disabled || !data.canAdd)) { $dialog.find('button.add').first().on('click',(e) => { e.preventDefault(); let canAddRow = _.isFunction(data.canAddRow) ? @@ -1703,12 +1703,12 @@ define([ } // Set visibility of Add button - if (data.disabled || data.canAdd == false) { + if (data.disabled || !data.canAdd) { $(gridBody).find('button.add').remove(); } // Insert Delete Cell into Grid - if (data.disabled == false && data.canDelete) { + if (!data.disabled && data.canDelete) { gridSchema.columns.unshift({ name: 'pg-backform-delete', label: '', @@ -1722,7 +1722,7 @@ define([ } // Insert Edit Cell into Grid - if (data.disabled == false && data.canEdit) { + if (!data.disabled && data.canEdit) { let editCell = Backgrid.Extension.ObjectCell.extend({ schema: gridSchema.schema, }),