diff --git a/superset/connectors/druid/views.py b/superset/connectors/druid/views.py index 68047dd05de75..519203ce283ee 100644 --- a/superset/connectors/druid/views.py +++ b/superset/connectors/druid/views.py @@ -119,6 +119,7 @@ class DruidClusterModelView(SupersetModelView, DeleteMixin): # noqa ] edit_columns = add_columns list_columns = ['cluster_name', 'metadata_last_refreshed'] + search_columns = ('cluster_name',) label_columns = { 'cluster_name': _("Cluster"), 'coordinator_host': _("Coordinator Host"), @@ -150,7 +151,7 @@ class DruidDatasourceModelView(SupersetModelView, DeleteMixin): # noqa datamodel = SQLAInterface(models.DruidDatasource) list_widget = ListWidgetWithCheckboxes list_columns = [ - 'datasource_link', 'cluster', 'changed_by_', 'changed_on_', 'offset'] + 'datasource_link', 'cluster', 'changed_by_', 'modified'] order_columns = [ 'datasource_link', 'changed_on_', 'offset'] related_views = [DruidColumnInlineView, DruidMetricInlineView] @@ -159,6 +160,9 @@ class DruidDatasourceModelView(SupersetModelView, DeleteMixin): # noqa 'is_hidden', 'filter_select_enabled', 'fetch_values_from', 'default_endpoint', 'offset', 'cache_timeout'] + search_columns = ( + 'datasource_name', 'cluster', 'description', 'owner' + ) add_columns = edit_columns show_columns = add_columns + ['perm'] page_size = 500 diff --git a/superset/connectors/sqla/views.py b/superset/connectors/sqla/views.py index 30e4ba4e0d343..6562000eaedcb 100644 --- a/superset/connectors/sqla/views.py +++ b/superset/connectors/sqla/views.py @@ -137,7 +137,7 @@ class TableModelView(SupersetModelView, DeleteMixin): # noqa datamodel = SQLAInterface(models.SqlaTable) list_columns = [ 'link', 'database', - 'changed_by_', 'changed_on_'] + 'changed_by_', 'modified'] order_columns = [ 'link', 'database', 'changed_on_'] add_columns = ['database', 'schema', 'table_name'] @@ -149,6 +149,9 @@ class TableModelView(SupersetModelView, DeleteMixin): # noqa show_columns = edit_columns + ['perm'] related_views = [TableColumnInlineView, SqlMetricInlineView] base_order = ('changed_on', 'desc') + search_columns = ( + 'database', 'schema', 'table_name', 'owner', + ) description_columns = { 'slices': _( "The list of slices associated with this table. By " diff --git a/superset/views/base.py b/superset/views/base.py index 7d57f09027b5b..f14cc1083caff 100644 --- a/superset/views/base.py +++ b/superset/views/base.py @@ -188,7 +188,7 @@ def accessible_by_user(self, database, datasource_names, schema=None): class SupersetModelView(ModelView): - page_size = 500 + page_size = 100 class ListWidgetWithCheckboxes(ListWidget): diff --git a/superset/views/core.py b/superset/views/core.py index 5bfd73017b3f3..73cd25fbeee8d 100755 --- a/superset/views/core.py +++ b/superset/views/core.py @@ -175,7 +175,9 @@ class DatabaseView(SupersetModelView, DeleteMixin): # noqa 'database_name', 'sqlalchemy_uri', 'cache_timeout', 'extra', 'expose_in_sqllab', 'allow_run_sync', 'allow_run_async', 'allow_ctas', 'allow_dml', 'force_ctas_schema'] - search_exclude_columns = ('password',) + search_exclude_columns = ( + 'password', 'tables', 'created_by', 'changed_by', 'queries', + 'saved_queries', ) edit_columns = add_columns show_columns = [ 'tables', @@ -317,6 +319,9 @@ class SliceModelView(SupersetModelView, DeleteMixin): # noqa label_columns = { 'datasource_link': 'Datasource', } + search_columns = ( + 'slice_name', 'description', 'viz_type', 'owners', + ) list_columns = [ 'slice_link', 'viz_type', 'datasource_link', 'creator', 'modified'] edit_columns = [ @@ -405,6 +410,7 @@ class DashboardModelView(SupersetModelView, DeleteMixin): # noqa 'dashboard_title', 'slug', 'slices', 'owners', 'position_json', 'css', 'json_metadata'] show_columns = edit_columns + ['table_names'] + search_columns = ('dashboard_title', 'slug', 'owners') add_columns = edit_columns base_order = ('changed_on', 'desc') description_columns = { diff --git a/superset/views/sql_lab.py b/superset/views/sql_lab.py index 3c868cf6e704a..16a8dd21c9477 100644 --- a/superset/views/sql_lab.py +++ b/superset/views/sql_lab.py @@ -31,6 +31,7 @@ class SavedQueryView(SupersetModelView, DeleteMixin): show_columns = [ 'id', 'label', 'user', 'database', 'description', 'sql', 'pop_tab_link'] + search_columns = ('label', 'user', 'database', 'schema', 'changed_on') add_columns = ['label', 'database', 'description', 'sql'] edit_columns = add_columns base_order = ('changed_on', 'desc')