marty 2.3.5 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d649917183fda05f2022f0d9ed399acdf58d50f
-  data.tar.gz: 4a3276efd02fd70f6a4d5f940936c396ac24b74c
+  metadata.gz: 56b3f0f54fc31cab7647f2955183a57624d2e250
+  data.tar.gz: fe7e62a123c5a0e8189076e9f5d20dd290705a26
 SHA512:
-  metadata.gz: 47959742294ec7c13d84abcd73f830975bb472986ee87eda06f0cd4a1bf4c441008b9e42154ffd4b12a83a4c3c5c8bf9cbe5c860f3acaaf8008236aad0ef9782
-  data.tar.gz: 7af35a03b0480c2cfce4f917586e5058395cc5a6aa20324111ee665918d6fc424dca8c2fb2772a43c3d914a5b4d5671cb840272a409cdce2ccd0c34f02377383
+  metadata.gz: 479aa0ed5a85663ae336e151c4c512fe92dc3da39c8fc5fa661f5307454cf6ed2b7bc0a4ad8e46698e80c32a637edb848ec245d826add0e95fbc7bc9a3e53cc0
+  data.tar.gz: c225c6156c6ca637c51a4fbd69af307d50304e0d83e43da28aca9fa4c56ecf5255318b01d4124ed165a261fb920421d53770d01f1aa69a094f9b39452c674f83

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.3.5)
+    marty (2.3.7)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay

data/app/components/marty/api_log_view.rb

@@ -10,6 +10,7 @@ class Marty::ApiLogView < Marty::Grid
   }
 
   @@attrs = [
+    :timestamp_custom,
     :script,
     :node,
     :attrs,
@@ -80,6 +81,10 @@ class Marty::ApiLogView < Marty::Grid
         c.getter    = lambda { |r| r.details[a.to_s].pretty_inspect }
         c.width     = 900
         c.read_only = true
+        c.filter_with = lambda {
+          |r, v, op|
+          r.where("(details->>'#{a.to_s}')::text #{op} '%#{v}%'")
+        }
       end
     end
   end
@@ -90,5 +95,27 @@ class Marty::ApiLogView < Marty::Grid
       c.getter = lambda { |r| r.details[a.to_s].to_json }
     end
   end
+
+  #copied from log_view.rb
+  attribute :timestamp_custom do |c|
+    c.text         = I18n.t("log_grid.timestamp")
+    c.width        = 200
+    c.read_only    = true
+    c.filterable = true
+    c.xtype        = :datecolumn
+    c.format       = 'Y-m-d h:i:s.u'
+    c.field_config = {
+      xtype: :displayfield,
+    }
+    c.getter = lambda { |r| Time.at(r.timestamp) }
+    c.sorting_scope = lambda {|r, dir| r.order("timestamp " + dir.to_s)}
+
+    # FIXME?: The UI AR/PG DateTime workaround requires the timestamp to be cast
+    # to text in order to compare filter input using the LIKE operator.
+    # Otherwise it will fail. '<' and '>' functionality is missing.
+    c.filter_with = lambda {|r, v, op|
+      r.where("timestamp::text  #{op} '#{v}%'")}
+  end
+
 end
 ApiLogView = Marty::ApiLogView

data/app/components/marty/grid.rb

@@ -56,9 +56,11 @@ class Marty::Grid < ::Netzke::Grid::Base
         var rid = null;
         if (has_sel) {
           if (m.type == 'spreadsheet') {
-            rid = m.getSelected().startCell.record.getId()
-          } else {
-            rid = m.getSelection()[0].getId()
+            var cell = m.getSelected().startCell;
+            rid = cell && cell.record.getId();
+          }
+          if (!rid) {
+            rid = m.getSelection()[0].getId();
           }
         }
 

data/app/components/marty/log_view.rb

@@ -75,6 +75,8 @@ class Marty::LogView < Marty::Grid
 
   column :details do |c|
     c.getter = lambda { |r| CGI.escapeHTML(r.details.pretty_inspect) }
+    c.filter_with = lambda {|r, v, op|
+      r.where("details::text  #{op} '%#{v}%'")}
   end
 
   attribute :details do |c|

data/lib/marty/schema_helper.rb

@@ -1,12 +1,15 @@
 class Marty::SchemaHelper
   include Delorean::Model
+
   delorean_fn :enum_is, sig: 2 do
     |var, value|
     {"properties"=> {var => { "enum"=> value}}}
   end
+
   delorean_fn :bool_is, sig: 2 do
     |var, value|
-    {"properties"=> {var => { "type"=> "boolean", "enum"=> [value]}}}
+    {"allOf"=>[{"required"=>[var]},
+               {"properties"=> {var => { "type"=> "boolean", "enum"=> [value]}}}]}
   end
 
   delorean_fn :or, sig: [1, 20] do

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.3.5"
+  VERSION = "2.3.7"
 end

data/spec/controllers/rpc_controller_spec.rb

@@ -101,6 +101,8 @@ A:
     req1 =?
     req2 =?
     req3 =?
+    newtf =?
+    newfield =?
 
     optif = if opttf == true
                then opttrue
@@ -271,7 +273,9 @@ A:
               "optfalse" :    { "type" : "string" },
               "optdisallow" : { "type" : "string" },
               "req1" :        { "pg_enum" : "CondEnum" },
-              "req2" :        { "pg_enum" : "CondEnum" }
+              "req2" :        { "pg_enum" : "CondEnum" },
+              "newtf" :       { "type" : "boolean" },
+              "newfield":     { "type" : "string" }
          }
 
     req1_is_opt1 = Marty::SchemaHelper.enum_is('req1', ['opt1'])
@@ -280,6 +284,9 @@ A:
     req3_is_opttf = Marty::SchemaHelper.enum_is('req3', ['opttf'])
     opttf_is_true = Marty::SchemaHelper.bool_is('opttf', true)
     opttf_is_false = Marty::SchemaHelper.bool_is('opttf', false)
+    newtf_is_true = Marty::SchemaHelper.bool_is('newtf', true)
+    new_check = Marty::SchemaHelper.required_if(['newfield'],
+                   Marty::SchemaHelper.and(req3_is_opttf, newtf_is_true))
 
     # opt1 is required if req1 == 'opt1'
     opt1_check = Marty::SchemaHelper.required_if(['opt1'], req1_is_opt1)
@@ -322,7 +329,8 @@ A:
                      opttf_check,
                      opttruefalse_check,
                      dip_check,
-                     dinp_check
+                     dinp_check,
+                     new_check
              ] }
 eof
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.7
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg