gazer 0.2.36 → 0.2.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b171fe3c480e72780a9b90a0373654e7e9e3dafc2e22e148f229fae80cbacdb
-  data.tar.gz: 1e46749fc5a805f9a3632ff832bd147530d5da7c651e90aa4b6f6baaceaa39d6
+  metadata.gz: f5250ec3e944f1bc95ef659290ad1c703387ceca113aac02aebae90aa38f0183
+  data.tar.gz: 43f01e229c1a2f417b28b035f3534273c4732e28b14861b5b2e13d7aa802ed5f
 SHA512:
-  metadata.gz: 64ff99189d390dd6d98bdad6339a094c3b2aa0565c498c6af38b0b81ffe595ace06531e9482b580c83c5916e812459fb507901d8906caf0699687e0579c59fa3
-  data.tar.gz: 6b7cb1b39903606563c13f79ca9c7467c70108840fbe9a00e8a3594ccad4c4506235f434dba054751285ed328b7949a176cbe540cdf68f86eb1b671a9b6a916f
+  metadata.gz: a0735c0b31a6b9dfee9f2b40b7915396e5eeea376385effafccc19761d73727715d9475709c86335800736b71b91a90c4ebfcb6b89de01185eb13f95ba91d99d
+  data.tar.gz: a9593497bb276fed67cfc3967465d5be31eaa624deb0d33d6423210c70f02460f9c9dde277508369920777930b630b55f62f76fedcee200f181755c9a3ba8eef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gazer (0.2.36)
+    gazer (0.2.37)
       looker-sdk (~> 0.0.7)
       netrc (~> 0.11.0)
       pastel (~> 0.7.2)

data/lib/gzr/commands/dashboard/import.rb

@@ -55,31 +55,60 @@ module Gzr
 
               dashboard = sync_dashboard(data,@dest_space_id, output: output)
 
+
+              dashboard[:dashboard_filters] ||= []
               source_filters = data[:dashboard_filters].sort { |a,b| a[:row] <=> b[:row] }
-              existing_filters = dashboard.dashboard_filters.sort { |a,b| a.row <=> b.row }
-              existing_filters.collect! do |e|
-                matches_by_name_title = source_filters.select { |s| s[:row] != e.row && (s[:title] == e.title || s[:name] == e.name) }
-                if matches_by_name_title.length > 0
-                  delete_dashboard_filter(e.id)
-                  nil
-                else
-                  e
+              source_filters.each do |new_filter|
+                filter = new_filter.select do |k,v|
+                  (keys_to_keep('create_dashboard_filter') + [:row]).include? k
                 end
-              end
-              pairs(source_filters,existing_filters,dashboard.id) do |source,target,id|
-                say_warning("Synching dashboard filter for dashboard #{id}", output: output) if @options[:debug]
-                sync_dashboard_filter(source,target,id)
+                filter[:dashboard_id] = dashboard.id
+                say_warning "Creating filter" if @options[:debug]
+                dashboard[:dashboard_filters].append create_dashboard_filter(filter)
               end
 
-              elem_table = pairs(data[:dashboard_elements],dashboard.dashboard_elements,dashboard.id) do |source,target,id|
-                sync_dashboard_element(source,target,id)
+              dashboard[:dashboard_elements] ||= []
+              elem_table = data[:dashboard_elements].map do |new_element|
+                element = new_element.select do |k,v|
+                  (keys_to_keep('create_dashboard_element') - [:dashboard_id, :look_id, :query_id, :merge_result_id, :result_maker_id]).include? k
+                end
+                (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element) 
+                say_warning "Creating dashboard element #{element.inspect}" if @options[:debug]
+                element[:dashboard_id] = dashboard.id
+                result_maker = copy_result_maker_filterables(new_element)
+                element[:result_maker] = result_maker if result_maker
+                dashboard_element = create_dashboard_element(element)
+                dashboard[:dashboard_elements].push dashboard_element
+                [new_element[:id], dashboard_element.id]
               end
 
