superset 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565da0973df5cfd3aa9f1c555f477a9a9d710870c143ea2ca1678ff85febf3e6
-  data.tar.gz: 75620c8a9459443001e1b0ea62ccc5375f77d7bf5eb7b6bc6705bb840ed73b36
+  metadata.gz: b991d014f7094976acde768b112309443a38f741c2b4d2834ecc9575366ad1eb
+  data.tar.gz: 5701ba1956f94f51037b78f878cb6bb154c74509d4c86d9b0e2b71c83abc1af8
 SHA512:
-  metadata.gz: 754a540a0a88322c7b63efce92ab04d44d3aaaebdd865f12ff7397414804e39a9e3a2586a6cfad0e26e0681fd556d22bc23b515ad69f7bc8ecdfd0a2f8aeb7b0
-  data.tar.gz: 4c1f810364a9389712183eabb06c81d473a634d8e6f6306d3b7b4b312818ad872df252f071f6b29df73cf622ebc3d0db37f009a0600a83358c464832a3f607c9
+  metadata.gz: aaa349b9a890fea6b8a45323d80aca1ed9b57d0a71a39defed7430b72ce2ab92a37671b8f91d745c178d55d3e28d2e14b35fbad01c22c38db517ea13cafa94e9
+  data.tar.gz: 305171e61d4c0ecb3d5cd9b4c7e828f57aa3002e2b089996356c41264046095677c012ed6a147e4baad51aa74110e0189002f7967984b12f6fff22b361e40527

data/lib/superset/dashboard/datasets/list.rb

@@ -9,7 +9,7 @@ module Superset
       class List < Superset::Request
         attr_reader :dashboard_id, :include_filter_datasets, :include_catalog_lookup # id - dashboard id
 
-        def initialize(dashboard_id:, include_filter_datasets: false, include_catalog_lookup: false)
+        def initialize(dashboard_id:, include_filter_datasets: true, include_catalog_lookup: true)
           @dashboard_id = dashboard_id
           @include_filter_datasets = include_filter_datasets
           @include_catalog_lookup = include_catalog_lookup
@@ -22,7 +22,7 @@ module Superset
 
         def datasets_details
           @datasets_details ||= begin
-            datasets_list = chart_datasets + additional_filter_datasets
+            datasets_list = chart_datasets + Array(additional_filter_datasets)
             datasets_list = include_catalog_details(datasets_list) if include_catalog_lookup
             datasets_list.compact
           end
@@ -42,15 +42,9 @@ module Superset
 
         def rows
           datasets_details.map do |d|
-            [
-              d[:id],
-              d[:datasource_name],
-              d[:database][:id],
-              d[:database][:name],
-              d[:database][:backend],
-              d[:schema],
-              d[:filter_only]
-            ]
+            row = [d[:id], d[:datasource_name], d[:database][:backend], d[:database][:id], d[:database][:name]]
+            row << d[:catalog] if include_catalog_lookup
+            row + [d[:schema], d[:filter_only]]
           end
         end
 
@@ -69,11 +63,11 @@ module Superset
 
         # list of any additional filter dataset details on the dashboard that are not used in charts
         def additional_filter_datasets
-          return [] unless include_filter_datasets
+          return unless include_filter_datasets
 
           chart_dataset_ids = chart_datasets.map{|d| d['id'] }
           filter_dataset_ids_not_used_in_charts = filter_dataset_ids - chart_dataset_ids
-          retrieve_filter_datasets(filter_dataset_ids_not_used_in_charts) unless filter_dataset_ids_not_used_in_charts.empty?
+          retrieve_filter_datasets(filter_dataset_ids_not_used_in_charts)
         end
 
         def filter_dataset_ids
@@ -100,7 +94,9 @@ module Superset
         end
 
         def list_attributes
-          ['id', 'datasource_name', 'database_id', 'database_name', 'database_backend', 'schema', 'filter_only'].map(&:to_sym)
+          base = %w[id datasource_name database_backend database_id database_name]
+          base << 'catalog' if include_catalog_lookup
+          (base + %w[schema filter_only]).map(&:to_sym)
         end
 
         # when displaying a list of datasets, show dashboard title as well

data/lib/superset/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Superset
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: superset
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - jbat