RubyGems - gazer - Versions diffs - 0.3.18 → 0.3.19 - Mend

gazer 0.3.18 → 0.3.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +7 -0
data/Gemfile.lock +31 -29
data/gzr.gemspec +1 -1
data/lib/gzr/commands/dashboard/import.rb +46 -42
data/lib/gzr/version.rb +1 -1
metadata +7 -7

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbcde8c80190b5590c11a7337e5295504f2e035f4d178d78152aa7fb930cf37f
-  data.tar.gz: dd411c6f1712aacee15d3456b123702f4d78571c28a1401464c3f4dbe77df265
+  metadata.gz: b1588c27858d5bc6f0d1642bb584c49f840c69a0bef305d578681af6fa6620d3
+  data.tar.gz: 4708da68b151238a2ca206d089e3948d3ce547b0e1f1b80e0115a31d4e68c97e
 SHA512:
-  metadata.gz: 6a9883b85bee2116b9fdaec0ec3ed63c0d4d1edec687e750afcf464ce7ef5c27084a6cb27b35fd912a62c414de02075c4ddbe887de91ebb1b74d26029a187cde
-  data.tar.gz: c6bbdd6254eceff942c66b98b7a04eb6dddacbd321a481dbd7747bcf6aa157e7d856abe757ba1122d4e59e826aa8836def7b08ed2dce77838b4467465b299934
+  metadata.gz: 8188396ff4bf9c246e53d268051e398e4a479e03512a9c3b7ecf2452fccfb9a4dc7c34649079c2489568c81c80c30595c6ad46306fb9ba2fd5a32262cb924281
+  data.tar.gz: f36d31956f63a9302e96fc34533969b0de2badf0b34da693d637ae0ac768665dd6ef8ddb4432482356bee71edcdd50fdaf2a635747e9927b6f720f4e431f7094

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,12 @@
 # Changelog
