marty 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb20c0c17b789a6d536df2d8cda264d970017f7a
-  data.tar.gz: 14a7749520e7873293f76f983d40216d75ba086b
+  metadata.gz: eb8e6c31b7c3d069f58ef86fa901ac18df05c7a0
+  data.tar.gz: 9208a3fcbab2e2e42a01c9a4c84ce59c05391aab
 SHA512:
-  metadata.gz: 02b863d6700821ca598cea99cc08278b49d1d2682db2b136cb8433b19c00838b0db8cf481cfb732480597ed7d87776592cbfeed8023a6d2c7835bf6c7009e177
-  data.tar.gz: cd2f4c0508a096a6d817885e35f2fa66896428053280bde96b340400dfc58380929cb33cb26c36ad571814f589fa9e718dfb84a65d9dd493d0cb4a2787b4a5ea
+  metadata.gz: 72de58e1116dd97de068be07a05a91f8c7e08cf9ae80be8edb2e2043b0ebb8b8f88de09a93b957e16bc8377ec1b207cdb6e37c21074cf904cf9548b90b8c844e
+  data.tar.gz: 202dd1ea697678aa730e02801b76fb4ffe68a93a75f343b77402317e6dc238ed7d7e14dfd3019c8813b36729bae05c793f1fd63d4ce017be503bb36fda36e65e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.0.5)
+    marty (2.0.7)
       axlsx (= 3.0.0pre)
       coderay
       delorean_lang (~> 0.3.37)

data/app/components/marty/base_rule_view.rb

@@ -135,6 +135,12 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     c.height = 740
   end
 
+  component :view_window do |c|
+    super(c)
+    c.width = 1500
+    c.height = 740
+  end
+
   attribute :name do |c|
     c.width = 150
   end

data/app/components/marty/grid.rb

@@ -6,6 +6,9 @@ class Marty::Grid < ::Netzke::Grid::Base
 
   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
@@ -22,6 +25,28 @@ class Marty::Grid < ::Netzke::Grid::Base
     }
     JS
 
+    c.do_view_in_form = l(<<-JS)
+    function(record){
+      this.netzkeLoadComponent("view_window", {
+        serverConfig: {record_id: record.id},
+        callback: function(w){
+          w.show();
+          w.on('close', function(){
+            if (w.closeRes === "ok") {
+              this.netzkeReloadStore();
+            }
+          }, this);
+        }});
+    }
+    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)
   end
 
   def class_can?(op)

data/app/components/marty/record_form_window.rb

@@ -0,0 +1,12 @@
+class Marty::RecordFormWindow < Netzke::Basepack::RecordFormWindow
+  def configure(c)
+    super c
+    c.fbar = [] if c.item_id == 'view_window'
+  end
+
+  component :view_form do |c|
+    preconfigure_form(c)
+    c.record_id = config.client_config[:record_id]
+    c.mode = :lockable
+  end
+end

data/app/models/marty/data_grid.rb

@@ -87,8 +87,11 @@ class Marty::DataGrid < Marty::Base
   gen_mcfly_lookup :lookup, [:name], cache: true
   gen_mcfly_lookup :get_all, [], mode: nil
 
-  def self.lookup_h(pt, name, fields = nil)
-    fields ||= %w(id group_id created_dt metadata data_type)
+  # FIXME: if the caller requests data as part of fields, there could
+  # be memory concerns with caching since some data_grids have massive data
+  cached_delorean_fn :lookup_h, sig: [2, 3] do
+    |pt, name, fields = nil|
+    fields ||= %w(id group_id created_dt metadata data_type name)
     dga = mcfly_pt(pt).where(name: name).pluck(*fields).first
     dga && Hash[fields.zip(dga)]
   end

data/app/models/marty/delorean_rule.rb

@@ -124,14 +124,6 @@ class Marty::DeloreanRule < Marty::BaseRule
     kl = ruleh["classname"].constantize
     kl.compute(ruleh, metadata_opts, pt, params, grid_names_p)
   end
-  delorean_fn :reporting_metadata, sig: 2 do
-    |ruleh, metadata_opts|
-    rmdkeys = metadata_opts.select{|_, v| v["reporting_metadata"]}.keys
-    rmdkeys.each_with_object({}) do |k, h|
-      fr = ruleh['fixed_results']
-      h[k] = fr[k] if fr.include?(k)
-    end
-  end
   delorean_fn :route_compute_rs, sig: 3 do
     |ruleh, pt, features|
     kl = ruleh["classname"].constantize

data/app/models/marty/promise.rb

@@ -16,7 +16,21 @@ class Marty::Promise < Marty::Base
   # default timeout (seconds) to wait for jobs to start
   DEFAULT_JOB_TIMEOUT = Rails.configuration.marty.job_timeout || 10
 
-  lazy_load :result
+  SELECT_COLS = columns.map(&:name)-["result"]
+  default_scope {
+    select(*SELECT_COLS)
+  }
+  def result
+    unless has_attribute?(:result)
+      changes_before_reload = self.changes.clone
+      self.reload
+      changes_before_reload.each{
+        |attribute_name, values|
+        self.send("#{attribute_name}=", values[1])
+      }
+    end
+    read_attribute :result
+  end
 
   serialize :result, MarshalResult.new
 

data/config/locales/en.yml

@@ -166,3 +166,8 @@ en:
     data_grid__name: Data Grid
     breakeven_data_grid__name: Breakeven Data Grid
     data_grid_view: Data Grids
