Skip to content

Commit 6208ff8

Browse files
committed
[NEP-18619]: Refactoring
1 parent 39f8a6c commit 6208ff8

File tree

1 file changed

+11
-8
lines changed
  • lib/superset/dashboard/datasets

1 file changed

+11
-8
lines changed

lib/superset/dashboard/datasets/list.rb

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,17 @@ def datasets_details
4444
chart_dataset_ids = chart_datasets.map{|d| d['id'] }
4545
filter_dataset_ids_not_used_in_charts = filter_dataset_ids - chart_dataset_ids
4646
return chart_datasets if filter_dataset_ids_not_used_in_charts.empty?
47-
filter_datasets = filter_dataset_ids_not_used_in_charts.map do |filter_dataset_id|
47+
dashboard_datasets = chart_datasets + filter_datasets(filter_dataset_ids_not_used_in_charts)
48+
end
49+
50+
private
51+
52+
def filter_dataset_ids
53+
@filter_dataset_ids ||= Superset::Dashboard::Filters::List.new(id).perform
54+
end
55+
56+
def filter_datasets(filter_dataset_ids_not_used_in_charts)
57+
filter_dataset_ids_not_used_in_charts.map do |filter_dataset_id|
4858
filter_dataset = Superset::Dataset::Get.new(filter_dataset_id).result
4959
database_info = {
5060
'id' => filter_dataset['database']['id'],
@@ -53,13 +63,6 @@ def datasets_details
5363
}
5464
filter_dataset.slice('id', 'datasource_name', 'schema', 'sql').merge('database' => database_info).with_indifferent_access
5565
end
56-
dashboard_datasets = chart_datasets + filter_datasets
57-
end
58-
59-
private
60-
61-
def filter_dataset_ids
62-
@filter_dataset_ids ||= Superset::Dashboard::Filters::List.new(id).perform
6366
end
6467

6568
def route

0 commit comments

Comments
 (0)