+## [0.3.19](https://github.com/looker-open-source/gzr/compare/v0.3.18...v0.3.19) (2026-03-30)
+### Bug Fixes
+* Refactored dashboard import to properly work with tabbed dashboards ([#274](https://github.com/looker-open-source/gzr/issues/274)) ([3a8edb3](https://github.com/looker-open-source/gzr/commit/3a8edb321a7cf8dd46859d55669236e76351f18d))
 ## [0.3.18](https://github.com/looker-open-source/gzr/compare/v0.3.17...v0.3.18) (2024-08-06)

data/Gemfile.lock CHANGED Viewed

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    gazer (0.3.18)
+    gazer (0.3.19)
       faraday (~> 2.7.8)
       faraday-multipart (~> 1.0)
-      looker-sdk (~> 0.1.6)
+      looker-sdk (~> 0.1.12)
       net-http-persistent (~> 4.0, >= 4.0.1)
       netrc (~> 0.11.0)
       pastel (~> 0.8.0)
@@ -17,45 +17,47 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    connection_pool (2.4.0)
-    diff-lcs (1.4.4)
-    faraday (2.7.8)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
+    base64 (0.3.0)
+    connection_pool (2.5.5)
+    diff-lcs (1.6.2)
+    faraday (2.7.12)
+      base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
     faraday-net_http (3.0.2)
-    looker-sdk (0.1.6)
+    looker-sdk (0.1.12)
       faraday (>= 1.2, < 3.0)
       sawyer (~> 0.8)
-    multipart-post (2.3.0)
-    net-http-persistent (4.0.1)
-      connection_pool (~> 2.2)
+    multipart-post (2.4.1)
+    net-http-persistent (4.0.8)
+      connection_pool (>= 2.2.4, < 4)
     netrc (0.11.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    public_suffix (5.0.1)
+    public_suffix (5.1.1)
     rake (12.3.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby2_keywords (0.0.5)
     rubyzip (1.3.0)
-    sawyer (0.9.2)
+    sawyer (0.9.3)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     strings (0.2.1)
@@ -63,20 +65,20 @@ GEM
       unicode-display_width (>= 1.5, < 3.0)
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
-    thor (1.2.1)
+    thor (1.5.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-reader (0.9.0)
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-table (0.12.0)
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
     tty-tree (0.4.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.6.0)
     unicode_utils (1.4.0)
     wisper (2.0.1)

data/gzr.gemspec CHANGED Viewed

@@ -61,7 +61,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rubyzip', '~> 1.3', '>= 1.3.0'
   spec.add_dependency 'faraday', "~> 2.7.8"
   spec.add_dependency 'faraday-multipart', '~> 1.0'
-  spec.add_dependency 'looker-sdk', "~> 0.1.6"
+  spec.add_dependency 'looker-sdk', "~> 0.1.12"
   spec.add_runtime_dependency 'net-http-persistent', '~> 4.0', '>= 4.0.1'
   spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.10'

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

@@ -77,38 +77,17 @@ module Gzr
                 dashboard[:dashboard_filters].push create_dashboard_filter(filter)
               end
-              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, :query, :merge_result]).include? k
-                end
-                (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element)
-                say_warning "Creating dashboard element #{element.select {|k,v| !v.nil?}.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)
-                say_warning "dashboard_element #{dashboard_element.inspect}" if @options[:debug]
-                if new_element[:alerts]
-                  new_element[:alerts].each do |a|
-                    a.select! do |k,v|
-                      (keys_to_keep('create_alert') - [:owner_id, :dashboard_element_id]).include? k
-                    end
-                    a[:dashboard_element_id] = dashboard_element[:id]
-                    a[:owner_id] = @me[:id]
-                    new_alert = create_alert(a)
-                    say_warning "alert #{JSON.pretty_generate(new_alert)}" if @options[:debug]
-                  end
-                end
-                dashboard[:dashboard_elements].push dashboard_element
-                [new_element[:id], dashboard_element[:id]]
-              end
-              source_dashboard_layouts = data[:dashboard_layouts].map do |new_layout|
+              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 dashboard[:dashboard_layouts] if @options[:debug]
+                if dashboard[:dashboard_layouts].length > 0 && new_layout[:active]
+                  layout_obj = get_dashboard_layout(dashboard[:dashboard_layouts].find { |l| l[:active] }[:id])
                   say_warning "Updating layout #{layout_obj[:id]}" if @options[:debug]
+                  layout = new_layout.select do |k,v|
+                    (keys_to_keep('update_dashboard_layout') - [:id,:dashboard_id]).include? k
+                  end
+                  layout_obj.merge!(layout)
+                  update_dashboard_layout(layout_obj[:id],layout_obj)
                 else
                   layout = new_layout.select do |k,v|
                     (keys_to_keep('create_dashboard_layout') - [:dashboard_id]).include? k
@@ -118,22 +97,47 @@ module Gzr
                   layout_obj = create_dashboard_layout(layout)
                   say_warning "Created dashboard layout #{JSON.pretty_generate layout_obj.map(&:to_a).to_json}" if @options[:debug]
                 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
+                new_layout[:dashboard_layout_components].each do |new_component|
+                  new_element_id = new_component[:dashboard_element_id]
+                  new_element = data[:dashboard_elements].find { |e| e[:id] == new_element_id }
+                  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, :query, :merge_result]).include? k
+                  end
+                  (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element)
+                  say_warning "Creating dashboard element #{element.select {|k,v| !v.nil?}.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
+                  element[:dashboard_layout_id] = layout_obj[:id]
+                  dashboard_element = create_dashboard_element(element)
+                  say_warning "dashboard_element #{dashboard_element.inspect}" if @options[:debug]
+                  if new_element[:alerts]
+                    new_element[:alerts].each do |a|
+                      a.select! do |k,v|
+                        (keys_to_keep('create_alert') - [:owner_id, :dashboard_element_id]).include? k
+                      end
+                      a[:dashboard_element_id] = dashboard_element[:id]
+                      a[:owner_id] = @me[:id]
+                      new_alert = create_alert(a)
+                      say_warning "alert #{JSON.pretty_generate(new_alert)}" if @options[:debug]
+                    end
+                  end
+                  target_components = get_dashboard_layout(layout_obj[:id])[:dashboard_layout_components]
+                  target_component = target_components.find do |c|
+                    c[:dashboard_element_id] == dashboard_element[:id]
+                  end
+                  target_component.merge!(new_component.select do |k,v|
+                    (keys_to_keep('update_dashboard_layout_component') - [:id,:dashboard_layout_id,:dashboard_element_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)
+                  say_warning "Updating dashboard layout component #{target_component[:id]}" if @options[:debug]
+                  update_dashboard_layout_component(target_component[:id],target_component)
                 end
               end
               upsert_plans_for_dashboard(dashboard[:id],@me[:id],data[:scheduled_plans]) if data[:scheduled_plans]
               output.puts "Imported dashboard #{dashboard[:id]}" unless @options[:plain]
               output.puts dashboard[:id] if @options[:plain]

data/lib/gzr/version.rb CHANGED Viewed

@@ -20,5 +20,5 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 module Gzr
-  VERSION = '0.3.18'.freeze
+  VERSION = '0.3.19'.freeze
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gazer
 version: !ruby/object:Gem::Version
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors:
 - Mike DeAngelo
-autorequire:
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2026-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader
@@ -154,14 +154,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.12
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -480,7 +480,7 @@ homepage: https://github.com/looker-open-source/gzr
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -496,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key:
 specification_version: 4
 summary: Command line tool to manage the content of a Looker instance.
 test_files: []