-              source_dashboard_layouts = data[:dashboard_layouts].sort_by { |v| (v[:active] ? 0 : 1) }
-              existing_dashboard_layouts = dashboard.dashboard_layouts.sort_by { |v| (v.active ? 0 : 1) }
-              pairs(source_dashboard_layouts,existing_dashboard_layouts) do |s,t|
-                sync_dashboard_layout(dashboard.id,s,t) do |s,t|
-                  sync_dashboard_layout_component(s,t,elem_table)
+              source_dashboard_layouts = data[:dashboard_layouts].map do |new_layout|
+                layout_obj = nil
+                if new_layout[:active] 
+                  layout_obj = get_dashboard_layout(dashboard[:dashboard_layouts].first.id)
+                  say_warning "Updating layout #{layout_obj.id}" if @options[:debug]
+                else  
+                  layout = new_layout.select do |k,v|
+                    (keys_to_keep('create_dashboard_layout') - [:dashboard_id]).include? k
+                  end
+                  layout[:dashboard_id] = dashboard.id
+                  say_warning "Creating dashboard layout #{layout}" if @options[:debug]
+                  layout_obj = create_dashboard_layout(layout)
+                end
+                layout_components = new_layout[:dashboard_layout_components].zip(layout_obj.dashboard_layout_components)
+                layout_components.each do |source,target|
+                  component = keys_to_keep('update_dashboard_layout_component').collect do |e|
+                    [e,nil]
+                  end.to_h
+                  component[:dashboard_layout_id] = target.dashboard_layout_id
+
+                  component.merge!(source.select do |k,v|
+                    (keys_to_keep('update_dashboard_layout_component') - [:id,:dashboard_layout_id]).include? k
+                  end)
+
+                  component[:dashboard_element_id] = elem_table.assoc(source[:dashboard_element_id])[1]
+                  say_warning "Updating dashboard layout component #{target.id}" if @options[:debug]
+                  update_dashboard_layout_component(target.id,component)
                 end
               end
               upsert_plans_for_dashboard(dashboard.id,@me.id,data[:scheduled_plans]) if data[:scheduled_plans]
@@ -127,7 +156,24 @@ module Gzr
             end
             new_dash[:slug] = source[:slug] unless slug_used
             new_dash[:deleted] = false if existing_dashboard[:deleted]
-            return update_dashboard(existing_dashboard.id,new_dash)
+            d = update_dashboard(existing_dashboard.id,new_dash)
+
+            d.dashboard_filters.each do |f|
+              delete_dashboard_filter(f.id)
+            end
+            d.dashboard_filters = []
+
+            d.dashboard_elements.each do |e|
+              delete_dashboard_element(e.id)
+            end
+            d.dashboard_elements = []
+
+            d.dashboard_layouts.each do |l|
+              delete_dashboard_layout(l.id) unless l.active
+            end
+            d.dashboard_layouts.select! { |l| l.active }
+
+            return d
           else
             new_dash = source.select do |k,v|
               (keys_to_keep('create_dashboard') - [:space_id,:folder_id,:user_id,:slug]).include? k
@@ -139,26 +185,6 @@ module Gzr
           end
         end
 
-        def sync_dashboard_filter(new_filter,existing_filter,dashboard_id)
-          if new_filter && !existing_filter then
-            filter = new_filter.select do |k,v|
-              (keys_to_keep('create_dashboard_filter') + [:row]).include? k
-            end
-            filter[:dashboard_id] = dashboard_id
-            say_warning "Creating filter" if @options[:debug]
-            return create_dashboard_filter(filter)
-          end
-          if existing_filter && new_filter then
-            filter = new_filter.select do |k,v|
-              (keys_to_keep('update_dashboard_filter') + [:row]).include? k
-            end
-            say_warning "Updating filter #{existing_filter.id}" if @options[:debug]
-            return update_dashboard_filter(existing_filter.id,filter)
-          end
-          say_warning "Deleting filter #{existing_filter.id}" if @options[:debug]
-          return delete_dashboard_filter(existing_filter.id)
-        end
-
         def copy_result_maker_filterables(new_element)
           return nil unless new_element[:result_maker]
           if new_element[:result_maker].fetch(:filterables,[]).length > 0
@@ -173,51 +199,6 @@ module Gzr
           nil
         end
 
