diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py index 9f5cf9c15..2891d2181 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/__init__.py @@ -616,7 +616,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare): if not status: return internal_server_error(errormsg=res) - op_class_list = [{'label': '', 'value': ''}] + op_class_list = [] for r in result['rows']: op_class_list.append({'label': r['opcname'], @@ -710,7 +710,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare): This function will return list of types available for table node for node-ajax-control """ - res = [{'label': '', 'value': ''}] + res = [] try: SQL = render_template( "/".join([self.table_template_path, 'get_oftype.sql']), @@ -821,7 +821,7 @@ class TableView(BaseTableView, DataTypeReader, SchemaDiffTableCompare): This function will return list of tables available for like/relation combobox while creating new table """ - res = [{'label': '', 'value': ''}] + res = [] try: SQL = render_template( "/".join([self.table_template_path, 'get_relations.sql']), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py index 26bae7fe0..407a9eef5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/utils.py @@ -250,7 +250,7 @@ def get_access_methods(conn, template_path=None): :param template_path: :return: """ - res = [{'label': '', 'value': ''}] + res = [] sql = render_template("/".join([template_path, 'get_access_methods.sql'])) status, rest = conn.execute_2darray(sql) 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 46e300238..ff2531185 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 @@ -632,14 +632,6 @@ export default class TableSchema extends BaseUISchema { }, options: this.fieldOptions.typname, optionsLoaded: (res)=>{ obj.ofTypeTables = res; }, - depChange: (state, source)=>{ - if(source[0] == 'typname' && !isEmptyString(state.typname)) { - return { - columns: [], - primary_key: [] - }; - } - }, deferredDepChange: (state, source, topState, actionObj)=>{ const setColumns = (resolve)=>{ let finalCols = []; @@ -651,6 +643,7 @@ export default class TableSchema extends BaseUISchema { obj.changeColumnOptions(finalCols); return { columns: finalCols, + primary_key: [] }; }); };