marty 10.0.0 → 10.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9a92073fa74d9777548dbafce731dbb8100918a4b3e696cdf00b06b1b20bbd8
-  data.tar.gz: b2b048bd619a886a1ebafbfaba5e73f017c44fdaaa1f55190ade7d7abb32cea7
+  metadata.gz: b5d6d6cf461151669f3685da2c7a4b55564e571f16b2dfb94a500ee7229ebd25
+  data.tar.gz: f1b8b7d2a8ee38da6c96ec0fc16917b0b9b6d57837fc6f772adcf7b55a10c23c
 SHA512:
-  metadata.gz: 82e24b64bee5533356e3c4a0f6d22bb850d9fe24fd300e9d921f98beb7193b119ccc9a31ba11ee766bb0ade94d2fa8a961318b828805ea611dbfedc375c61503
-  data.tar.gz: 76d6757d910bc340d53a4930f846f698a9fa855c8827ec8fff1bd9a82c21346d55f703c41fc5d0f4f7f8871593282125ad628ced7610eee743518a15858dfc49
+  metadata.gz: 381605ae8add5c23b97c06190ebfa5b2bf8c6f3e958fcbb44dc64a5dafd5b709aa608f7e7321b3fd3bdcee6a3ed067c7232e8226e611f4410c859f06b756138d
+  data.tar.gz: 150f1fe10f330f81c91211428ef0921c5ffd401dd550655549cbe56b619f940008e839ec94eee0ec59d959628f8f43069f29ef95987fd33f33f9136ba12a59a7

data/app/components/marty/base_rule_view.rb

@@ -253,10 +253,18 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
   end
 
   def form_items_results
-    [jsonb_field(:results,
-                 getter: jsonb_simple_getter(:results),
-                 setter: jsonb_simple_setter(:results),
-                 height: 225)]
+    [
+      jsonb_field(
+        :results,
+        {
+          getter: jsonb_simple_getter(:results),
+          setter: jsonb_simple_setter(:results),
+          min_height: 150,
+          height: nil, # must be nil to allow the field to resize automatically
+          grow: true,
+        }
+      )
+    ]
   end
 
   def default_form_items_guards

data/app/components/marty/component_util.rb

@@ -0,0 +1,31 @@
+module Marty
+  module ComponentUtil
+    def self.extended(klass)
+      klass.client_class do |c|
+        c.include :component_util
+      end
+    end
+
+    def self.simple_html_table_gen(what, data)
+      return "No #{what}" if data.blank?
+
+      xm = Builder::XmlMarkup.new(indent: 2)
+      xm.style(
+        'table.simple_popup { border-spacing: 10px 10px; }
+         tr.simple_popup_gray { background-color: rgb(220,220,220); }
+         td.simple_popup { padding: 5px 20px 5px 20px; }'
+      )
+      xm.table(class: 'simple_popup') do
+        xm.tr { data[0].keys.each { |key| xm.th(key, class: 'simple_popup') } }
+        data.each do |row|
+          xm.tr do
+            row.values.each do |value|
+              xm.td(value, class: 'simple_popup')
+            end
+          end
+        end
+      end
+      xm.target!
+    end
+  end
+end

data/app/components/marty/component_util/client/component_util.js

@@ -0,0 +1,14 @@
+({
+  createPopupWindow(html_to_show, title_to_show, height_to_use, width_to_use) {
+    Ext.create("Ext.Window", {
+      height: height_to_use,
+      minWidth: width_to_use,
+      autoWidth: true,
+      layout: "fit",
+      modal: false,
+      autoScroll: true,
+      html: html_to_show,
+      title: title_to_show
+    }).show();
+  }
+});

data/app/components/marty/extras/layout.rb

@@ -172,6 +172,8 @@ module Layout
   def range_setter(name, json_field = nil)
     if json_field
       lambda do |r, v|
+        v = nil if v.blank?
+
         cookedv = v && v.present? && (Marty::Util.human_to_pg_range(v) rescue v)
         h = r.send(json_field)
         if cookedv
@@ -183,6 +185,8 @@ module Layout
       end
     else
       lambda do |r, v|
+        next r.send("#{name}=", nil) if v.blank?
+
         r.send("#{name}=", v && (Marty::Util.human_to_pg_range(v) rescue v))
       end
     end

data/lib/marty/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Marty
-  VERSION = '10.0.0'
+  VERSION = '10.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.0.2
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-06 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -321,6 +321,8 @@ files:
 - app/components/marty/background_job/schedule_jobs_logs.rb
 - app/components/marty/base_rule_view.rb
 - app/components/marty/base_rule_view/client/base_rule_view.js
+- app/components/marty/component_util.rb
+- app/components/marty/component_util/client/component_util.js
 - app/components/marty/config_view.rb
 - app/components/marty/data_grid_user_view.rb
 - app/components/marty/data_grid_view.rb