-        def sync_dashboard_element(new_element,existing_element,dashboard_id)
-          if (new_element&.fetch(:type) == 'text' && existing_element && existing_element[:type] != 'text')
-            say_warning "Deleting dashboard element #{existing_element.id} to recreate it" if @options[:debug]
-            delete_dashboard_element(existing_element.id)
-            existing_element = nil
-          end
-
-          if new_element && !existing_element then
-            element = new_element.select do |k,v|
-              (keys_to_keep('create_dashboard_element') - [:dashboard_id, :look_id, :query_id, :merge_result_id]).include? k
-            end
-            (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element) 
-            say_warning "Creating dashboard element #{element.inspect}" if @options[:debug]
-            element[:dashboard_id] = dashboard_id
-            result_maker = copy_result_maker_filterables(new_element)
-            element[:result_maker] = result_maker if result_maker
-            return [new_element[:id], create_dashboard_element(element).id]
-          end
-          if existing_element && new_element then
-            element = keys_to_keep('update_dashboard_element').collect do |e|
-              [e,nil]
-            end.to_h
-
-            element[:dashboard_id] = dashboard_id
-
-            element.merge!( new_element.select do |k,v|
-              (keys_to_keep('update_dashboard_element') - [:dashboard_id, :look_id, :query_id, :merge_result_id]).include? k
-            end
-            )
-            (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element) 
-            if existing_element[:result_maker] && !new_element[:result_maker]
-              element[:result_maker] = nil
-            elsif new_element[:result_maker]
-              result_maker = copy_result_maker_filterables(new_element)
-              element[:result_maker] = result_maker if result_maker
-            end
-
-            say_warning "Updating dashboard element #{existing_element.id}" if @options[:debug]
-            return [new_element[:id], update_dashboard_element(existing_element.id,element).id]
-          end
-          say_warning "Deleting dashboard element #{existing_element.id}" if @options[:debug]
-          delete_dashboard_element(existing_element.id)
-          return [nil,existing_element.id]
-        end
-
         def process_dashboard_element(dash_elem)
           return [nil, upsert_look(@me.id, create_fetch_query(dash_elem[:look][:query]).id, @dest_space_id, dash_elem[:look]).id, nil] if dash_elem[:look]
 
@@ -230,56 +211,6 @@ module Gzr
           [nil,nil,nil]
         end
 
-        def sync_dashboard_layout(dashboard_id,new_layout,existing_layout)
-          layout_obj = nil
-          if new_layout && !existing_layout then
-            layout = new_layout.select do |k,v|
-              (keys_to_keep('create_dashboard_layout') - [:dashboard_id]).include? k
-            end
-            layout[:dashboard_id] = dashboard_id
-            say_warning "Creating dashboard layout #{layout}" if @options[:debug]
-            layout_obj = create_dashboard_layout(layout)
-          end
-          if new_layout && existing_layout then
-            layout = new_layout.select do |k,v|
-              (keys_to_keep('update_dashboard_layout') - [:dashboard_id]).include? k
-            end
-            say_warning "Updating dashboard layout #{existing_layout.id}" if @options[:debug]
-            layout_obj = update_dashboard_layout(existing_layout.id,layout)
-          end
-          if !new_layout && existing_layout then
-            say_warning "Deleting dashboard layout #{existing_layout.id}" if @options[:debug]
-            delete_dashboard_layout(existing_layout.id)
-          end
-
-          return unless layout_obj
-
-          #say_warning "new_layout[:active] is #{new_layout&.fetch(:active)} for #{layout_obj.id}"
-          #if layout_obj && new_layout&.fetch(:active,false)
-          #  say_warning "Setting layout #{layout_obj.id} active"
-          #  update_dashboard_layout(layout_obj.id, { :active => true })
-          #end
-
-          layout_components = new_layout[:dashboard_layout_components].zip(layout_obj.dashboard_layout_components)
-          return layout_components unless block_given?
-
-          layout_components.each { |s,t| yield(s,t) }
-        end
-
-        def sync_dashboard_layout_component(source, target, elem_table)
-          component = keys_to_keep('update_dashboard_layout_component').collect do |e|
-            [e,nil]
-          end.to_h
-          component[:dashboard_layout_id] = target.dashboard_layout_id
-
-          component.merge!(source.select do |k,v|
-            (keys_to_keep('update_dashboard_layout_component') - [:id,:dashboard_layout_id]).include? k
-          end)
-
-          component[:dashboard_element_id] = elem_table.assoc(source[:dashboard_element_id])[1]
-          say_warning "Updating dashboard layout component #{target.id}" if @options[:debug]
-          update_dashboard_layout_component(target.id,component)
-        end
       end
     end
   end

data/lib/gzr/modules/dashboard.rb

@@ -139,6 +139,17 @@ module Gzr
       data
     end
 
+    def get_dashboard_layout(id)
+      begin
+        data = @sdk.dashboard_layout(id)
+      rescue LookerSDK::Error => e
+        say_error "Error getting dashboard_layout(#{id})"
+        say_error e.message
+        raise
+      end
+      data
+    end
+
     def create_dashboard_layout(dash_layout)
       begin
         data = @sdk.create_dashboard_layout(dash_layout)

data/lib/gzr/version.rb

@@ -20,5 +20,5 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module Gzr
-  VERSION = "0.2.36"
+  VERSION = "0.2.37"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gazer
 version: !ruby/object:Gem::Version
-  version: 0.2.36
+  version: 0.2.37
 platform: ruby
 authors:
 - Mike DeAngelo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader
@@ -357,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Command line tool to manage the content of a Looker instance.