marty 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 4c6789a008b449b0a585b9c6f334c11f8638a6718cd01092fd85e311498a6fa1
-  data.tar.gz: 5652a3674034c14a53356426522854ccd5d458475757ccd53b5f62a6d43e006e
+SHA1:
+  metadata.gz: 10af0b3690a8b11f6aee67bad8c10178d4e6b73c
+  data.tar.gz: 3714e7d0a7d3d9130ee82c61dc27f533835627ab
 SHA512:
-  metadata.gz: 5172bf0b5cc30b6954498b2af539314794316c0cd75cb00c232bc7f6288de91c9dbaffe048de3cef3c438fff93af45b7b1f5e7b12293d71d965d62dff4880cdd
-  data.tar.gz: 5b5015dd73fe163c2ad24b8855ec9e0e122417a81b458950e94214a57d2cf31e85d8d3dce1b3d907077a6e4241c4a42c203d68a5003787a387d851019ad594dc
+  metadata.gz: 8bd3c6021736228693d13b86f308fd7effc429ea9ea10a98c25bf79c8ecb5893972ee8728ab2505553d822a830cd9ccd7762eb57ceb3180fcc23a7a941f9376c
+  data.tar.gz: 425d1ee9841e00d0708151f04560e892a0752def916abe4f765b696b24cb90217d69fd075dcfd61a826fd36222667d5bfd5fa54145ecf0adc2ca244cd3d3eb3d

data/app/components/marty/data_grid_user_view.rb

@@ -1,6 +1,8 @@
 module Marty
   class DataGridUserView < DataGridView
-    has_marty_permissions read: [:data_grid_editor, :admin, :dev]
+    # permissions are handled by #get_records and #get_edit_permissions
+    has_marty_permissions read: :any,
+                        update: :any
 
     def configure(c)
       super
@@ -10,7 +12,19 @@ module Marty
           :name,
           :created_dt,
         ]
-      c.editing = :inline
+      c.title = I18n.t('data_grid_user_view')
+      c.editing = :in_form
+    end
+
+    client_class do |c|
+      c.do_edit_in_form = l(<<~JS)
+         function(record) {
+            var sel = this.getSelectionModel().getSelection()[0];
+            var record_id = sel && sel.getId();
+            if (!record_id) return;
+            this.server.editGrid({record_id: record_id});
+         }
+      JS
     end
 
     def default_bbar

data/app/components/marty/import_view.rb

@@ -80,7 +80,7 @@ class Marty::ImportView < Marty::Form
       res       = import(processed)
       result    = res.map { |k, v| format_message(k, v) }
 
-      messages  = post_import
+      messages = post_import
       result << messages if messages
 
       client.set_result result.join('<br/>')

data/db/sql/lookup_grid_distinct_v1.sql

@@ -25,6 +25,9 @@ DECLARE
   vertical_indexes JSONB = '[]'::JSONB;
   vertical_index INTEGER;
 
+  default_index_array JSONB = '[0]'::JSONB;
+  empty_jsonb_array JSONB = '[]'::JSONB;
+
   query_dir_result JSONB;
   query_index_result JSONB = '[]'::JSONB;
   metadata_record JSONB;
@@ -44,7 +47,7 @@ BEGIN
     USING row_info ->> 'id';
 
 
-  data_grid_metadata := COALESCE(data_grid_metadata, '[]'::JSONB);
+  data_grid_metadata := COALESCE(data_grid_metadata, empty_jsonb_array);
 
   FOR i IN 0 .. (jsonb_array_length(data_grid_metadata) - 1) LOOP
     metadata_record := data_grid_metadata -> i;
@@ -66,9 +69,9 @@ BEGIN
 
     IF COALESCE(array_length(data_grid_metadata_current, 1), 0) = 0 THEN
 			 IF direction = 'h' THEN
-				 horizontal_indexes := '[0]'::JSONB;
+				 horizontal_indexes := default_index_array;
 			 ELSE
-				 vertical_indexes := '[0]'::JSONB;
+				 vertical_indexes := default_index_array;
 			 END IF;
       CONTINUE;
     END IF;
@@ -84,16 +87,16 @@ BEGIN
 
      sql_scripts_arr := sql_scripts_arr || (query_dir_result ->> 0);
 
-     query_index_result := '[]'::JSONB;
+     query_index_result := empty_jsonb_array;
 
      -- execute the SQL query that has been received before and 
