marty 9.3.3 → 9.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a05f2db3d10c614e345bae7fe6291a52fde60754fb3494517155d0ec51c47b5e
-  data.tar.gz: 109a0735adcbe283bc9ab3a8245d4fa0c36e88ca045045a2d21d747da3bf2828
+  metadata.gz: 2d074baec508433805a51aea60daa67bae8d2a7153d89e36911a847175db5f92
+  data.tar.gz: '09391b3a8a0b33cc3bdf6d6813d0c9ae1852acdff55cf137cba9c935a9bf1844'
 SHA512:
-  metadata.gz: 52de6ceb74374e6199f09567eedc42c40b4f80bcd6a21d5a4dbd8f6e11779609ab3e9f5497f572040748a8140266207d5b15a79a9bdd6daad80053cfd9946714
-  data.tar.gz: 8156c685ab705efc32aaf8b3c4dad63952398138c039592bb014547ea258524299f34c59a64f10743db00d9333ccae619fa7ea7df912663a0220231e3b6ea012
+  metadata.gz: 5d1d1121878470f9d5e39df28294e653341ca1c8d6d5fb581b2401f040a73b5cb889c2392f2733cee0c4286457960f328b041fad9169f6a1513466235bf9693f
+  data.tar.gz: d25f58da6dba36b7386b4cfdbfdbf78c9e8623be71d92c07f66a567ba80f624f08a528ba91887ead5f86b6f738e33776b350300027ced7ce5c427d6107f4f004

data/app/components/marty/main_auth_app.rb

@@ -478,7 +478,9 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   component :posting_window
 
-  component :promise_view
+  component :promise_view do |c|
+    c.klass = Marty::PromiseView
+  end
 
   component :reporting
 

data/app/components/marty/promise_view.rb

@@ -1,5 +1,4 @@
-class Marty::PromiseView < Netzke::Tree::Base
-  extend ::Marty::Permissions
+class Marty::PromiseView < Marty::Tree
   has_marty_permissions read: :any
 
   client_styles do |config|
@@ -18,12 +17,9 @@ class Marty::PromiseView < Netzke::Tree::Base
 
   ######################################################################
 
-  def class_can?(op)
-    self.class.can_perform_action?(op)
-  end
-
   def configure(c)
     super
+
     c.title = I18n.t('jobs.promise_view')
     c.model = 'Marty::VwPromise'
     c.attributes = [
@@ -41,12 +37,6 @@ class Marty::PromiseView < Netzke::Tree::Base
     c.paging = :none
     c.bbar = bbar
     c.read_only = true
-    c.permissions = {
-      create: class_can?(:create),
-      read:   class_can?(:read),
-      update: class_can?(:update),
-      delete: class_can?(:delete)
-    }
   end
 
   def bbar
@@ -143,11 +133,18 @@ class Marty::PromiseView < Netzke::Tree::Base
 
   attribute :error do |config|
     config.getter = ->(record) do
-      @results[record.id] unless record.status
+      next if record.status
+      next @results[record.id] if @records
+
+      Marty::Promise.find(record.id).result.to_s
     end
 
-    config.flex = 1
+    editor_config = {
+      xtype: :textarea,
+    }
+
+    config.field_config = editor_config
   end
 end
 
-PromiseView = Marty::PromiseView
+Marty::PromiseView

data/app/components/marty/tree.rb

@@ -0,0 +1,63 @@
+class Marty::Tree < ::Netzke::Tree::Base
+  extend ::Marty::Permissions
+
+  has_marty_permissions read: :any
+
+  # parent tree is the tree 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 = nil
+    super(args, kwargs)
+    client_config[:child_components]  = child_components  || []
+    client_config[:linked_components] = linked_components || []
+  end
+
+  client_class do |c|
+    c.include :tree
+  end
+
+  ######################################################################
+
+  def class_can?(op)
+    self.class.can_perform_action?(op)
+  end
+
+  def configure(c)
+    super
+
+    c.permissions = {
+      create: class_can?(:create),
+      read:   class_can?(:read),
+      update: class_can?(:update),
+      delete: class_can?(:delete)
+    }
+  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

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

@@ -0,0 +1,21 @@
+({
+  doViewInForm(record) {
+    this.netzkeLoadComponent("view_window", {
+      serverConfig: {
+        record_id: record.id
+      },
+      callback(w) {
+        w.show();
+        w.on(
+          "close",
+          function() {
+            if (w.closeRes === "ok") {
+              this.netzkeReloadStore();
+            }
+          },
+          this
+        );
+      }
+    });
+  }
+});

data/app/models/marty/posting.rb

@@ -64,7 +64,7 @@ class Marty::Posting < Marty::Base
 
     q = where('created_dt <= ?', dt)
     q = q.where(posting_type_id: posting_type.id) if posting_type
-    q.order('created_dt DESC').first.attributes
+    q.order('created_dt DESC').first&.attributes
   end
 
   delorean_fn :get_latest_by_type, sig: [1, 2] do |limit, posting_types = []|

data/lib/marty/monkey.rb

@@ -364,12 +364,12 @@ module Netzke
     module DynamicAssets
       class << self
         def minify_js(js_string)
-          if ::Rails.env.test? || ::Rails.env.development?
-            js_string.gsub(/\/\*\*[^*]*\*+(?:[^*\/][^*]*\*+)*\//, '') # strip docs
-          else
-            # MONKEY: enable es6 by passing in harmony argument
-            Uglifier.compile(js_string, harmony: true)
+          if Rails.application.config.marty.uglify_assets
+            # Doesn't fully support ES6 syntax
+            return Uglifier.compile(js_string, harmony: true)
           end
+
+          js_string.gsub(/\/\*\*[^*]*\*+(?:[^*\/][^*]*\*+)*\//, '') # strip docs
         end
       end
     end

data/lib/marty/version.rb

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

data/spec/dummy/config/application.rb

@@ -84,6 +84,7 @@ module Dummy
 
     config.active_job.queue_adapter = :delayed_job
     config.marty.redis_url = ENV['MARTY_REDIS_URL']
+    config.marty.uglify_assets = ENV['MARTY_UGLIFY_ASSETS'].to_s == 'true'
   end
 end
 require "marty/permissions"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 9.3.3
+  version: 9.5.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -376,6 +376,8 @@ files:
 - app/components/marty/simple_app/client/simple_app.js
 - app/components/marty/simple_app/client/statusbar_ext.js
 - app/components/marty/tag_grid.rb
+- app/components/marty/tree.rb
+- app/components/marty/tree/client/tree.js
 - app/components/marty/user_view.rb
 - app/components/marty/users/user_view.rb
 - app/controllers/marty/application_controller.rb