marty 2.1.5 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbcd682cde37ed604e64d620393437a1724e9f30
-  data.tar.gz: d3473e2724bd6e74973f3c8747e3a40f680ccda1
+  metadata.gz: 8dc054b69b36c3f88865983281fb580a69870469
+  data.tar.gz: e09a7b2ec29e732f516d803fc9c3acec66db98c9
 SHA512:
-  metadata.gz: 021540ab0f6c04931ee8aa2a343dbf1f9f16bbce2b2d26a5ce245020afc5a4573acaca71ff9a8dd32abde5449afb731e582ba2cf87f1ae7b2d2c0f7832728f01
-  data.tar.gz: cd4eadcc498283fa179c04ca61f2b36e5b9cbab57755d47abbd06a3d147525d8c2e831f18eec18d5fcd57e72cffc6dd63d463c7b5d6b49adeb2fef6599d2a00e
+  metadata.gz: 647481fb469e7dc0a979c792eff8dcfab5367bd44e8df5f28cefde2e781c61e16730e8a29262c2cda1f36f04ee82ea18d87000014705df8126b3d4c26dd04512
+  data.tar.gz: dd873fbce7126aa5ae3c947bc091edece040a8854be98be0991c03cdb32dedd4523c2978d8ea7c6c44d25c4f897bece30fe35b9cdcb79ffafb99cdcab1ecc1d0

data/Gemfile

@@ -28,6 +28,8 @@ group :development, :test do
   gem 'mcfly'
   gem 'netzke', '6.5.0.0'
 
+  # gem 'delorean_lang', path: File.expand_path('../../delorean', __FILE__)
+
   # gem 'marty_rspec', path: File.expand_path('../../marty_rspec', __FILE__)
   gem 'marty_rspec'
 end

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    marty (2.1.5)
+    marty (2.3.0)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay
-      delorean_lang (~> 0.3.37)
+      delorean_lang (~> 0.4.00)
       json-schema
       mcfly (= 0.0.20)
       net-ldap (= 0.12.1)
@@ -93,7 +93,7 @@ GEM
     delayed_job_active_record (4.1.2)
       activerecord (>= 3.0, < 5.2)
       delayed_job (>= 3.0, < 5)
-    delorean_lang (0.3.37)
+    delorean_lang (0.4.00)
       activerecord (>= 3.2)
       treetop (~> 1.5)
     diff-lcs (1.3)
@@ -255,4 +255,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   1.16.1
+   1.16.3

data/app/components/marty/auth_app.rb

@@ -29,12 +29,12 @@ class Marty::AuthApp < Marty::SimpleApp
   end
 
   action :sign_in do |c|
-    c.icon = :door_in
+    c.icon_cls = "fa fa-sign-in-alt gylph"
   end
 
   action :sign_out do |c|
-    c.icon = :door_out
-    c.text = "Sign out #{Mcfly.whodunnit.name}" if Mcfly.whodunnit
+    c.icon_cls = "fa fa-sign-out-alt gylph"
+    c.text     = "Sign out #{Mcfly.whodunnit.name}" if Mcfly.whodunnit
   end
 
   endpoint :sign_in do |params|

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

