marty 2.0.9 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc93810ae5dd275a46e3126262f32d3b1801eb0c
-  data.tar.gz: ec26658316552eb0be436ece29dcc3e5954604cb
+  metadata.gz: 74cf23a65bfc74eca6990825fc5cd0e3498ce1ee
+  data.tar.gz: bbe239541fa78e0520ba9556ce2e54a6bdcd316d
 SHA512:
-  metadata.gz: c0a913f766620e18ab38ea070872b071cc5f4581e9eb0819f62fe82de458d166746978826998df9e7cf055256d94655f9dfffa91965840a5dc0ae6faeb1f2abe
-  data.tar.gz: a377aa7395151b4a7588ff59bba50c91ecafc65a027f77abfc04e98db1262638850c9877b5ce7f388e68f162e1d2cfeef35355e91a40150ba33b36e844ae9212
+  metadata.gz: 7b83dbaa63058e3cb97bf2075b41630737fe3caed36b5f006b70c34e2dc743dc57333064b5952cd3e933b1b67a81309001e688944d0f0de4eb5a558d5ce27db6
+  data.tar.gz: a8a857fcf340d133ecf3a9248aad919630f8f11c480b3301abf7df896a70e7bb4811fddef838b4787bfe6c08d95863a33eb88045fe50b29c14e158ede8484b6c

data/Gemfile.lock

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

data/app/components/marty/grid.rb

@@ -39,6 +39,12 @@ class Marty::Grid < ::Netzke::Grid::Base
         }});
     }
     JS
+
+    c.clear_filters = l(<<-JS)
+    function() {
+      this.filters.clearFilters();
+    }
+    JS
   end
 
   component :view_window do |c|
@@ -71,6 +77,17 @@ 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)

data/lib/marty/javascript/overrides.js

@@ -1,14 +1,77 @@
 Ext.define('Netzke.Grid.EventHandlers', {
   override: 'Netzke.Grid.EventHandlers',
-  netzkeHandleItemdblclick: function(view, record){
+  netzkeHandleItemdblclick: function(view, record) {
     if (this.editsInline) return; // inline editing is handled elsewhere
 
+    // MONKEY: add view in form capability
     var has_perm = (this.permissions || {});
     if (has_perm.read !== false && !has_perm.update) {
       this.doViewInForm(record);
-    }
-    else if (has_perm.update !== false) {
+    } else if (has_perm.update !== false) {
       this.doEditInForm(record);
     }
   },
+
+  netzkeReloadStore: function() {
+    var store = this.getStore();
+
+    // MONKEY: add netzkereload event on store
+    store.fireEvent('netzkereload');
+
+    // NETZKE'S HACK to work around buffered store's buggy reload()
+    if (!store.lastRequestStart) {
+      store.load();
+    } else store.reload();
+  },
+});
+
+Ext.define('Ext.toolbar.Paging', {
+  override: 'Ext.toolbar.Paging',
+
+  handleRefresh: Ext.emptyFn,
+
+  doRefresh: function() {
+    var me = this,
+      current = me.store.currentPage;
+
+    // MONKEY: add netzkerefresh to ExtJS paging toolbar refresh
+    // as beforechange is too generic
+    me.store.fireEvent('netzkerefresh', me);
+
+    if (me.fireEvent('beforechange', me, current) !== false) {
+      me.store.loadPage(current);
+
+      me.handleRefresh();
+    }
+  }
+});
+
+Ext.define('Netzke.Grid.Columns', {
+    override: 'Netzke.Grid.Columns',
+      netzkeNormalizeAssociationRenderer: function(c) {
+    var passedRenderer = c.renderer, // renderer we got from netzkeNormalizeRenderer
+        assocValue;
+    c.scope = this;
+    c.renderer = function(value, a, r, ri, ci, store, view){
+      var column = view.headerCt.items.getAt(ci),
+          editor = column.getEditor && column.getEditor(),
+
+	  /* MONKEY: use findRecordByValue instead of findRecord to remedy inline editing temporarily
+	     changing N/A columns to the recently changed value.
+	  */
+          recordFromStore = editor && editor.isXType('combobox') && editor.findRecordByValue(value),
+          renderedValue;
+
+      if (recordFromStore) {
+        renderedValue = recordFromStore.get('text');
+      } else if ((assocValue = (r.get('association_values') || {})[c.name]) !== undefined) {
+        renderedValue = (assocValue == undefined) ? c.emptyText : assocValue;
+      } else {
+        renderedValue = value;
+      }
+
+      return passedRenderer ? passedRenderer.call(this, renderedValue) : renderedValue;
+    };
+  },
 });
+    

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "2.0.9"
+  VERSION = "2.1.0"
 end

data/other/marty/diagnostic/connections.rb

@@ -0,0 +1,17 @@
+module Marty::Diagnostic; class Connections < Base
+  self.aggregatable = false
+  diagnostic_fn do
+    conns = Node.get_postgres_connections[Database.db_name].
+              sort_by{|h| [h['application_name'], h['pid'], h['client_addr']]}
+
+    counts = Hash.new(0)
+    conns.each_with_object({}) do |c, h|
+      c['client_addr'] = 'localhost' unless c['client_addr']
+      name = c['application_name']
+      counts[name] += 1
+      key = "#{name} #{'*' * (counts[name]-1)}"
+      h[key] = c.except('application_name').map{|k,v| "<li>#{k}: #{v}</li>"}.join
+    end
+  end
+end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 2.1.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -497,6 +497,7 @@ files:
 - other/marty/diagnostic/aws/ec2_instance.rb
 - other/marty/diagnostic/base.rb
 - other/marty/diagnostic/collection.rb
+- other/marty/diagnostic/connections.rb
 - other/marty/diagnostic/database.rb
 - other/marty/diagnostic/delayed_job_version.rb
 - other/marty/diagnostic/delayed_job_workers.rb