diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.ui.js b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.ui.js
index 129d494aa..cba34540c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.ui.js
@@ -10,7 +10,7 @@ import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import { isEmptyString } from 'sources/validators';
 export default class CastSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       name: undefined,            // Name of the cast
       encoding: 'UTF8',
diff --git a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.ui.js b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.ui.js
index fd2f88a31..3a0d30f32 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/event_triggers/static/js/event_trigger.ui.js
@@ -14,7 +14,7 @@ import { isEmptyString } from 'sources/validators';
 
 
 export default class EventTriggerSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       oid: undefined,
       name: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.ui.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.ui.js
index c457c35d0..8123aa412 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import OptionsSchema from '../../../../../static/js/options.ui';
 
 export default class ForeignServerSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, fieldOptions={}, initValues) {
+  constructor(getPrivilegeRoleSchema, fieldOptions={}, initValues={}) {
     super({
       name: undefined,
       fsrvtype: undefined,
@@ -83,4 +83,4 @@ export default class ForeignServerSchema extends BaseUISchema {
       }
     ];
   }
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.ui.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.ui.js
index 990c318a5..c46803ade 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mappings/static/js/user_mapping.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import OptionsSchema from '../../../../../../static/js/options.ui';
 
 export default class UserMappingSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       name: undefined,
       is_sys_obj: undefined,
@@ -53,4 +53,4 @@ export default class UserMappingSchema extends BaseUISchema {
       }
     ];
   }
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.ui.js b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.ui.js
index 0997c6bf6..663328432 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import OptionsSchema from '../../../../static/js/options.ui';
 
 export default class ForeignDataWrapperSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, fieldOptions={}, initValues) {
+  constructor(getPrivilegeRoleSchema, fieldOptions={}, initValues={}) {
     super({
       name: undefined,
       fdwowner: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.ui.js b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.ui.js
index 65a9103e0..68227ad97 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.ui.js
@@ -13,7 +13,7 @@ import SecLabelSchema from '../../../../static/js/sec_label.ui';
 import _ from 'lodash';
 
 export default class LanguageSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, fieldOptions={}, node_info, initValues) {
+  constructor(getPrivilegeRoleSchema, fieldOptions={}, node_info={}, initValues={}) {
     super({
       name: undefined,
       lanowner: (node_info) ? node_info['node_info'].user.name: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.ui.js b/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.ui.js
index 501babcb1..46cfb0e87 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/publications/static/js/publication.ui.js
@@ -56,7 +56,7 @@ export class DefaultWithSchema extends BaseUISchema {
 }
 
 export default class PublicationSchema extends BaseUISchema {
-  constructor(fieldOptions={}, node_info, initValues) {
+  constructor(fieldOptions={}, node_info={}, initValues={}) {
     super({
       name: undefined,
       pubowner: (node_info) ? node_info['node_info'].user.name: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/static/js/aggregate.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/static/js/aggregate.ui.js
index f1c58e25a..49950b782 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/static/js/aggregate.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/aggregates/static/js/aggregate.ui.js
@@ -11,7 +11,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import gettext from 'sources/gettext';
 
 export default class AggregateSchema extends BaseUISchema {
-  constructor(fieldOptions = {},initValues) {
+  constructor(fieldOptions = {},initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.ui.js
index 95adddd42..455dc4a62 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/catalog_objects/columns/static/js/catalog_object_column.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 
 
 export default class CatalogObjectColumnSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       attname: undefined,
       attowner: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.ui.js
index 88d353b5f..a8fd2702f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.ui.js
@@ -12,7 +12,7 @@ import gettext from 'sources/gettext';
 import { isEmptyString } from 'sources/validators';
 
 export default class CollationSchema extends BaseUISchema {
-  constructor(fieldOptions = {},initValues) {
+  constructor(fieldOptions = {},initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.ui.js
index 705563995..b72a237a7 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.ui.js
@@ -67,7 +67,7 @@ export class DomainConstSchema extends BaseUISchema {
 }
 
 export default class DomainSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.ui.js
index afcd1a211..97e3a7d67 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.ui.js
@@ -19,7 +19,7 @@ import { getNodeAjaxOptions } from '../../../../../../../static/js/node_ajax';
 
 
 export default class ForeignTableSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, getVariableSchema, getColumns, fieldOptions={}, initValues) {
+  constructor(getPrivilegeRoleSchema, getVariableSchema, getColumns, fieldOptions={}, initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.ui.js
index 30f453275..22b55d7be 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.ui.js
@@ -67,7 +67,7 @@ class TokenSchema extends BaseUISchema {
 }
 
 export default class FTSConfigurationSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       name: undefined,        // FTS Configuration name
       owner: undefined,       // FTS Configuration owner
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.ui.js
index 91cf3c7a1..58b89b8d3 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_dictionaries/static/js/fts_dictionary.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import OptionsSchema from '../../../../../static/js/options.ui';
 
 export default class FTSDictionarySchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       name: undefined,        // FTS Dictionary name
       owner: undefined,       // FTS Dictionary owner
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.ui.js
index b39d76ca8..529329726 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/static/js/fts_parser.ui.js
@@ -11,7 +11,7 @@ import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 
 export default class FTSParserSchema extends BaseUISchema {
-  constructor(fieldOptions = {}, initValues) {
+  constructor(fieldOptions = {}, initValues={}) {
     super({
       name: null,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.ui.js
index 513ae5618..f9accd107 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/static/js/fts_template.ui.js
@@ -11,7 +11,7 @@ import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 
 export default class FTSTemplateSchema extends BaseUISchema {
-  constructor(fieldOptions = {}, initValues) {
+  constructor(fieldOptions = {}, initValues={}) {
     super({
       name: null,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
index 41f704611..e7255cf8e 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/function.ui.js
@@ -94,7 +94,7 @@ export class DefaultArgumentSchema extends BaseUISchema {
 }
 
 export default class FunctionSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, getNodeVariableSchema, fieldOptions={}, node_info, type, initValues) {
+  constructor(getPrivilegeRoleSchema, getNodeVariableSchema, fieldOptions={}, node_info={}, type='function', initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.ui.js
index 91b557670..46453fcf6 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.ui.js
@@ -14,7 +14,7 @@ import { isEmptyString } from 'sources/validators';
 
 
 export default class TriggerFunctionSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, getVariableSchema, fieldOptions={}, initValues) {
+  constructor(getPrivilegeRoleSchema, getVariableSchema, fieldOptions={}, initValues={}) {
     super({
       name: null,
       oid: null,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/static/js/operator.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/static/js/operator.ui.js
index 17a781816..53a830bc5 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/static/js/operator.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/operators/static/js/operator.ui.js
@@ -11,7 +11,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import gettext from 'sources/gettext';
 
 export default class OperatorSchema extends BaseUISchema {
-  constructor(fieldOptions = {},initValues) {
+  constructor(fieldOptions = {},initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.ui.js
index 70054a955..95599039d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbfuncs/static/js/edbfunc.ui.js
@@ -11,7 +11,7 @@ import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 
 export default class EDBFuncSchema extends BaseUISchema {
-  constructor(fieldOptions = {}, initValues) {
+  constructor(fieldOptions = {}, initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.ui.js
index 9dd356352..4d0d5ef56 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/edbvars/static/js/edbvar.ui.js
@@ -11,7 +11,7 @@ import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 
 export default class EDBVarSchema extends BaseUISchema {
-  constructor(fieldOptions = {}, initValues) {
+  constructor(fieldOptions = {}, initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.ui.js
index 27ad2d46d..3ef531e81 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/packages/static/js/package.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import { isEmptyString } from 'sources/validators';
 
 export default class PackageSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, fieldOptions = {}, initValues) {
+  constructor(getPrivilegeRoleSchema, fieldOptions = {}, initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.ui.js
index 8b0efba77..726ecd51a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.ui.js
@@ -68,7 +68,7 @@ export class OwnedBySchema extends BaseUISchema {
 
 
 export default class SequenceSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, fieldOptions={}, initValues) {
+  constructor(getPrivilegeRoleSchema, fieldOptions={}, initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.ui.js
index 6cf2aff55..d2fa6d046 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/catalog.ui.js
@@ -11,7 +11,7 @@ import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 
 export default class CatalogSchema extends BaseUISchema {
-  constructor(fieldOptions = {}, initValues) {
+  constructor(fieldOptions = {}, initValues={}) {
     super({
       name: undefined,
       namespaceowner: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.ui.js
index 286c4e5c8..4d861fc36 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/static/js/schema.ui.js
@@ -14,7 +14,7 @@ import SecLabelSchema from '../../../../static/js/sec_label.ui';
 import { isEmptyString } from 'sources/validators';
 
 export default class PGSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, fieldOptions = {}, initValues) {
+  constructor(getPrivilegeRoleSchema, fieldOptions = {}, initValues={}) {
     super({
       name: undefined,
       namespaceowner: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.ui.js
index 56c725bc6..e2502acf3 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import { emptyValidator } from 'sources/validators';
 
 export default class SynonymSchema extends BaseUISchema {
-  constructor(fieldOptions={}, nodeInfo, initValues) {
+  constructor(fieldOptions={}, nodeInfo={}, initValues={}) {
     super({
       targettype: 'r',
       ...initValues,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.ui.js
index 13a5f5c7a..5168476aa 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/compound_triggers/static/js/compound_trigger.ui.js
@@ -13,7 +13,7 @@ import { isEmptyString } from 'sources/validators';
 
 
 export class ForEventsSchema extends BaseUISchema {
-  constructor(fieldOptions={}, nodeInfo, initValues) {
+  constructor(fieldOptions={}, nodeInfo={}, initValues={}) {
     super({
       ...initValues,
     });
@@ -73,7 +73,7 @@ export class ForEventsSchema extends BaseUISchema {
 }
 
 export default class CompoundTriggerSchema extends BaseUISchema {
-  constructor(fieldOptions={}, nodeInfo, initValues) {
+  constructor(fieldOptions={}, nodeInfo={}, initValues={}) {
     super({
       name: undefined,
       ...initValues,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js
index 28aee7141..e6ce63136 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.ui.js
@@ -186,7 +186,7 @@ class ExclusionColumnSchema extends BaseUISchema {
 }
 
 export default class ExclusionConstraintSchema extends BaseUISchema {
-  constructor(fieldOptions={}, nodeInfo) {
+  constructor(fieldOptions={}, nodeInfo={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.ui.js
index 7cfd3b5d4..0ee0622c5 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.ui.js
@@ -118,7 +118,7 @@ export class ForeignKeyColumnSchema extends BaseUISchema {
 }
 
 export default class ForeignKeySchema extends BaseUISchema {
-  constructor(fieldOptions={}, nodeInfo, getColumns, initValues={}, inErd=false) {
+  constructor(fieldOptions={}, nodeInfo={}, getColumns=()=>[], initValues={}, inErd=false) {
     super({
       name: undefined,
       reftab: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.ui.js
index e1079f6e5..40b29488c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/primary_key.ui.js
@@ -5,7 +5,7 @@ import { isEmptyString } from 'sources/validators';
 import { SCHEMA_STATE_ACTIONS } from '../../../../../../../../../../static/js/SchemaView';
 import TableSchema from '../../../../static/js/table.ui';
 export default class PrimaryKeySchema extends BaseUISchema {
-  constructor(fieldOptions={}, nodeInfo) {
+  constructor(fieldOptions={}, nodeInfo={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.ui.js
index b9e899e8b..9a41c8c46 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/index_constraint/static/js/unique_constraint.ui.js
@@ -6,7 +6,7 @@ import { SCHEMA_STATE_ACTIONS } from '../../../../../../../../../../static/js/Sc
 import TableSchema from '../../../../static/js/table.ui';
 
 export default class UniqueConstraintSchema extends BaseUISchema {
-  constructor(fieldOptions={}, nodeInfo) {
+  constructor(fieldOptions={}, nodeInfo={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.ui.js
index 86df6cb75..259cc0ced 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/indexes/static/js/index.ui.js
@@ -27,7 +27,7 @@ export function getColumnSchema(nodeObj, treeNodeInfo, itemNodeData) {
 }
 
 export class ColumnSchema extends BaseUISchema {
-  constructor(fieldOptions = {}, nodeData, initValues) {
+  constructor(fieldOptions = {}, nodeData, initValues={}) {
     super({
       name: null,
       oid: undefined,
@@ -209,7 +209,7 @@ function inSchema(node_info) {
 }
 
 export default class IndexSchema extends BaseUISchema {
-  constructor(getColumnSchema, fieldOptions = {}, nodeData, initValues) {
+  constructor(getColumnSchema, fieldOptions = {}, nodeData, initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js
index 303615476..fd35b342d 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.ui.js
@@ -72,8 +72,8 @@ export function getNodePartitionTableSchema(treeNodeInfo, itemNodeData, pgBrowse
 }
 
 export default class PartitionTableSchema extends BaseUISchema {
-  constructor(fieldOptions={}, nodeInfo, schemas, getPrivilegeRoleSchema, getColumns,
-    getCollations, getOperatorClass, getAttachTables, initValues) {
+  constructor(fieldOptions={}, nodeInfo={}, schemas={}, getPrivilegeRoleSchema={}, getColumns=()=>[],
+    getCollations=()=>[], getOperatorClass=()=>[], getAttachTables=()=>[], initValues={}) {
     super({
       name: undefined,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.ui.js
index 3dde60f6a..65de35e9f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 
 
 export default class RowSecurityPolicySchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       name: undefined,
       policyowner: 'public',
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
index db3c6bcbc..e62e00705 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.ui.js
@@ -284,7 +284,7 @@ export class LikeSchema extends BaseUISchema {
 }
 
 export default class TableSchema extends BaseUISchema {
-  constructor(fieldOptions={}, nodeInfo, schemas={}, getPrivilegeRoleSchema=()=>{/*This is intentional (SonarQube)*/}, getColumns=()=>[],
+  constructor(fieldOptions={}, nodeInfo={}, schemas={}, getPrivilegeRoleSchema=()=>{/*This is intentional (SonarQube)*/}, getColumns=()=>[],
     getCollations=()=>[], getOperatorClass=()=>[], getAttachTables=()=>[], initValues={}, inErd=false) {
     super({
       name: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
index 7693b7a1f..177468858 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import { isEmptyString } from 'sources/validators';
 
 export class EventSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       evnt_update: false,
       evnt_insert: false,
@@ -119,7 +119,7 @@ export class EventSchema extends BaseUISchema {
 
 
 export default class TriggerSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       name: undefined,
       is_row_trigger: true,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js
index b2ec1651c..81d9e2ff5 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js
@@ -173,7 +173,7 @@ class EnumerationSchema extends BaseUISchema {
 }
 
 class RangeSchema extends BaseUISchema {
-  constructor(fieldOptions = {}, node_info, initValues) {
+  constructor(fieldOptions = {}, node_info={}, initValues={}) {
     super({
       typname: null,
       oid: undefined,
@@ -412,7 +412,7 @@ class RangeSchema extends BaseUISchema {
 }
 
 class ExternalSchema extends BaseUISchema {
-  constructor(fieldOptions = {}, node_info, initValues) {
+  constructor(fieldOptions = {}, node_info={}, initValues={}) {
     super({
       name: null,
       typinput: undefined,
@@ -872,7 +872,7 @@ class ExternalSchema extends BaseUISchema {
 }
 
 class CompositeSchema extends BaseUISchema {
-  constructor(fieldOptions = {}, initValues) {
+  constructor(fieldOptions = {}, initValues={}) {
     super({
       oid: undefined,
       is_sys_type: false,
@@ -1065,7 +1065,7 @@ class CompositeSchema extends BaseUISchema {
 
 class DataTypeSchema extends BaseUISchema {
 
-  constructor(fieldOptions = {}, initValues) {
+  constructor(fieldOptions = {}, initValues={}) {
     super({
       oid: undefined,
       is_sys_type: false,
@@ -1271,7 +1271,7 @@ class DataTypeSchema extends BaseUISchema {
 }
 
 export default class TypeSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, getCompositeSchema, getRangeSchema, getExternalSchema, getDataTypeSchema, fieldOptions = {}, initValues) {
+  constructor(getPrivilegeRoleSchema, getCompositeSchema, getRangeSchema, getExternalSchema, getDataTypeSchema, fieldOptions = {}, initValues={}) {
     super({
       name: null,
       oid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.ui.js
index 36002e5d7..2211beb61 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.ui.js
@@ -14,7 +14,7 @@ import { isEmptyString } from 'sources/validators';
 
 
 export default class MViewSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, getVacuumSettingsSchema, fieldOptions={}, initValues) {
+  constructor(getPrivilegeRoleSchema, getVacuumSettingsSchema, fieldOptions={}, initValues={}) {
     super({
       spcname: undefined,
       toast_autovacuum_enabled: 'x',
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js
index 8f4692a2c..31234d80c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/view.ui.js
@@ -14,7 +14,7 @@ import { isEmptyString } from 'sources/validators';
 
 
 export default class ViewSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, nodeInfo, fieldOptions={}, initValues) {
+  constructor(getPrivilegeRoleSchema, nodeInfo, fieldOptions={}, initValues={}) {
     super({
       owner: undefined,
       schema: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.ui.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.ui.js
index 1bbc5f58f..c23c0ec0e 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.ui.js
@@ -47,7 +47,7 @@ export class DefaultPrivSchema extends BaseUISchema {
 }
 
 export default class DatabaseSchema extends BaseUISchema {
-  constructor(getVariableSchema, getPrivilegeRoleSchema, fieldOptions={}, initValues) {
+  constructor(getVariableSchema, getPrivilegeRoleSchema, fieldOptions={}, initValues={}) {
     super({
       name: undefined,
       owner: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js
index c536234b3..b62e13bb1 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js
@@ -12,7 +12,7 @@ import { isEmptyString } from 'sources/validators';
 import _ from 'lodash';
 
 export default class SubscriptionSchema extends BaseUISchema{
-  constructor(fieldOptions={}, node_info, initValues) {
+  constructor(fieldOptions={}, node_info={}, initValues={}) {
     super({
       name: undefined,
       subowner: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.ui.js b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.ui.js
index 0d7a38a17..20f577e54 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.ui.js
@@ -74,7 +74,7 @@ const weekdays = [
   ];
 
 export class ExceptionsSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       jexdate: null,
       jextime: null,
@@ -159,7 +159,7 @@ const BooleanArrayFormatter = {
 };
 
 export class DaysSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       ...initValues,
     });
@@ -201,7 +201,7 @@ export class DaysSchema extends BaseUISchema {
 }
 
 export class TimesSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       ...initValues,
     });
@@ -235,7 +235,7 @@ export class TimesSchema extends BaseUISchema {
 }
 
 export default class PgaJobScheduleSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       jscid: null,
       jscjobid: null,
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.ui.js b/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.ui.js
index 0d2710b77..a04bc61fb 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import PgaJobScheduleSchema from '../../schedules/static/js/pga_schedule.ui';
 
 export default class PgaJobSchema extends BaseUISchema {
-  constructor(fieldOptions={}, getPgaJobStepSchema, initValues) {
+  constructor(fieldOptions={}, getPgaJobStepSchema=()=>[], initValues={}) {
     super({
       jobname: '',
       jobid: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js b/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js
index d1d2f4353..dea7075d5 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js
@@ -26,7 +26,7 @@ export function getNodePgaJobStepSchema(treeNodeInfo, itemNodeData) {
   );
 }
 export default class PgaJobStepSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       jstid: null,
       jstjobid: null,
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
index 79fdf6670..c4b64577f 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.ui.js
@@ -19,7 +19,7 @@ import current_user from 'pgadmin.user_management.current_user';
 import { isEmptyString } from 'sources/validators';
 
 export default class ServerSchema extends BaseUISchema {
-  constructor(serverGroupOptions=[], userId, initValues) {
+  constructor(serverGroupOptions=[], userId, initValues={}) {
     super({
       gid: undefined,
       id: undefined,
diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.ui.js b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.ui.js
index 8b9a795ad..d00f6dc15 100644
--- a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.ui.js
+++ b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.ui.js
@@ -12,7 +12,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import SecLabelSchema from '../../../static/js/sec_label.ui';
 
 export default class TablespaceSchema extends BaseUISchema {
-  constructor(getVariableSchema, getPrivilegeRoleSchema, fieldOptions={}, initValues) {
+  constructor(getVariableSchema, getPrivilegeRoleSchema, fieldOptions={}, initValues={}) {
     super({
       name: undefined,
       owner: undefined,
diff --git a/web/pgadmin/tools/backup/static/js/backup.ui.js b/web/pgadmin/tools/backup/static/js/backup.ui.js
index 58d9b5316..e8c0edada 100644
--- a/web/pgadmin/tools/backup/static/js/backup.ui.js
+++ b/web/pgadmin/tools/backup/static/js/backup.ui.js
@@ -11,7 +11,7 @@ import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 import { isEmptyString } from 'sources/validators';
 
 export class SectionSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       ...initValues,
     });
@@ -131,7 +131,7 @@ export function getTypeObjSchema(fieldOptions) {
 }
 
 export class SaveOptSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       id: null,
       ...initValues,
@@ -194,7 +194,7 @@ export function getSaveOptSchema(fieldOptions) {
 }
 
 export class QueryOptionSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       id: null,
       ...initValues,
@@ -274,7 +274,7 @@ export function getQueryOptionSchema(fieldOptions) {
 }
 
 export class DisabledOptionSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       id: null,
       ...initValues,
@@ -316,7 +316,7 @@ export function getDisabledOptionSchema(fieldOptions) {
 }
 
 export class MiscellaneousSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       id: null,
       verbose: true,
diff --git a/web/pgadmin/tools/grant_wizard/static/js/privilege_schema.ui.js b/web/pgadmin/tools/grant_wizard/static/js/privilege_schema.ui.js
index 24033584d..331990ee1 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/privilege_schema.ui.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/privilege_schema.ui.js
@@ -2,7 +2,7 @@ import gettext from 'sources/gettext';
 import BaseUISchema from 'sources/SchemaView/base_schema.ui';
 
 export default class PrivilegeSchema extends BaseUISchema {
-  constructor(getPrivilegeRoleSchema, fieldOptions = {}, initValues) {
+  constructor(getPrivilegeRoleSchema, fieldOptions = {}, initValues={}) {
     super({
       oid: null,
       privilege: [],
diff --git a/web/pgadmin/tools/restore/static/js/restore.ui.js b/web/pgadmin/tools/restore/static/js/restore.ui.js
index e6dbeb9dd..df2cc58f8 100644
--- a/web/pgadmin/tools/restore/static/js/restore.ui.js
+++ b/web/pgadmin/tools/restore/static/js/restore.ui.js
@@ -136,7 +136,7 @@ export function getRestoreTypeObjSchema(fieldOptions) {
 }
 
 export class RestoreSaveOptSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       id: null,
       ...initValues,
@@ -192,7 +192,7 @@ export function getRestoreSaveOptSchema(fieldOptions) {
 }
 
 export class RestoreQueryOptionSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       id: null,
       ...initValues,
@@ -245,7 +245,7 @@ export function getRestoreQueryOptionSchema(fieldOptions) {
 }
 
 export class RestoreDisableOptionSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       id: null,
       ...initValues,
@@ -284,7 +284,7 @@ export function getRestoreDisableOptionSchema(fieldOptions) {
 }
 
 export class RestoreMiscellaneousSchema extends BaseUISchema {
-  constructor(fieldOptions={}, initValues) {
+  constructor(fieldOptions={}, initValues={}) {
     super({
       id: null,
       verbose: true,
@@ -465,4 +465,4 @@ export default class RestoreSchema extends BaseUISchema {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/utils/driver/psycopg2/typecast.py b/web/pgadmin/utils/driver/psycopg2/typecast.py
index 4fc8a5f4c..2a15fb443 100644
--- a/web/pgadmin/utils/driver/psycopg2/typecast.py
+++ b/web/pgadmin/utils/driver/psycopg2/typecast.py
@@ -76,9 +76,9 @@ RECORD_ARRAY = (2287,)
 #
 # For below two sql psycopg2 returns result in different formats.
 #   SELECT '{foo,bar}'::text[];
-#   print('type of {} ==> {/*This is intentional (SonarQube)*/}'.format(res[0], type(res[0])))
+#   print('type of {} ==> {}'.format(res[0], type(res[0])))
 #   SELECT '{<a>foo</a>,<b>bar</b>}'::xml[];
-#   print('type of {} ==> {/*This is intentional (SonarQube)*/}'.format(res[0], type(res[0])))
+#   print('type of {} ==> {}'.format(res[0], type(res[0])))
 #
 # Output:
 #   type of ['foo', 'bar'] ==> <type 'list'>