kennel 1.49.0 → 1.50.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0aabf5d65787da727c8f2fe6d4e42a3d88bca6cf31a426b2b29efbacc29316
-  data.tar.gz: 8058d85578b7bf7247c26e50c8759fb4036977f22f321068283c1da77cf5e25e
+  metadata.gz: d3cb84b8e35c48c089b3f355988bb8fff0f7d1c03ce863fe68bf77cd94622703
+  data.tar.gz: 79fb571d0ebfe6152ce269377af8d808a25b549cc0fdf0ee2b52b4f92b243d61
 SHA512:
-  metadata.gz: 80e9d102685107b747629f2df6045b30f588a1f9f9f7df2a668bfa7513fb96f47606c929d5276734282031328766210ae7c8dc260ef0e259a6cac4e36e915b22
-  data.tar.gz: 762d5d95e419700fd9deb1b0c56fcaed33a460e3c65a4ed8d8f4ebd8c60875438d402423b48d62a086efe3b79019e72b64fd43bb59251ed20308039735f9f01a
+  metadata.gz: 20087313f79d2ac2f019ccefd341731c6ede13d2df75e4c06eca980d67fd672727c72253a32c1e30f54c81d20f60c5944f22b31fac69e534f412149ca632e907
+  data.tar.gz: 062a7e8269ba9bacec21e271cdb42208b4c93b6a6d478bb78895cd82969a88fcb4b4528a5a5e967a2d17052bc5d93120999e08e4f80963d0673a768ea906cbf7

data/lib/kennel/models/dashboard.rb

@@ -73,12 +73,15 @@ module Kennel
 
       def as_json
         return @json if @json
+        all_widgets = render_definitions + widgets
+        expand_q all_widgets
+
         @json = {
           layout_type: layout_type,
           title: "#{title}#{LOCK}",
           description: description,
           template_variables: render_template_variables,
-          widgets: render_definitions + widgets
+          widgets: all_widgets
         }
 
         @json[:id] = id if id
@@ -110,6 +113,20 @@ module Kennel
 
       private
 
+      # creates queries from metadata to avoid having to keep q and expression in sync
+      #
+      # {q: :metadata, metadata: [{expression: "sum:bar", alias_name: "foo"}, ...], }
+      # -> {q: "sum:bar, ...", metadata: ..., }
+      def expand_q(widgets)
+        widgets = widgets.flat_map { |w| w.dig(:definition, :widgets) || w } # expand groups
+        widgets.each do |w|
+          w.dig(:definition, :requests)&.each do |request|
+            next unless request.is_a?(Hash) && request[:q] == :metadata
+            request[:q] = request.fetch(:metadata).map { |m| m.fetch(:expression) }.join(", ")
+          end
+        end
+      end
+
       def resolve_link(id, id_map)
         return id unless tracking_id?(id)
         id_map[id] ||

data/lib/kennel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Kennel
-  VERSION = "1.49.0"
+  VERSION = "1.50.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kennel
 version: !ruby/object:Gem::Version
-  version: 1.49.0
+  version: 1.50.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday