Remove Alertify from pgAdmin completely. Fixes #7619

docs/en_US/preferences.rst

@@ -43,13 +43,6 @@ Use the fields on the *Display* panel to specify general display preferences:
   attempt to catch browser close or refresh events and prompt before allowing
   them to continue.
 
-* When the *Enable browser tree animation?* switch is set to *True*, the client
-  will display the animated tree control otherwise it will be unanimated.
-
-* When the *Enable dialogue/notification animation?* switch is set to *True*,
-  the client will display the animated dialogues/notifications otherwise it
-  will be unanimated.
-
 * When the *Hide shared servers?* switch is set to *True*, the client will hide
   all the shared servers from the browser tree.
 

web/package.json

@@ -92,7 +92,6 @@
     "@types/react": "^16.7.18",
     "@types/react-dom": "^16.0.11",
     "ajv": "^8.8.2",
-    "alertifyjs": "git+https://github.com/EnterpriseDB/AlertifyJS/#72c1d794f5b6d4ec13a68d123c08f19021afe263",
     "anti-trojan-source": "^1.4.0",
     "aspen-decorations": "^1.0.2",
     "axios": "^0.21.1",

web/pgadmin/__init__.py

@@ -222,7 +222,7 @@ def create_app(app_name=None):
 
         config.SECURITY_RECOVERABLE = True
         config.SECURITY_CHANGEABLE = True
-        # Now we'll open change password page in alertify dialog
+        # Now we'll open change password page in dialog
         # we don't want it to redirect to main page after password
         # change operation so we will open the same password change page again.
         config.SECURITY_POST_CHANGE_VIEW = 'browser.change_password'

web/pgadmin/browser/register_browser_preferences.py

@@ -45,18 +45,6 @@ def register_browser_preferences(self):
             )
         )
 