-     -- add it's (possibly multiple) results to query_index_result variable
+     -- add it's (possibly multiplt) results to query_index_result variable
      FOR target IN EXECUTE query_dir_result ->> 0 USING query_dir_result -> 1 LOOP
        query_index_result := query_index_result || to_jsonb(target.index);
      END LOOP;
 
      all_results := all_results || query_index_result;
-     query_index_result := '[]'::JSONB || query_index_result; -- Use empty JSONB array in case of NULL results
+     query_index_result := empty_jsonb_array || query_index_result; -- Use empty JSONB array in case of NULL results
 
      IF direction = 'h' THEN
        horizontal_indexes := query_index_result;
@@ -108,8 +111,8 @@ BEGIN
 
     END LOOP;
 
-    vertical_indexes := COALESCE(vertical_indexes, '[]'::JSONB);
-    horizontal_indexes := COALESCE(horizontal_indexes, '[]'::JSONB);
+    vertical_indexes := COALESCE(vertical_indexes, empty_jsonb_array);
+    horizontal_indexes := COALESCE(horizontal_indexes, empty_jsonb_array);
 
     IF ((jsonb_array_length(vertical_indexes)) = 0 
        OR (jsonb_array_length(horizontal_indexes)) = 0)

data/db/sql/query_grid_dir_v1.sql

@@ -25,15 +25,19 @@ DECLARE
   sql_filter text;
 
   includes_nots boolean;
+  default_nots_array JSONB = '[]'::JSONB;
+  current_info jsonb;
 
 BEGIN
   FOR i IN 1 .. COALESCE(array_upper(infos, 1), 0)
     LOOP
-      attr_type := infos[i] ->> 'type';
-      attr_name := infos[i] ->> 'attr';
+      current_info := infos[i];
+
+      attr_type := current_info ->> 'type';
+      attr_name := current_info ->> 'attr';
 
       -- Use not condition only if given type indexes has rows with 'not' = true
-      includes_nots = COALESCE(infos[i] -> 'nots', '[]'::JSONB)  @> 'true';
+      includes_nots = COALESCE(current_info -> 'nots', default_nots_array)  @> 'true';
 
       attr_value := h ->> attr_name;
       h_key_exists := h ? attr_name;

data/lib/marty/rpc_call.rb

@@ -24,12 +24,16 @@ class Marty::RpcCall
     res
   end
 
-  def self.marty_download(host, port, path, job_id, ssl = false)
+  def self.marty_download(
+    host, port, path, job_id, ssl = false, read_timeout = 60)
+
     params = { job_id: job_id }
     url = path + '?' + URI.encode(URI.encode_www_form(params))
 
     http = Net::HTTP.new(host, port)
     http.use_ssl = ssl
+    http.read_timeout = read_timeout
+
     request = Net::HTTP::Get.new(url)
 
     begin

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '5.1.1'
+  VERSION = '5.1.2'
 end

data/other/marty/diagnostic/version.rb

@@ -1,7 +1,7 @@
 module Marty::Diagnostic; class Version < Base
   diagnostic_fn do
     begin
-      message = `cd #{Rails.root.to_s}; git describe --tags --always;`.strip
+      message = `cd #{Rails.root}; git describe --tags --always;`.strip
     rescue StandardError
       message = error('Failed accessing git')
     end

data/spec/controllers/diagnostic/controller_spec.rb

@@ -15,7 +15,7 @@ module Marty::Diagnostic
     end
 
     def git
-      `cd #{Rails.root.to_s}; git describe --tags --always;`.
+      `cd #{Rails.root}; git describe --tags --always;`.
         strip rescue 'Failed accessing git'
     end
 

data/spec/other/diagnostic/reporter_spec.rb

@@ -12,7 +12,7 @@ describe Marty::Diagnostic::Reporter do
   end
 
   def git
-      message = `cd #{Rails.root.to_s}; git describe --tags --always;`.strip
+      message = `cd #{Rails.root}; git describe --tags --always;`.strip
   rescue StandardError
       message = error('Failed accessing git')
   end
@@ -213,9 +213,9 @@ describe Marty::Diagnostic::Reporter do
 
     it 'can detect errors in diagnostic for display and api' do
       described_class.request.params = params
-      n  = aggregate_data
-      e  = aggregate_data(status: false)
-      c  = aggregate_data(consistent: false)
+      n = aggregate_data
+      e = aggregate_data(status: false)
+      c = aggregate_data(consistent: false)
       ce = aggregate_data(status: false, consistent: false)
 
       aggregate_failures do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
@@ -1694,7 +1694,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A framework for working with versioned data