+
+  netzke:
+    grid:
+      base:
+        view_record: "%{model} (Locked)"

data/lib/marty.rb

@@ -13,7 +13,6 @@ require 'marty/railtie'
 require 'marty/mcfly_model'
 require 'marty/monkey'
 require 'marty/promise_job'
-require 'marty/lazy_column_loader'
 require 'marty/json_schema'
 
 # This does not get loaded in via bundler unless it is included in the

data/lib/marty/javascript/overrides.js

@@ -0,0 +1,14 @@
+Ext.define('Netzke.Grid.EventHandlers', {
+  override: 'Netzke.Grid.EventHandlers',
+  netzkeHandleItemdblclick: function(view, record){
+    if (this.editsInline) return; // inline editing is handled elsewhere
+
+    var has_perm = (this.permissions || {});
+    if (has_perm.read !== false && !has_perm.update) {
+      this.doViewInForm(record);
+    }
+    else if (has_perm.update !== false) {
+      this.doEditInForm(record);
+    }
+  },
+});

data/lib/marty/monkey.rb

@@ -119,7 +119,7 @@ module Netzke::Basepack::DataAdapters
         relation = relation.includes(assoc.to_sym).references(assoc.to_sym) if method
       end
 
-      @model.const_defined?(:LAZY_LOADED) ? relation.count(columns.first.name) :
+      @model.const_defined?(:SELECT_COLS) ? relation.count(columns.first.name) :
         relation.count
     end
 
@@ -130,7 +130,7 @@ module Netzke::Basepack::DataAdapters
       return nil if conditions.empty?
 
       predicates = conditions.map do |q|
-        q = HashWithIndifferentAccess.new(q)
+        q = HashWithIndifferentAccess.new(Netzke::Support.permit_hash_params(q))
 
         attr = q[:attr]
         method, assoc = method_and_assoc(attr)
@@ -310,3 +310,29 @@ class OpenStruct
   #  super
   #end
 end
+
+######################################################################
+
+module Netzke
+  module Core
+    module DynamicAssets
+      class << self
+        def ext_js(form_authenticity_token)
+          res = initial_dynamic_javascript(form_authenticity_token) << "\n"
+
+          include_core_js(res)
+
+          # load javascript overrides
+          overrides = ["#{File.dirname(__FILE__)}/javascript/overrides.js"]
+
+          (Netzke::Core.ext_javascripts + overrides).each do |path|
+            f = File.new(path)
+            res << f.read
+          end
+
+          minify_js(res)
+        end
+      end
+    end
+  end
+end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.0.6"
+  VERSION = "2.0.7"
 end

data/spec/dummy/config/application.rb

@@ -45,6 +45,12 @@ module Dummy
     # Enable escaping HTML in JSON.
     config.active_support.escape_html_entities_in_json = true
 
+    # eager load paths instead of autoload paths
+    config.eager_load_paths += ['lib', 'other'].map do
+      |dir|
+      File.expand_path("../../#{dir}", __FILE__)
+    end
+
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -202,6 +202,7 @@ files:
 - app/components/marty/posting_window.rb
 - app/components/marty/promise_view.rb
 - app/components/marty/promise_view/client/promise_view.css
+- app/components/marty/record_form_window.rb
 - app/components/marty/report_form.rb
 - app/components/marty/report_select.rb
 - app/components/marty/reporting.rb
@@ -470,8 +471,8 @@ files:
 - lib/marty/data_exporter.rb
 - lib/marty/data_importer.rb
 - lib/marty/engine.rb
+- lib/marty/javascript/overrides.js
 - lib/marty/json_schema.rb
-- lib/marty/lazy_column_loader.rb
 - lib/marty/logger.rb
 - lib/marty/mcfly_model.rb
 - lib/marty/migrations.rb

data/lib/marty/lazy_column_loader.rb

@@ -1,57 +0,0 @@
-# ATTRIBUTION NOTE: This module has been mostly copied from the
-# lazy_columns gem. The original code can be found at:
-# https://github.com/jorgemanrubia/lazy_columns
-
-module Marty
-  module LazyColumnLoader
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def lazy_load(*columns)
-        return unless table_exists?
-        columns = columns.collect(&:to_s)
-        exclude_columns_from_default_scope columns
-        define_lazy_accessors_for columns
-
-        # allow introspection of lazy-loaded column list
-        const_set(:LAZY_LOADED, columns)
-      end
-
-    private
-      def exclude_columns_from_default_scope(columns)
-        default_scope {
-          select((column_names - columns).map {
-                   |column_name|
-                   "#{table_name}.#{column_name}"
-                 })
-        }
-      end
-
-      def define_lazy_accessors_for(columns)
-        columns.each { |column| define_lazy_accessor_for column }
-      end
-
-      def define_lazy_accessor_for(column)
-        define_method column do
-          unless has_attribute?(column)
-            changes_before_reload = self.changes.clone
-            self.reload
-            changes_before_reload.each{
-              |attribute_name, values|
-              self.send("#{attribute_name}=", values[1])
-            }
-          end
-          read_attribute column
-        end
-      end
-    end
-  end
-end
-
-if ActiveRecord::Base.respond_to?(:lazy_load)
-  $stderr.puts "ERROR: Method `.lazy_load` already defined in " +
-    "`ActiveRecord::Base`. This is incompatible with LazyColumnLoader " +
-    "and the module will be disabled."
-else
-  ActiveRecord::Base.send :include, Marty::LazyColumnLoader
-end