-    self.preference.register(
-        'display', 'enable_acitree_animation',
-        gettext("Enable browser tree animation?"), 'boolean', True,
-        category_label=PREF_LABEL_DISPLAY
-    )
-
-    self.preference.register(
-        'display', 'enable_alertify_animation',
-        gettext("Enable dialogue/notification animation?"), 'boolean',
-        True, category_label=PREF_LABEL_DISPLAY
-    )
-
     self.preference.register(
         'display', 'browser_tree_state_save_interval',
         gettext("Browser tree state saving interval"), 'integer',

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

@@ -11,10 +11,10 @@ import CastSchema from './cast.ui';
 import getApiInstance from '../../../../../../../static/js/api_instance';
 
 define('pgadmin.node.cast', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.alertifyjs', 'pgadmin.backform', 'pgadmin.browser.collection',
+  'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
   // Extend the collection class for cast
   if (!pgBrowser.Nodes['coll-cast']) {
     pgAdmin.Browser.Nodes['coll-cast'] =

web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.js

@@ -11,9 +11,9 @@ import EventTriggerSchema from './event_trigger.ui';
 import { getNodeListByName, getNodeAjaxOptions } from '../../../../../../static/js/node_ajax';
 
 define('pgadmin.node.event_trigger', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
 
   // Extend the browser's collection class for event trigger collection
   if (!pgBrowser.Nodes['coll-event_trigger']) {

web/pgadmin/browser/server_groups/servers/databases/extensions/static/js/extension.js

@@ -10,11 +10,12 @@
 
 import { getNodeAjaxOptions, getNodeListByName } from '../../../../../../static/js/node_ajax';
 import ExtensionsSchema from './extension.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.extension', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
 
   /*
    * Create and Add an Extension Collection into nodes

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js

@@ -12,10 +12,10 @@ import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.u
 import ForeignServerSchema from './foreign_server.ui';
 
 define('pgadmin.node.foreign_server', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'sources/pgadmin',
+  'sources/gettext', 'sources/url_for', 'sources/pgadmin',
   'pgadmin.browser', 'pgadmin.browser.collection',
   'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
 
   // Extend the browser's collection class for foreign server collection
   if (!pgBrowser.Nodes['coll-foreign_server']) {

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

@@ -9,12 +9,13 @@
 
 import { getNodeListByName } from '../../../../../../../../static/js/node_ajax';
 import UserMappingSchema from './user_mapping.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.user_mapping', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.backform', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Backform) {
+], function(gettext, url_for, pgAdmin, pgBrowser, Backform) {
 
   // Extend the browser's collection class for user mapping collection
   if (!pgBrowser.Nodes['coll-user_mapping']) {

web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js

@@ -12,10 +12,9 @@ import { getNodePrivilegeRoleSchema } from '../../../../static/js/privilege.ui';
 import ForeignDataWrapperSchema from './foreign_data_wrapper.ui';
 
 define('pgadmin.node.foreign_data_wrapper', [
-  'sources/gettext', 'sources/url_for', 'jquery',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   // Extend the browser's collection class for foreign data wrapper collection
   if (!pgBrowser.Nodes['coll-foreign_data_wrapper']) {

web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js

@@ -12,10 +12,9 @@ import LanguageSchema from './language.ui';
 import { getNodePrivilegeRoleSchema } from '../../../../static/js/privilege.ui';
 
 define('pgadmin.node.language', [
-  'sources/gettext', 'sources/url_for', 'jquery',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   // Extend the browser's collection class for languages collection
   if (!pgBrowser.Nodes['coll-language']) {

web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.js

@@ -11,10 +11,9 @@ import { getNodeAjaxOptions, getNodeListByName } from '../../../../../../static/
 import PublicationSchema from './publication.ui';
 
 define('pgadmin.node.publication', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   // Extend the browser's collection class for publications collection
   if (!pgBrowser.Nodes['coll-publication']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/static/js/aggregate.js

@@ -10,10 +10,9 @@
 import AggregateSchema from './aggregate.ui';
 
 define('pgadmin.node.aggregate', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/pgadmin', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChild) {
+], function(gettext, pgAdmin, pgBrowser, schemaChild) {
 
   if (!pgBrowser.Nodes['coll-aggregate']) {
     pgAdmin.Browser.Nodes['coll-aggregate'] =

web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.js

@@ -9,9 +9,9 @@
 import CatalogObjectColumnSchema from './catalog_object_column.ui';
 
 define('pgadmin.node.catalog_object_column', [
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
+  'sources/gettext', 'sources/pgadmin',
   'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, $, _, pgAdmin, pgBrowser) {
+], function(gettext, pgAdmin, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-catalog_object_column']) {
     pgAdmin.Browser.Nodes['coll-catalog_object_column'] =

web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/static/js/catalog_object.js

@@ -10,9 +10,9 @@
 import CatalogObjectSchema from './catalog_object.ui';
 
 define('pgadmin.node.catalog_object', [
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
+  'sources/gettext', 'sources/pgadmin',
   'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, $, _, pgAdmin, pgBrowser) {
+], function(gettext, pgAdmin, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-catalog_object']) {
     pgAdmin.Browser.Nodes['coll-catalog_object'] =

web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js

@@ -11,11 +11,11 @@ import CollationSchema from './collation.ui';
 import { getNodeAjaxOptions, getNodeListByName } from '../../../../../../../static/js/node_ajax';
 
 define('pgadmin.node.collation', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChild,
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChild,
   schemaChildTreeNode) {
 
   if (!pgBrowser.Nodes['coll-collation']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/static/js/domain_constraints.js

@@ -11,10 +11,10 @@ import DomainConstraintSchema from './domain_constraints.ui';
 
 // Domain Constraint Module: Collection and Node
 define('pgadmin.node.domain_constraints', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChildTreeNode) {
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChildTreeNode) {
 
   // Define Domain Constraint Collection Node
   if (!pgBrowser.Nodes['coll-domain_constraints']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js

@@ -12,13 +12,11 @@ import DomainSchema from './domain.ui';
 
 // Domain Module: Collection and Node.
 define('pgadmin.node.domain', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser, Backform, Backgrid,
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
-  schemaChild, schemaChildTreeNode
 ) {
 
   // Define Domain Collection Node

web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js

@@ -14,13 +14,11 @@ import _ from 'lodash';
 
 /* Create and Register Foreign Table Collection and Node. */
 define('pgadmin.node.foreign_table', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'backbone',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backgrid',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, Backbone, pgAdmin, pgBrowser, Backgrid,
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
-  schemaChild, schemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-foreign_table']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js

@@ -11,13 +11,11 @@ import { getNodeAjaxOptions, getNodeListByName, getNodeListById} from '../../../
 import FTSConfigurationSchema from './fts_configuration.ui';
 
 define('pgadmin.node.fts_configuration', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
+  'sources/gettext', 'sources/url_for', 'sources/pgadmin', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser, Backform, Backgrid,
+  gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode
-  schemaChild, schemaChildTreeNode
 ) {
 
   // Extend the collection class for FTS Configuration

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.js

@@ -11,13 +11,12 @@ import { getNodeAjaxOptions, getNodeListByName, getNodeListById} from '../../../
 import FTSDictionarySchema from './fts_dictionary.ui';
 
 define('pgadmin.node.fts_dictionary', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, schemaChild,
+  gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode
-  schemaChildTreeNode
 ) {
 
   // Extend the collection class for FTS Dictionary

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.js

@@ -11,10 +11,10 @@ import FTSParserSchema from './fts_parser.ui';
 import { getNodeAjaxOptions, getNodeListById } from '../../../../../../../static/js/node_ajax';
 
 define('pgadmin.node.fts_parser', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.node.schema.dir/child',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
 
   // Extend the collection class for fts parser
   if (!pgBrowser.Nodes['coll-fts_parser']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.js

@@ -11,10 +11,10 @@ import FTSTemplateSchema from './fts_template.ui';
 import { getNodeAjaxOptions, getNodeListById } from '../../../../../../../static/js/node_ajax';
 
 define('pgadmin.node.fts_template', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.node.schema.dir/child',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
 
   // Extend the collection class for fts template
   if (!pgBrowser.Nodes['coll-fts_template']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.js

@@ -14,13 +14,11 @@ import { getNodeVariableSchema } from '../../../../../static/js/variable.ui';
 
 /* Create and Register Function Collection and Node. */
 define('pgadmin.node.function', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'backbone',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, Backbone, pgAdmin, pgBrowser, Backform, schemaChild,
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
-  schemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-function']) {

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

@@ -14,13 +14,11 @@ import { getNodeVariableSchema } from '../../../../../static/js/variable.ui';
 
 /* Create and Register Procedure Collection and Node. */
 define('pgadmin.node.procedure', [
-  'sources/gettext', 'sources/url_for', 'jquery',
+  'sources/gettext', 'sources/url_for',
-  'sources/pgadmin', 'pgadmin.browser', 'alertify',
+  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.node.schema.dir/child',
-  'pgadmin.node.function', 'pgadmin.node.schema.dir/child',
   'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, pgAdmin, pgBrowser, alertify, Function,
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
-  schemaChild, schemaChildTreeNode) {
 
   if (!pgBrowser.Nodes['coll-procedure']) {
     pgAdmin.Browser.Nodes['coll-procedure'] =

web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js

@@ -10,15 +10,15 @@ import TriggerFunctionSchema from './trigger_function.ui';
 import { getNodeListByName, getNodeListById, getNodeAjaxOptions } from '../../../../../../../static/js/node_ajax';
 import { getNodeVariableSchema } from '../../../../../static/js/variable.ui';
 import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.ui';
+import _ from 'lodash';
 
 /* Create and Register Function Collection and Node. */
 define('pgadmin.node.trigger_function', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, schemaChild, schemaChildTreeNode
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-trigger_function']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/operators/static/js/operator.js

@@ -10,10 +10,10 @@
 import OperatorSchema from './operator.ui';
 
 define('pgadmin.node.operator', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChild) {
+], function(gettext, pgAdmin, pgBrowser, schemaChild) {
 
   if (!pgBrowser.Nodes['coll-operator']) {
     pgAdmin.Browser.Nodes['coll-operator'] =

web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.js

@@ -11,10 +11,9 @@ import EDBFuncSchema from './edbfunc.ui';
 
 /* Create and Register Function Collection and Node. */
 define('pgadmin.node.edbfunc', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-edbfunc']) {
     pgBrowser.Nodes['coll-edbfunc'] =

web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbproc.js

@@ -8,15 +8,16 @@
 //////////////////////////////////////////////////////////////
 
 import EDBFuncSchema from './edbfunc.ui';
+import _ from 'lodash';
 
 /* Create and Register Procedure Collection and Node. */
 define('pgadmin.node.edbproc', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.edbfunc', 'pgadmin.browser.collection',
   'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, EdbFunction
+  gettext, url_for, pgAdmin, pgBrowser, EdbFunction
 ) {
 
   if (!pgBrowser.Nodes['coll-edbproc']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.js

@@ -11,10 +11,9 @@ import EDBVarSchema from './edbvar.ui';
 
 /* Create and Register Function Collection and Node. */
 define('pgadmin.node.edbvar', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-edbvar']) {
     pgBrowser.Nodes['coll-edbvar'] =

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

@@ -11,13 +11,12 @@ import PackageSchema from './package.ui';
 import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.ui';
 import { getNodeListByName } from '../../../../../../../static/js/node_ajax';
 
+
 define('pgadmin.node.package', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, schemaChild,
+], function(gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode) {
-  schemaChildTreeNode) {
 
   // Extend the browser's collection class for package collection
   if (!pgBrowser.Nodes['coll-package']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js

@@ -12,13 +12,11 @@ import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.u
 import SequenceSchema from './sequence.ui';
 
 define('pgadmin.node.sequence', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, schemaChild,
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
-  schemaChildTreeNode
 ) {
 
   // Extend the browser's collection class for sequence collection

web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.js

@@ -10,9 +10,8 @@
 import CatalogSchema from './catalog.ui';
 
 define('pgadmin.node.catalog', [
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
+  'sources/gettext', 'pgadmin.browser', 'pgadmin.browser.collection',
-  'pgadmin.browser', 'pgadmin.browser.collection',
+], function(gettext, pgBrowser) {
-], function(gettext, $, _, pgAdmin, pgBrowser) {
 
   // Extend the browser's collection class for catalog collection
   if (!pgBrowser.Nodes['coll-catalog']) {

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

@@ -10,12 +10,13 @@
 import PGSchema from './schema.ui';
 import { getNodePrivilegeRoleSchema } from '../../../../static/js/privilege.ui';
 import { getNodeListByName } from '../../../../../../static/js/node_ajax';
+import _ from 'lodash';
 
 define('pgadmin.node.schema', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
+  'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, Backgrid) {
+], function(gettext, url_for, $, pgBrowser, Backform, Backgrid) {
 
   // VacuumSettings Collection to display all settings parameters as Grid
   Backform.VacuumCollectionControl =

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

@@ -9,14 +9,14 @@
 
 import { getNodeAjaxOptions, getNodeListByName } from '../../../../../../../static/js/node_ajax';
 import SynonymSchema from './synonym.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.synonym', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
+  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, alertify,
+], function(gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode) {
-  schemaChild, schemaChildTreeNode) {
 
   if (!pgBrowser.Nodes['coll-synonym']) {
     pgAdmin.Browser.Nodes['coll-synonym'] =

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

@@ -8,14 +8,13 @@
 //////////////////////////////////////////////////////////////
 
 import { getNodeColumnSchema } from './column.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.column', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser, Backform, Backgrid,
+  gettext, url_for, pgBrowser, SchemaChildTreeNode
-  SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-column']) {

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

@@ -1,3 +1,12 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
+
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import VariableSchema from 'top/browser/server_groups/servers/static/js/variable.ui';

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

@@ -12,12 +12,12 @@ import CompoundTriggerSchema from './compound_trigger.ui';
 import Notify from '../../../../../../../../../static/js/helpers/Notifier';
 
 define('pgadmin.node.compound_trigger', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, SchemaChildTreeNode
+  gettext, url_for, $, pgAdmin, pgBrowser, SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-compound_trigger']) {

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

@@ -9,13 +9,14 @@
 
 import CheckConstraintSchema from './check_constraint.ui';
 import Notify from '../../../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 // Check Constraint Module: Node
 define('pgadmin.node.check_constraint', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, schemaChildTreeNode) {
+], function(gettext, url_for, $, pgAdmin, pgBrowser, schemaChildTreeNode) {
 
   // Check Constraint Node
   if (!pgBrowser.Nodes['check_constraint']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.ui.js

@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import _ from 'lodash';

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

@@ -8,12 +8,13 @@
 //////////////////////////////////////////////////////////////
 
 import { getNodeExclusionConstraintSchema } from './exclusion_constraint.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.exclusion_constraint', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser
+  gettext, url_for, pgAdmin, pgBrowser
 ) {
   // Extend the browser's node class for exclusion constraint node
   if (!pgBrowser.Nodes['exclusion_constraint']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js

@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import _ from 'lodash';

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

@@ -9,12 +9,13 @@
 
 import { getNodeForeignKeySchema } from './foreign_key.ui';
 import Notify from '../../../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define('pgadmin.node.foreign_key', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser
+  gettext, url_for, $, pgAdmin, pgBrowser
 ) {
   // Extend the browser's node class for foreign key node
   if (!pgBrowser.Nodes['foreign_key']) {

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

@@ -1,3 +1,12 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
+
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import _ from 'lodash';

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

@@ -9,12 +9,13 @@
 
 import { getNodeListByName } from '../../../../../../../../../static/js/node_ajax';
 import PrimaryKeySchema from './primary_key.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.primary_key', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, Backgrid) {
+], function(gettext, url_for, pgAdmin, pgBrowser, Backform, Backgrid) {
 
   // Extend the browser's node class for index constraint node
   if (!pgBrowser.Nodes['primary_key']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.ui.js

@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import _ from 'lodash';

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

@@ -9,11 +9,12 @@
 
 import { getNodeListByName } from '../../../../../../../../../static/js/node_ajax';
 import UniqueConstraintSchema from './unique_constraint.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.unique_constraint', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
 
   // Extend the browser's node class for index constraint node
   if (!pgBrowser.Nodes['unique_constraint']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.ui.js

@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import _ from 'lodash';

web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/static/js/constraints.js

@@ -8,12 +8,12 @@
 //////////////////////////////////////////////////////////////
 
 define('pgadmin.node.constraints', [
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
+  'sources/gettext', 'sources/pgadmin',
   'pgadmin.browser', 'pgadmin.browser.collection',
   'pgadmin.node.unique_constraint', 'pgadmin.node.check_constraint',
   'pgadmin.node.foreign_key', 'pgadmin.node.exclusion_constraint',
   'pgadmin.node.primary_key',
-], function(gettext, $, _, pgAdmin, pgBrowser) {
+], function(gettext, pgAdmin, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-constraints']) {
     pgAdmin.Browser.Nodes['coll-constraints'] =

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

@@ -9,16 +9,15 @@
 
 import IndexSchema, { getColumnSchema } from './index.ui';
 import { getNodeAjaxOptions, getNodeListByName } from 'pgbrowser/node_ajax';
+import _ from 'lodash';
 
 define('pgadmin.node.index', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
-  'backbone', 'sources/pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
+  'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser, Alertify, Backform,
+  gettext, url_for, pgAdmin, pgBrowser, SchemaChildTreeNode
-  Backgrid, SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-index']) {

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

@@ -9,16 +9,16 @@
 
 import { getNodePartitionTableSchema } from './partition.ui';
 import Notify from '../../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define([
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.alertifyjs', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'sources/utils',
   'pgadmin.browser.collection',
 ],
 function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Alertify, Backform, Backgrid,
+  gettext, url_for, $, pgAdmin, pgBrowser,
   SchemaChildTreeNode, pgadminUtils
 ) {
 

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

@@ -1,3 +1,12 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
+
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import SecLabelSchema from 'top/browser/server_groups/servers/static/js/sec_label.ui';

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

@@ -11,14 +11,12 @@ import { getNodeListByName } from '../../../../../../../../static/js/node_ajax';
 
 
 define('pgadmin.node.row_security_policy', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.backform', 'pgadmin.alertifyjs',
   'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, alertify,
+  gettext, url_for, pgAdmin, pgBrowser, SchemaChildTreeNode
-  SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-row_security_policy']) {

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

@@ -8,12 +8,13 @@
 //////////////////////////////////////////////////////////////
 import RuleSchema from './rule.ui';
 import Notify from '../../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define('pgadmin.node.rule', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.schema.dir/schema_child_tree_node',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, SchemaChildTreeNode) {
+], function(gettext, url_for, $, pgAdmin, pgBrowser, SchemaChildTreeNode) {
 
   /**
     Create and add a rule collection into nodes

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

@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import _ from 'lodash';
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';

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

@@ -8,19 +8,18 @@
 
 import { getNodeTableSchema } from './table.ui';
 import Notify from '../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define('pgadmin.node.table', [
   'pgadmin.tables.js/enable_disable_triggers',
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.alertifyjs', 'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.node.schema.dir/child','pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection', 'pgadmin.node.column',
   'pgadmin.node.constraints',
 ], function(
   tableFunctions,
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Alertify, Backform, Backgrid,
+  gettext, url_for, $, pgAdmin, pgBrowser, SchemaChild, SchemaChildTreeNode
-  SchemaChild, SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-table']) {

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

@@ -1,3 +1,11 @@
+/////////////////////////////////////////////////////////////
+//
+// pgAdmin 4 - PostgreSQL Tools
+//
+// Copyright (C) 2013 - 2022, The pgAdmin Development Team
+// This software is released under the PostgreSQL Licence
+//
+//////////////////////////////////////////////////////////////
 import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import SecLabelSchema from 'top/browser/server_groups/servers/static/js/sec_label.ui';

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

@@ -9,14 +9,15 @@
 import { getNodeListByName, getNodeAjaxOptions } from '../../../../../../../../static/js/node_ajax';
 import TriggerSchema from './trigger.ui';
 import Notify from '../../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define('pgadmin.node.trigger', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.backform', 'pgadmin.node.schema.dir/schema_child_tree_node',
+  'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, SchemaChildTreeNode
+  gettext, url_for, $, pgAdmin, pgBrowser, SchemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-trigger']) {

web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js

@@ -12,13 +12,11 @@ import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.u
 import TypeSchema, { getCompositeSchema, getRangeSchema, getExternalSchema, getDataTypeSchema } from './type.ui';
 
 define('pgadmin.node.type', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
+  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.node.schema.dir/child',
-  'pgadmin.backgrid', 'pgadmin.node.schema.dir/child',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'pgadmin.browser.collection',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, Backgrid,
+  gettext, url_for, pgAdmin, pgBrowser, schemaChild, schemaChildTreeNode
-  schemaChild, schemaChildTreeNode
 ) {
 
   if (!pgBrowser.Nodes['coll-type']) {

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

@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import SecLabelSchema from '../../../../../static/js/sec_label.ui';
 
 import { getNodeAjaxOptions } from '../../../../../../../static/js/node_ajax';
-import _ from 'underscore';
+import _ from 'lodash';
 import getApiInstance from 'sources/api_instance';
 import { isEmptyString } from 'sources/validators';
 

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

@@ -12,15 +12,16 @@ import { getNodeListByName } from '../../../../../../../static/js/node_ajax';
 import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.ui';
 import { getNodeVacuumSettingsSchema } from '../../../../../static/js/vacuum.ui';
 import Notify from '../../../../../../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define('pgadmin.node.mview', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
-  'sources/pgadmin', 'pgadmin.alertifyjs', 'pgadmin.browser',
+  'sources/pgadmin', 'pgadmin.browser',
-  'pgadmin.backform', 'pgadmin.node.schema.dir/child',
+  'pgadmin.node.schema.dir/child',
   'pgadmin.node.schema.dir/schema_child_tree_node', 'sources/utils',
   'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, _, pgAdmin, Alertify, pgBrowser, Backform,
+  gettext, url_for, $, pgAdmin, pgBrowser,
   schemaChild, schemaChildTreeNode, commonUtils
 ) {
 
@@ -178,7 +179,7 @@ define('pgadmin.node.mview', [
           return;
         }
 
-        if (!commonUtils.hasBinariesConfiguration(pgBrowser, server_data, Alertify)) {
+        if (!commonUtils.hasBinariesConfiguration(pgBrowser, server_data)) {
           return;
         }
 

web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.js

@@ -12,12 +12,11 @@ import { getNodePrivilegeRoleSchema } from '../../../../../static/js/privilege.u
 import ViewSchema from './view.ui';
 
 define('pgadmin.node.view', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.backform',
   'pgadmin.node.schema.dir/child', 'pgadmin.node.schema.dir/schema_child_tree_node',
   'pgadmin.browser.server.privilege', 'pgadmin.node.rule',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser, Backform, schemaChild, schemaChildTreeNode
+  gettext, url_for, pgBrowser, schemaChild, schemaChildTreeNode
 ) {
 
 

web/pgadmin/browser/server_groups/servers/databases/static/js/database.js

@@ -13,14 +13,14 @@ import { getNodeVariableSchema } from '../../../static/js/variable.ui';
 import DatabaseSchema from './database.ui';
 import Notify from '../../../../../../static/js/helpers/Notifier';
 import { showServerPassword } from '../../../../../../static/js/Dialogs/index';
+import _ from 'lodash';
 
 define('pgadmin.node.database', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
-  'sources/utils', 'sources/pgadmin', 'pgadmin.browser.utils',
+  'sources/pgadmin', 'pgadmin.browser.utils',
-  'pgadmin.alertifyjs', 'pgadmin.backform',
   'pgadmin.authenticate.kerberos', 'pgadmin.browser.collection',
   'pgadmin.browser.server.privilege', 'pgadmin.browser.server.variable',
-], function(gettext, url_for, $, _, pgadminUtils, pgAdmin, pgBrowser, Alertify, Backform, Kerberos) {
+], function(gettext, url_for, $, pgAdmin, pgBrowser, Kerberos) {
 
   if (!pgBrowser.Nodes['coll-database']) {
     pgBrowser.Nodes['coll-database'] =

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

@@ -13,9 +13,9 @@ import _ from 'lodash';
 import Notify from '../../../../../../../static/js/helpers/Notifier';
 
 define('pgadmin.node.subscription', [
-  'sources/gettext', 'sources/url_for', 'jquery',
+  'sources/gettext', 'sources/url_for',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection',
+  'pgadmin.browser', 'pgadmin.browser.collection',
-], function(gettext, url_for, $, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   // Extend the browser's collection class for subscriptions collection
   if (!pgBrowser.Nodes['coll-subscription']) {

web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.js

@@ -10,10 +10,9 @@
 import PgaJobScheduleSchema from './pga_schedule.ui';
 
 define('pgadmin.node.pga_schedule', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
-  'sources/pgadmin', 'moment', 'pgadmin.browser',
 ], function(
-  gettext, url_for, $, _, pgAdmin, moment, pgBrowser
+  gettext, url_for, pgBrowser
 ) {
 
   if (!pgBrowser.Nodes['coll-pga_schedule']) {

web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js

@@ -13,10 +13,9 @@ import { getNodePgaJobStepSchema } from '../../steps/static/js/pga_jobstep.ui';
 import Notify from '../../../../../../static/js/helpers/Notifier';
 
 define('pgadmin.node.pga_job', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery', 'pgadmin.browser',
-  'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.node.pga_jobstep', 'pgadmin.node.pga_schedule',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, $, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-pga_job']) {
     pgBrowser.Nodes['coll-pga_job'] =

web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.js

@@ -8,12 +8,12 @@
 //////////////////////////////////////////////////////////////
 
 import { getNodePgaJobStepSchema } from './pga_jobstep.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.pga_jobstep', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser', 'backform',
-  'sources/pgadmin', 'pgadmin.browser', 'alertify', 'backform',
   'backgrid', 'pgadmin.backform',
-], function(gettext, url_for, $, _, pgAdmin, pgBrowser, Alertify, Backform) {
+], function(gettext, url_for, pgBrowser, Backform) {
 
   if (!pgBrowser.Nodes['coll-pga_jobstep']) {
     pgBrowser.Nodes['coll-pga_jobstep'] =

web/pgadmin/browser/server_groups/servers/resource_groups/static/js/resource_group.js

@@ -10,9 +10,9 @@
 import ResourceGroupSchema from './resource_group.ui';
 
 define('pgadmin.node.resource_group', [
-  'sources/gettext', 'sources/url_for', 'underscore', 'pgadmin.browser',
+  'sources/gettext', 'sources/url_for', 'pgadmin.browser',
   'pgadmin.browser.collection',
-], function(gettext, url_for, _, pgBrowser) {
+], function(gettext, url_for, pgBrowser) {
 
   // Extend the browser's collection class for resource group collection
   if (!pgBrowser.Nodes['coll-resource_group']) {

web/pgadmin/browser/server_groups/servers/roles/static/js/role.js

@@ -13,9 +13,9 @@ import { getMembershipSchema } from '../../../static/js/membership.ui';
 import { showRoleReassign } from './roleReassign';
 
 define('pgadmin.node.role', [
-  'sources/gettext', 'sources/url_for', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.browser'
-], function(gettext, url_for, _, pgAdmin, pgBrowser) {
+], function(gettext, url_for, pgAdmin, pgBrowser) {
 
   if (!pgBrowser.Nodes['coll-role']) {
     pgAdmin.Browser.Nodes['coll-role'] =

web/pgadmin/browser/server_groups/servers/static/js/privilege.js

@@ -7,9 +7,11 @@
 //
 //////////////////////////////////////////////////////////////
 
-define(['sources/gettext', 'underscore', 'jquery', 'backbone', 'backform',
+import _ from 'lodash';
-  'backgrid', 'alertify', 'pgadmin.browser.node', 'sources/utils', 'pgadmin.browser.node.ui',
+
-], function(gettext, _, $, Backbone, Backform, Backgrid, Alertify, pgNode, commonUtils) {
+define(['sources/gettext', 'jquery', 'backbone',
+  'backgrid', 'pgadmin.browser.node', 'sources/utils', 'pgadmin.browser.node.ui',
+], function(gettext, $, Backbone, Backgrid, pgNode, commonUtils) {
   /**
    * Each Privilege, supporeted by an database object, will be represented
    * using this Model.

web/pgadmin/browser/server_groups/servers/static/js/server.js

@@ -11,15 +11,16 @@ import { getNodeListById } from '../../../../static/js/node_ajax';
 import ServerSchema from './server.ui';
 import Notify from '../../../../../static/js/helpers/Notifier';
 import { showServerPassword, showChangeServerPassword, showNamedRestorePoint } from '../../../../../static/js/Dialogs/index';
+import _ from 'lodash';
 
 define('pgadmin.node.server', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'jquery',
   'sources/pgadmin', 'pgadmin.browser',
   'pgadmin.user_management.current_user',
   'pgadmin.authenticate.kerberos',
   'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, _, pgAdmin, pgBrowser,
+  gettext, url_for, $, pgAdmin, pgBrowser,
   current_user, Kerberos,
 ) {
 

web/pgadmin/browser/server_groups/servers/static/js/variable.js

@@ -7,11 +7,13 @@
 //
 //////////////////////////////////////////////////////////////
 
+import _ from 'lodash';
+
 define([
-  'sources/gettext', 'underscore', 'jquery', 'backbone', 'backform', 'backgrid', 'alertify',
+  'sources/gettext', 'jquery', 'backbone', 'backform', 'backgrid',
-  'sources/pgadmin', 'pgadmin.browser.node', 'pgadmin.browser.node.ui',
+  'pgadmin.browser.node', 'pgadmin.browser.node.ui',
 ],
-function(gettext, _, $, Backbone, Backform, Backgrid, Alertify, pgAdmin, pgNode) {
+function(gettext, $, Backbone, Backform, Backgrid, pgNode) {
 
   /*
      * cellFunction for variable control.

web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js

@@ -11,13 +11,14 @@ import { getNodeListByName } from '../../../../../static/js/node_ajax';
 import { getNodePrivilegeRoleSchema } from '../../../static/js/privilege.ui';
 import { getNodeVariableSchema } from '../../../static/js/variable.ui';
 import TablespaceSchema from './tablespace.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.tablespace', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'backbone',
+  'sources/gettext', 'sources/url_for',
-  'sources/pgadmin', 'pgadmin.browser', 'pgadmin.browser.collection', 'pgadmin.browser.node.ui',
+  'pgadmin.browser', 'pgadmin.browser.collection', 'pgadmin.browser.node.ui',
   'pgadmin.browser.server.privilege',
 ], function(
-  gettext, url_for, $, _, Backbone, pgAdmin, pgBrowser
+  gettext, url_for, pgBrowser
 ) {
 
   if (!pgBrowser.Nodes['coll-tablespace']) {

web/pgadmin/browser/server_groups/static/js/server_group.js

@@ -7,11 +7,12 @@
 //
 //////////////////////////////////////////////////////////////
 import ServerGroupSchema from './server_group.ui';
+import _ from 'lodash';
 
 define('pgadmin.node.server_group', [
-  'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for',
   'sources/pgadmin', 'pgadmin.user_management.current_user', 'pgadmin.browser', 'pgadmin.browser.node',
-], function(gettext, url_for, $, _, pgAdmin, current_user) {
+], function(gettext, url_for, pgAdmin, current_user) {
 
   if (!pgAdmin.Browser.Nodes['server_group']) {
     pgAdmin.Browser.Nodes['server_group'] = pgAdmin.Browser.Node.extend({

web/pgadmin/browser/static/css/wizard.css

@@ -45,8 +45,7 @@
   padding: 0.5rem 0rem;
 }
 
-/* In wizard select2 dropdown doesn't
+/* In wizard select2 dropdown doesn't popup.
- * popup because z-index of alertify
  * wizard is greater than the z-index
  * of select2 dropdown. To make select2
  * visible, set z-index of select2

web/pgadmin/browser/static/js/activity.js

@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////
 
 import $ from 'jquery';
-import _ from 'underscore';
+import _ from 'lodash';
 
 import pgAdmin from 'sources/pgadmin';
 import pgWindow from 'sources/window';

web/pgadmin/browser/static/js/browser.js

@@ -8,12 +8,14 @@
 //////////////////////////////////////////////////////////////
 
 import { generateNodeUrl } from './node_ajax';
+import _ from 'lodash';
 import Notify, {initializeModalProvider, initializeNotifier} from '../../../static/js/helpers/Notifier';
 import { checkMasterPassword } from '../../../static/js/Dialogs/index';
+import { pgHandleItemError } from '../../../static/js/utils';
 
 define('pgadmin.browser', [
-  'sources/gettext', 'sources/url_for', 'require', 'jquery', 'underscore',
+  'sources/gettext', 'sources/url_for', 'require', 'jquery',
-  'bootstrap', 'sources/pgadmin', 'pgadmin.alertifyjs', 'bundled_codemirror',
+  'bootstrap', 'sources/pgadmin', 'bundled_codemirror',
   'sources/check_node_visibility', './toolbar', 'pgadmin.help',
   'sources/csrf', 'sources/utils', 'sources/window', 'pgadmin.authenticate.kerberos',
   'sources/tree/tree_init',
@@ -25,8 +27,8 @@ define('pgadmin.browser', [
   'sources/codemirror/addon/fold/pgadmin-sqlfoldcode',
   'pgadmin.browser.keyboard', 'sources/tree/pgadmin_tree_save_state'
 ], function(
-  gettext, url_for, require, $, _,
+  gettext, url_for, require, $,
-  Bootstrap, pgAdmin, Alertify, codemirror,
+  Bootstrap, pgAdmin, codemirror,
   checkNodeVisibility, toolBar, help, csrfToken, pgadminUtils, pgWindow,
   Kerberos, InitTree,
 ) {
@@ -1707,12 +1709,10 @@ define('pgadmin.browser', [
               success();
             }
           })
-          .fail(function(xhr, error, status) {
+          .fail(function(xhr, error) {
-            if (
+            if (!pgHandleItemError(
-              !Alertify.pgHandleItemError(
+              xhr, {item: __i, info: info}
-                xhr, error, status, {item: __i, info: info}
+            )) {
-              )
-            ) {
               var contentType = xhr.getResponseHeader('Content-Type'),
                 jsonResp = (
                   contentType &&

web/pgadmin/browser/static/js/collection.js

@@ -7,13 +7,14 @@
 //
 //////////////////////////////////////////////////////////////
 import {getPanelView} from './panel_view';
+import _ from 'lodash';
 
 define([
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
+  'sources/gettext', 'sources/pgadmin',
-  'backbone', 'alertify', 'backform', 'backgrid', 'sources/browser/generate_url',
+  'sources/browser/generate_url',
   'pgadmin.backform', 'pgadmin.backgrid',
   'pgadmin.browser.node', 'backgrid.select.all',
-], function(gettext, $, _, pgAdmin, Backbone, Alertify, Backform, Backgrid, generateUrl) {
+], function(gettext, pgAdmin, generateUrl) {
 
   var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};
 

web/pgadmin/browser/static/js/datamodel.js

@@ -6,10 +6,11 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
+import _ from 'lodash';
 
 define([
-  'underscore', 'sources/pgadmin', 'jquery', 'backbone', 'sources/utils',
+  'sources/pgadmin', 'jquery', 'backbone', 'sources/utils',
-], function(_, pgAdmin, $, Backbone, pgadminUtils) {
+], function(pgAdmin, $, Backbone, pgadminUtils) {
   var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};
 
   pgBrowser.DataModel = Backbone.Model.extend({

web/pgadmin/browser/static/js/error.js

@@ -8,10 +8,11 @@
 //////////////////////////////////////////////////////////////
 
 import Notify from '../../../static/js/helpers/Notifier';
+import _ from 'lodash';
 
 define(
-  ['sources/gettext', 'underscore', 'sources/pgadmin'],
+  ['sources/gettext', 'sources/pgadmin'],
-  function(gettext, _, pgAdmin) {
+  function(gettext, pgAdmin) {
     pgAdmin.Browser = pgAdmin.Browser || {};
 
     _.extend(pgAdmin.Browser, {

web/pgadmin/browser/static/js/frame.js

@@ -6,10 +6,10 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
-
+import _ from 'lodash';
 define([
-  'underscore', 'sources/pgadmin', 'jquery', 'wcdocker',
+  'sources/pgadmin', 'jquery', 'wcdocker',
-], function(_, pgAdmin, $) {
+], function(pgAdmin, $) {
 
   var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {},
     wcDocker = window.wcDocker,

web/pgadmin/browser/static/js/keyboard.js

@@ -7,7 +7,7 @@
 //
 //////////////////////////////////////////////////////////////
 
-import _ from 'underscore';
+import _ from 'lodash';
 import pgAdmin from '../../../static/js/pgadmin';
 import $ from 'jquery';
 import Mousetrap from 'mousetrap';

web/pgadmin/browser/static/js/menu.js

@@ -6,10 +6,11 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
+import _ from 'lodash';
 
 define([
-  'underscore', 'sources/pgadmin', 'jquery', 'sources/utils', 'sources/gettext',
+  'sources/pgadmin', 'jquery', 'sources/utils', 'sources/gettext',
-], function(_, pgAdmin, $, pgadminUtils, gettext) {
+], function(pgAdmin, $, pgadminUtils, gettext) {
   'use strict';
 
   pgAdmin.Browser = pgAdmin.Browser || {};

web/pgadmin/browser/static/js/node.js

@@ -9,17 +9,17 @@
 
 import {getNodeView, removeNodeView} from './node_view';
 import Notify from '../../../static/js/helpers/Notifier';
+import _ from 'lodash';
+import { pgHandleItemError } from '../../../static/js/utils';
 
 define('pgadmin.browser.node', [
-  'sources/url_for',
+  'sources/gettext', 'jquery', 'sources/pgadmin',
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin',
+  'backbone', 'pgadmin.browser.datamodel',
-  'pgadmin.browser.menu', 'backbone', 'pgadmin.alertifyjs', 'pgadmin.browser.datamodel',
   'backform', 'sources/browser/generate_url', 'pgadmin.help', 'sources/utils',
   'pgadmin.browser.utils', 'pgadmin.backform',
 ], function(
-  url_for,
+  gettext, $, pgAdmin,
-  gettext, $, _, pgAdmin,
+  Backbone, pgBrowser,
-  Menu, Backbone, Alertify, pgBrowser,
   Backform, generateUrl, help,
   commonUtils
 ) {
@@ -458,11 +458,10 @@ define('pgadmin.browser.node', [
                     'pgadmin:node:retrieval:error', 'properties',
                     xhr, options.textStatus, options.errorThrown, item
                   );
-                  if (!Alertify.pgHandleItemError(
+                  if (!pgHandleItemError(xhr, {
-                    xhr, options.textStatus, options.errorThrown, {
+                    item: item,
-                      item: item,
+                    info: info,
-                      info: info,
+                  }
-                    }
                   )) {
                     Notify.pgNotifier(
                       options.textStatus, xhr,
@@ -1672,7 +1671,7 @@ define('pgadmin.browser.node', [
               type: 'cancel',
               tooltip: gettext('Cancel changes to this object.'),
               extraClasses: ['btn-secondary', 'mx-1'],
-              icon: 'fa fa-times pg-alertify-button',
+              icon: 'fa fa-times',
               disabled: false,
               register: function(btn) {
                 btn.on('click',() => {
@@ -1686,7 +1685,7 @@ define('pgadmin.browser.node', [
               type: 'reset',
               tooltip: gettext('Reset the fields on this dialog.'),
               extraClasses: ['btn-secondary', 'mx-1'],
-              icon: 'fa fa-recycle pg-alertify-button',
+              icon: 'fa fa-recycle',
               disabled: true,
               register: function(btn) {
                 btn.on('click',() => {
@@ -1706,7 +1705,7 @@ define('pgadmin.browser.node', [
               type: 'save',
               tooltip: gettext('Save this object.'),
               extraClasses: ['btn-primary', 'mx-1'],
-              icon: 'fa fa-save pg-alertify-button',
+              icon: 'fa fa-save',
               disabled: true,
               register: function(btn) {
                 // Save the changes
@@ -1975,7 +1974,7 @@ define('pgadmin.browser.node', [
         ) || 0;
 
       if (node_info) {
-        _.each(_.sortBy(_.values(_.pick(
+        _.each(_.sortBy(_.values(_.pickBy(
           node_info,
           function(v) {
             return (v.priority <= min_priority);

web/pgadmin/browser/static/js/node.ui.js

@@ -6,11 +6,12 @@
 // This software is released under the PostgreSQL Licence
 //
 //////////////////////////////////////////////////////////////
+import _ from 'lodash';
 
 define([
-  'sources/gettext', 'jquery', 'underscore', 'sources/pgadmin', 'backbone', 'backform',
+  'sources/gettext', 'jquery', 'sources/pgadmin', 'backform',
-  'alertify', 'backgrid', 'select2', 'pgadmin.browser.node',
+  'backgrid', 'select2', 'pgadmin.browser.node',
-], function(gettext, $, _, pgAdmin, Backbone, Backform, Alertify, Backgrid) {
+], function(gettext, $, pgAdmin, Backform, Backgrid) {
 
   /*
    * Define the selectAll adapter for select2.

web/pgadmin/browser/static/js/panel.js

@@ -8,10 +8,11 @@
 //////////////////////////////////////////////////////////////
 
 import { getPanelView } from './panel_view';
+import _ from 'lodash';
 
 define(
-  ['underscore', 'sources/pgadmin', 'jquery', 'wcdocker'],
+  ['sources/pgadmin', 'jquery', 'wcdocker'],
-  function(_, pgAdmin, $) {
+  function(pgAdmin, $) {
 
     var pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {},
       wcDocker = window.wcDocker;

web/pgadmin/browser/static/js/preferences.js

@@ -10,9 +10,10 @@
 import pgAdmin from 'sources/pgadmin';
 import url_for from 'sources/url_for';
 import $ from 'jquery';
-import * as SqlEditorUtils from 'sources/sqleditor_utils';
 import pgWindow from 'sources/window';
 import Notify from '../../../static/js/helpers/Notifier';
+import { calcFontSize } from '../../../static/js/utils';
+
 
 const pgBrowser = pgAdmin.Browser = pgAdmin.Browser || {};
 
@@ -123,7 +124,7 @@ _.extend(pgBrowser, {
       let sqlEditPreferences = obj.get_preferences_for_module('sqleditor');
 
       $(obj?.editor?.getWrapperElement()).css(
-        'font-size',SqlEditorUtils.calcFontSize(sqlEditPreferences.sql_font_size)
+        'font-size', calcFontSize(sqlEditPreferences.sql_font_size)
       );
       obj?.editor?.setOption('tabSize', sqlEditPreferences.tab_size);
       obj?.editor?.setOption('lineWrapping', sqlEditPreferences.wrap_code);

web/pgadmin/browser/static/js/toolbar.js

@@ -9,7 +9,7 @@
 //////////////////////////////////////////////////////////////
 
 import gettext from 'sources/gettext';
-import _ from 'underscore';
+import _ from 'lodash';
 import pgAdmin from 'sources/pgadmin';
 
 let _toolbarButtons = {};

web/pgadmin/browser/static/scss/_wizard.scss

@@ -18,7 +18,7 @@
   position: absolute;
   overflow: auto;
   top: $title-height;
-  bottom: $footer-height-calc; //similar to alertify footer
+  bottom: $footer-height-calc;
   left: 0;
   right: 0;
 }
@@ -28,7 +28,7 @@
   padding: $footer-padding
 }
 
-/* match the alertify footer */
+/* match the footer */
 .pgadmin-wizard .wizard-footer {
   min-height: $footer-min-height;
   border: none;

web/pgadmin/dashboard/static/js/Dashboard.jsx

@@ -30,7 +30,7 @@ import EmptyPanelMessage from '../../../static/js/components/EmptyPanelMessage';
 import TabPanel from '../../../static/js/components/TabPanel';
 
 function parseData(data) {
-  var res = [];
+  let res = [];
 
   data.forEach((row) => {
     res.push({ ...row, icon: '' });
@@ -197,7 +197,7 @@ export default function Dashboard({
       id: 'btn-terminate',
       // eslint-disable-next-line react/display-name
       Cell: ({ row }) => {
-        var terminate_session_url =
+        let terminate_session_url =
           url_for('dashboard.index') + 'terminate_session' + '/' + sid,
           title = gettext('Terminate Session?'),
           txtConfirm = gettext(
@@ -268,7 +268,7 @@ export default function Dashboard({
       minWidth: 0,
       id: 'btn-cancel',
       Cell: ({ row }) => {
-        var cancel_query_url =
+        let cancel_query_url =
           url_for('dashboard.index') + 'cancel_query' + '/' + sid,
           title = gettext('Cancel Active Query?'),
           txtConfirm = gettext(
@@ -629,14 +629,14 @@ export default function Dashboard({
     // If there is only one active session means it probably our main
     // connection session
     cellAction = cellAction || null;
-    var pg_version = treeNodeInfo.server.version || null,
+    let pg_version = treeNodeInfo.server.version || null,
       is_cancel_session = cellAction === 'cancel',
       txtMessage,
       maintenance_database = treeNodeInfo.server.db,
       is_super_user,
       current_user;
 
-    var can_signal_backend =
+    let can_signal_backend =
       treeNodeInfo.server && treeNodeInfo.server.user
         ? treeNodeInfo.server.user.can_signal_backend
         : false;

web/pgadmin/dashboard/static/js/Graphs.jsx

@@ -41,7 +41,7 @@ export function transformData(labels, refreshRate, use_diff_point_style) {
 
 /* Custom ChartJS legend callback */
 export function generateLegend(chart) {
-  var text = [];
+  let text = [];
   text.push('<div class="' + chart.id + '-legend d-flex">');
   for (let chart_val of chart.data.datasets) {
     text.push('<div class="legend-value"><span style="background-color:' + chart_val.backgroundColor + '">&nbsp;&nbsp;&nbsp;&nbsp;</span>');

web/pgadmin/dashboard/static/js/WelcomeDashboard.jsx

@@ -89,7 +89,7 @@ const useStyles = makeStyles((theme) => ({
 
 function AddNewServer(pgBrowser) {
   if (pgBrowser && pgBrowser.tree) {
-    var i = _.isUndefined(pgBrowser.tree.selected()) ?
+    let i = _.isUndefined(pgBrowser.tree.selected()) ?
         pgBrowser.tree.first(null, false) :
         pgBrowser.tree.selected(),
       serverModule = pgAdmin.Browser.Nodes.server,

web/pgadmin/misc/cloud/static/js/CloudWizard.jsx

@@ -67,7 +67,7 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose}) {
 
   const eventBus = React.useRef(new EventBus());
 
-  var steps = [gettext('Cloud Provider'), gettext('Credentials'),
+  let steps = [gettext('Cloud Provider'), gettext('Credentials'),
     gettext('Instance Specification'), gettext('Database Details'), gettext('Review')];
   const [currentStep, setCurrentStep] = React.useState('');
   const [selectionVal, setCloudSelection] = React.useState('');
@@ -121,7 +121,7 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose}) {
   };
 
   const onSave = () => {
-    var _url = url_for('cloud.deploy_on_cloud'),
+    let _url = url_for('cloud.deploy_on_cloud'),
       post_data = {};
 
     if (cloudProvider == 'rds') {
@@ -227,7 +227,7 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose}) {
     return new Promise((resolve, reject)=>{
       if(activeStep == 1 && cloudProvider == 'rds') {
         setErrMsg([MESSAGE_TYPE.INFO, gettext('Validating credentials...')]);
-        var _url = url_for('rds.verify_credentials');
+        let _url = url_for('rds.verify_credentials');
         const post_data = {
           cloud: selectionVal,
           secret: cloudDBCred,
@@ -283,7 +283,7 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose}) {
   };
 
   const authenticateBigAnimal = () => {
-    var loading_icon_url = url_for(
+    let loading_icon_url = url_for(
       'static', { 'filename': 'img/loading.gif'}
     );
 

web/pgadmin/misc/dependencies/static/js/Dependencies.jsx

@@ -76,7 +76,7 @@ export default function Dependencies({ nodeData, item, node, ...props }) {
   const [tableData, setTableData] = React.useState([]);
   const [loaderText, setLoaderText] = React.useState('');
   const [msg, setMsg] = React.useState('');
-  var columns = [
+  let columns = [
     {
       Header: 'Type',
       accessor: 'type',

web/pgadmin/misc/dependents/static/js/Dependents.jsx

@@ -77,7 +77,7 @@ export default function Dependents({ nodeData, item, node, ...props }) {
   const [loaderText, setLoaderText] = React.useState('');
   const [msg, setMsg] = React.useState('');
 
-  var columns = [
+  let columns = [
     {
       Header: 'Type',
       accessor: 'type',

web/pgadmin/misc/properties/CollectionNodeProperties.jsx

@@ -198,7 +198,7 @@ export function CollectionNodeView({
       const api = getApiInstance();
 
       let tableColumns = [];
-      var column = {};
+      let column = {};
       setLoaderText('Loading...');
 
       if (itemNodeData._type.indexOf('coll-') > -1 && !_.isUndefined(nodeObj.getSchema)) {

web/pgadmin/misc/sql/static/js/SQL.jsx

@@ -35,7 +35,7 @@ export default function SQL({ nodeData, node, did,  ...props }) {
   const [msg, setMsg] = React.useState('');
 
   useEffect(() => {
-    var sql = '-- ' + gettext('Please select an object in the tree view.');
+    let sql = '-- ' + gettext('Please select an object in the tree view.');
     if (node) {
       let url = generateNodeUrl.call(
         node,

web/pgadmin/static/css/style.css

@@ -1,5 +1,3 @@
-@import 'node_modules/alertifyjs/build/css/alertify.css';
-@import 'node_modules/alertifyjs/build/css/themes/bootstrap.css';
 @import 'node_modules/@fortawesome/fontawesome-free/css/all.css';
 @import 'node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker3.css';
 @import 'node_modules/tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.css';

web/pgadmin/static/js/Dialogs/index.jsx

@@ -26,7 +26,7 @@ import RenamePanelContent from './RenamePanelContent';
 
 function mountDialog(title, getDialogContent, docker=undefined, width, height) {
   // Register dialog panel
-  var panel;
+  let panel;
   if (docker) {
     pgAdmin.Browser.Node.registerUtilityPanel(docker);
     panel = pgAdmin.Browser.Node.addUtilityPanel(width||pgAdmin.Browser.stdW.md, height||undefined, docker);
@@ -35,7 +35,7 @@ function mountDialog(title, getDialogContent, docker=undefined, width, height) {
     panel = pgAdmin.Browser.Node.addUtilityPanel(width||pgAdmin.Browser.stdW.md);
   }
 
-  var j = panel.$container.find('.obj_properties').first();
+  let j = panel.$container.find('.obj_properties').first();
   panel.title(title);
 
   const onClose = ()=> {
@@ -61,7 +61,7 @@ function mountDialog(title, getDialogContent, docker=undefined, width, height) {
 
 // This functions is used to show the connect server password dialog.
 export function showServerPassword() {
-  var title = arguments[0],
+  let title = arguments[0],
     formJson = arguments[1],
     nodeObj = arguments[2],
     nodeData = arguments[3],
@@ -83,7 +83,7 @@ export function showServerPassword() {
         data={formJson}
         onOK={(formData)=>{
           const api = getApiInstance();
-          var _url = nodeObj.generate_url(itemNodeData, 'connect', nodeData, true);
+          let _url = nodeObj.generate_url(itemNodeData, 'connect', nodeData, true);
           if (!status) {
             treeNodeInfo.setLeaf(itemNodeData);
             treeNodeInfo.removeIcon(itemNodeData);
@@ -112,7 +112,7 @@ export function showServerPassword() {
 // This functions is used to show the connect server password dialog when
 // launch from Schema Diff tool.
 export function showSchemaDiffServerPassword() {
-  var docker = arguments[0],
+  let docker = arguments[0],
     title = arguments[1],
     formJson = arguments[2],
     serverID = arguments[3],
@@ -132,7 +132,7 @@ export function showSchemaDiffServerPassword() {
         data={formJson}
         onOK={(formData)=>{
           const api = getApiInstance();
-          var _url = url_for('schema_diff.connect_server', {'sid': serverID});
+          let _url = url_for('schema_diff.connect_server', {'sid': serverID});
 
           api.post(_url, formData)
             .then(res=>{
@@ -191,7 +191,7 @@ export function showMasterPassword(isPWDPresent, errmsg, masterpass_callback_que
             gettext('This will remove all the saved passwords. This will also remove established connections to '
             + 'the server and you may need to reconnect again. Do you wish to continue?'),
             function() {
-              var _url = url_for('browser.reset_master_password');
+              let _url = url_for('browser.reset_master_password');
 
               api.delete(_url)
                 .then(() => {
@@ -219,7 +219,7 @@ export function showMasterPassword(isPWDPresent, errmsg, masterpass_callback_que
 }
 
 export function showChangeServerPassword() {
-  var title = arguments[0],
+  let title = arguments[0],
     nodeData = arguments[1],
     nodeObj = arguments[2],
     itemNodeData = arguments[3],
@@ -234,7 +234,7 @@ export function showChangeServerPassword() {
         onSave={(isNew, data)=>{
           return new Promise((resolve, reject)=>{
             const api = getApiInstance();
-            var _url = nodeObj.generate_url(itemNodeData, 'change_password', nodeData, true);
+            let _url = nodeObj.generate_url(itemNodeData, 'change_password', nodeData, true);
 
             api.post(_url, data)
               .then(({data: respData})=>{
@@ -265,7 +265,7 @@ export function showChangeServerPassword() {
 }
 
 export function showNamedRestorePoint() {
-  var title = arguments[0],
+  let title = arguments[0],
     nodeData = arguments[1],
     nodeObj = arguments[2],
     itemNodeData = arguments[3];
@@ -281,7 +281,7 @@ export function showNamedRestorePoint() {
         }}
         onOK={(formData)=>{
           const api = getApiInstance();
-          var _url = nodeObj.generate_url(itemNodeData, 'restore_point', nodeData, true);
+          let _url = nodeObj.generate_url(itemNodeData, 'restore_point', nodeData, true);
 
           api.post(_url, formData)
             .then(res=>{
@@ -298,7 +298,7 @@ export function showNamedRestorePoint() {
 }
 
 export function showChangeOwnership() {
-  var title = arguments[0],
+  let title = arguments[0],
     userList = arguments[1],
     noOfSharedServers = arguments[2],
     deletedUser = arguments[3],