@@ -2,8 +2,6 @@
     netzkeOnSignIn: function() {
         var me = this;
         this.signinWin = this.signinWin || Ext.create('Ext.Window', {
-            width:      300,
-            height:     150,
             modal:      true,
             layout:     'fit',
 
@@ -47,7 +45,7 @@
             items: {
                 xtype:          'form',
                 defaultType:    'textfield',
-                bodyPadding:    '15px 0px 0px 10px',
+                bodyPadding:    '15px 15px 0px 10px',
                 defaults: {
                     listeners: {
                         specialkey: function (field, event) {

data/app/components/marty/base_rule_view.rb

@@ -47,37 +47,46 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     end
   end
 
-  def self.simple_to_hashstr(s)
-    pairs = []
-    keys = Set.new
+  def self.simple_to_hash(s)
+    result = {}
+    save_linenos = {}
+    last_key = nil
     s.lines.each.with_index(1) do |line, idx|
       next if /\A\s*\z/.match(line)
       line.chomp!
       begin
-        m = /\A\s*([a-z0-9][a-z0-9_]*)\s*=\s*(.*)\s*\z/.match(line)
-        k, v = m[1], m[2]
-        v = [v].to_json[1..-2]
-        raise DupKeyError.new(k, idx) if keys.include?(k)
-        raise unless /\A['"].*['"]\z/.match(v)
-        keys << k
+        m = /\A\s*([a-z][a-z0-9_]*)\s*=\s*(.*)\s*\z/.match(line)
+        if m
+          k, v = m[1], m[2]
+          raise DupKeyError.new(k, idx) if result.keys.include?(k)
+          save_linenos[k] = idx
+          result[k] = v
+          last_key = k
+        else
+          raise unless last_key
+          result[last_key] += "\n" + line.strip
+        end
       rescue DupKeyError => e
         raise
       rescue => e
         raise "syntax error on line #{idx}"
       end
-      pairs << [k, v]
     end
-
-    kvs = pairs.map { |k, v| %Q("#{k}":#{v}) }.join(",")
-    "{#{kvs}}"
+    result
   end
 
   def self.hash_to_simple(h)
     return unless h && h.present?
-    fmt = '%-' +  h.keys.map(&:length).max.to_s + 's = %s'
+    lhs_wid = h.keys.map(&:length).max
+    fmt = "%-#{lhs_wid}s = %s"
+    result = []
     h.map do |k, vstr|
-      fmt % [k, vstr]
-    end.join("\n") || ''
+      vlines = vstr.lines.map(&:chomp)
+      fst = vlines.shift
+      result << fmt % [k, fst]
+      vlines.each {|l| result << " "*(lhs_wid+3) + l}
+    end
+    result.join("\n")
   end
 
   def jsonb_getter(c)
@@ -94,12 +103,15 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
       return r.send(msg, nil) if v.blank?
 
       begin
-        v = ActiveSupport::JSON.decode(
-          Marty::BaseRuleView.simple_to_hashstr(v))
+        final = Marty::BaseRuleView.simple_to_hash(v)
       rescue => e
-        v = { "~~ERROR~~": e.message }
+        final = { "~~ERROR~~": e.message }
       end
-      r.send(msg, v)
+
+      # ActiveRecord ignores change in json key order
+      r.send("#{c}_will_change!") if r[c.to_s].to_a != final.to_a
+
+      r.send(msg, final)
     }
   end
 

data/app/components/marty/data_grid_view.rb

@@ -114,9 +114,9 @@ module Marty; class DataGridView < McflyGridPanel
   end
 
   action :show_grid do |a|
-    a.text    = "Show Grid"
-    a.icon    = :application_view_detail
-    a.handler = :netzke_show_grid
+    a.text     = "Show Grid"
+    a.icon_cls = "fa fa-th-large glyph"
+    a.handler  = :netzke_show_grid
   end
 
   endpoint :show_grid do |params|

data/app/components/marty/event_view.rb

@@ -33,11 +33,6 @@ class Marty::EventView < Marty::Grid
     Marty::Event.cleanup
   end
 
-  action :delete do |a|
-    super(a)
-    a.icon     = :user_delete
-  end
-
   def default_context_menu
     []
   end

data/app/components/marty/form.rb

@@ -1,4 +1,11 @@
-# Netzke Form with Marty permissions
 class Marty::Form < Netzke::Form::Base
   extend ::Marty::Permissions
+
+  client_styles do |c|
+    c.require :form
+  end
+
+  def add_cls_to_fields items
+    items.map{|i| i + {'label_cls' => 'marty-form-field-label'}}
+  end
 end

data/app/components/marty/form/client/form.css

@@ -0,0 +1,3 @@
+.marty-form-field-label {
+    padding-left: 10px;
+}

data/app/components/marty/grid.rb

@@ -1,27 +1,88 @@
 class Marty::Grid < ::Netzke::Grid::Base
-
   extend ::Marty::Permissions
 
   has_marty_permissions read: :any
 
-  def configure_form_window(c)
-    super
-
-    c.klass = Marty::RecordFormWindow
-
-    # Fix Add in form/Edit in form modal popup width
-    # Netzke 0.10.1 defaults width to 80% of screen which is too wide
-    # for a form where the fields are stacked top to bottom
-    # Netzke 0.8.4 defaulted width to 400px - let's make it a bit wider
-    c.width = 475
+  # parent grid is the grid in which child/linked_components is defined
+  # child  components are components dependent on the selected parent row
+  # linked components will update whenever the parent is updated
+  def initialize args, kwargs
+    super(args, kwargs)
+    client_config[:child_components]  = child_components  || []
+    client_config[:linked_components] = linked_components || []
   end
 
   client_class do |c|
-    # For some reason the grid update function was removed in Netzke
-    # 0.10.1.  So, add it here.
-    c.cm_update = l(<<-JS)
+    c.init_component = l(<<-JS)
     function() {
-      this.store.load();
+      this.dockedItems = this.dockedItems || [];
+      if (this.paging == 'pagination') {
+        this.dockedItems.push({
+          xtype: 'pagingtoolbar',
+          dock: 'bottom',
+          layout: {overflowHandler: 'Menu'},
+          listeners: {
+            'beforechange': this.disableDirtyPageWarning ? {} : {
+              fn: this.netzkeBeforePageChange, scope: this
+            }
+          },
+          store: this.store,
+          items: this.bbar && ["-"].concat(this.bbar)
+        });
+      } else if (this.bbar) {
+        this.dockedItems.push({
+          xtype: 'toolbar',
+          dock: 'bottom',
+          layout: {overflowHandler: 'Menu'},
+          items: this.bbar
+        });
+      }
+
+      // block creation of toolbars in parent
+      delete this.bbar;
+      var paging  = this.paging
+      this.paging = false;
+      this.callParent();
+      this.paging = paging
+
+      var me = this;
+
+      var children = me.serverConfig.child_components || [];
+      me.getSelectionModel().on(
+      'selectionchange',
+      function(m) {
+        var has_sel = m.hasSelection();
+        var rid = has_sel ?
+                  me.getSelectionModel().getSelection()[0].getId() : null
+
+        me.serverConfig.selected = rid;
+
+        for (var key in me.actions) {
+          // hacky -- assumes our functions start with "do"
+          if (key.substring(0, 2) == "do") {
+            me.actions[key].setDisabled(!has_sel);
+          }
+        }
+
+        for (var child of children) {
+          var comp = me.netzkeGetComponentFromParent(child);
+          if (comp) {
+            comp.serverConfig.parent_id = rid;
+            if (comp.reload) { comp.reload() }
+          }
+        }
+      });
+
+      var store  = me.getStore();
+      var linked = me.serverConfig.linked_components || [];
+      for (var event of ['update', 'netzkerefresh']) {
+        store.on(event, function() {
+        for (var link of linked) {
+            var comp = me.netzkeGetComponentFromParent(link);
+            if (comp && comp.reload) { comp.reload() }
+          }
+        }, this);
+      }
     }
     JS
 
@@ -40,21 +101,40 @@ class Marty::Grid < ::Netzke::Grid::Base
     }
     JS
 
+    c.reload = l(<<-JS)
+    function(opts={}) {
+      this.netzkeReloadStore(opts);
+    }
+    JS
+
+    c.reload_all = l(<<-JS)
+    function() {
+      var me = this;
+      var children = me.serverConfig.child_components || [];
+      this.store.reload();
+      for (child of children) {
+        var comp = me.netzkeGetComponentFromParent(child);
+        if (comp && comp.reload) { comp.reload() }
+      }
+    }
+    JS
+
     c.clear_filters = l(<<-JS)
     function() {
       this.filters.clearFilters();
     }
     JS
-  end
 
-  component :view_window do |c|
-    configure_form_window(c)
-    c.excluded = !allowed_to?(:read)
-    c.items    = [:view_form]
-    c.title    = I18n.t('netzke.grid.base.view_record',
-                        model: model.model_name.human)
+    c.netzkeGetComponentFromParent = l(<<-JS)
+    function(component_path) {
+      return this.netzkeGetParentComponent().netzkeGetComponent(component_path);
+    }
+    JS
+
   end
 
+  ######################################################################
+
   def class_can?(op)
     self.class.can_perform_action?(op)
   end
@@ -78,20 +158,81 @@ class Marty::Grid < ::Netzke::Grid::Base
     false
   end
 
-  # To add :clear_filters to your app's bbar, add the following lines:
-# def default_bbar
-#   [:clear_filters] + super
-# end
-
-  action :clear_filters do |a|
-    a.text    = "X"
-    a.tooltip = "Clear filters"
-    a.handler = :clear_filters
-  end
-
   def get_json_sorter(json_col, field)
     lambda do |r, dir|
       r.order("#{json_col} ->> '#{field}' " + dir.to_s)
     end
   end
+
+  action :clear_filters do |a|
+    a.tooltip  = "Clear filters"
+    a.handler  = :clear_filters
+    a.icon_cls = "fa fa-minus glyph"
+  end
+
+  # cosmetic changes
+
+  action :add do |a|
+    super(a)
+    a.icon     = nil
+    a.icon_cls = "fa fa-plus glyph"
+  end
+
+  action :add_in_form do |a|
+    super(a)
+    a.icon     = nil
+    a.icon_cls = "fa fa-plus-square glyph"
+  end
+
+  action :edit do |a|
+    super(a)
+    a.icon     = nil
+    a.icon_cls = "fa fa-edit glyph"
+  end
+
+  action :edit_in_form do |a|
+    super(a)
+    a.icon     = nil
+    a.icon_cls = "fa fa-pen-square glyph"
+  end
+
+  action :delete do |a|
+    super(a)
+    a.icon     = nil
+    a.icon_cls = "fa fa-trash glyph"
+  end
+
+  action :apply do |a|
+    super(a)
+    a.icon     = nil
+    a.icon_cls = "fa fa-check glyph"
+  end
+
+  def child_components
+    []
+  end
+
+  def linked_components
+    []
+  end
+
+  def configure_form_window(c)
+    super
+
+    c.klass = Marty::RecordFormWindow
+
+    # Fix Add in form/Edit in form modal popup width
+    # Netzke 0.10.1 defaults width to 80% of screen which is too wide
+    # for a form where the fields are stacked top to bottom
+    # Netzke 0.8.4 defaulted width to 400px - let's make it a bit wider
+    c.width = 475
+  end
+
+  component :view_window do |c|
+    configure_form_window(c)
+    c.excluded = !allowed_to?(:read)
+    c.items    = [:view_form]
+    c.title    = I18n.t('netzke.grid.base.view_record',
+                        model: model.model_name.human)
+  end
 end