gazer 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2748a37dd51a0543b381ea57739cff2f15d1d437
-  data.tar.gz: 8638b34bc120de4baa9a50365186bd6d05d9e787
+  metadata.gz: bba65a2d0d5d20f8283a5f53d2ea4c1f2a4a9fdd
+  data.tar.gz: ead40c217baf8f88fd818d1e80d8b17f92dc7b88
 SHA512:
-  metadata.gz: b580425e8b9c566d0413fc5e67cfd55df01887d73f13796a5eff46f20e1b552910f3d5b63d979fa40ac17e93941a33989fd388f7b57cbd37e0d075d87ce198d8
-  data.tar.gz: c51d839b274280e4722d72aaf9ed761be0304a04a4b6f07b8191423c09a7c1a45859ba315169673db5469d6c16b48efa96d54ccc6b976ff2d9a3eb819d11e4f2
+  metadata.gz: 4ad77310c25c98f7b1939cd0b3d8b29ccd0a6d050c7f4f73bdae7c966a0711d27860522751e1dab3e271800af9c51923ec9d54fee5a0b443ff99860e0b661a80
+  data.tar.gz: f8d6dab46d66ad18ef42473bc32c821dbc548da0d3e609e1c458d29ee0c9f286cf736a9ec8b3ddee527d1a71bcac4e131981564cfe2528c053b8224b80362571

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gazer (0.2.18)
+    gazer (0.2.19)
       looker-sdk (~> 0.0.6)
       netrc (~> 0.11.0)
       pastel (~> 0.7.2)

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

@@ -197,9 +197,15 @@ module Gzr
             end
             )
             (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element) 
+            if existing_element[:result_maker_id] && !new_element[:result_maker_id]
+              element[:result_maker] = nil
+              element[:result_maker_id] = 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]
-            result_maker = copy_result_maker_filterables(new_element)
-            element[:result_maker] = result_maker if result_maker
             return [new_element[:id], update_dashboard_element(existing_element.id,element).id]
           end
           say_warning "Deleting dashboard element #{existing_element.id}" if @options[:debug]
@@ -208,9 +214,13 @@ module Gzr
         end
 
         def process_dashboard_element(dash_elem)
-          return [create_fetch_query(dash_elem[:query]).id, nil, nil] if dash_elem[:query]
+          query = dash_elem[:result_maker]&.fetch(:query, false) || dash_elem[:query]
+          return [create_fetch_query(query).id, nil, nil] if query
+
           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]
-          return [nil,nil,create_merge_result(dash_elem[:merge_result]).id] if dash_elem[:merge_result]
+
+          merge_result = dash_elem[:result_maker]&.fetch(:merge_result, false) || dash_elem[:merge_result]
+          return [nil,nil,create_merge_result(merge_result).id] if merge_result
           [nil,nil,nil]
         end
 

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.18"
+  VERSION = "0.2.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gazer
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Mike DeAngelo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-reader