marty 5.1.2 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10af0b3690a8b11f6aee67bad8c10178d4e6b73c
-  data.tar.gz: 3714e7d0a7d3d9130ee82c61dc27f533835627ab
+  metadata.gz: 721393c215b2dbf1013c0ed60c8bee3fbc801f3a
+  data.tar.gz: 71bedcb01d1fb87f391df4699662e27d7589b5ce
 SHA512:
-  metadata.gz: 8bd3c6021736228693d13b86f308fd7effc429ea9ea10a98c25bf79c8ecb5893972ee8728ab2505553d822a830cd9ccd7762eb57ceb3180fcc23a7a941f9376c
-  data.tar.gz: 425d1ee9841e00d0708151f04560e892a0752def916abe4f765b696b24cb90217d69fd075dcfd61a826fd36222667d5bfd5fa54145ecf0adc2ca244cd3d3eb3d
+  metadata.gz: 4aa0408d877bc3f5d5f7a196880030abcf89b4c32d002c913e053368e455542e38ca8db6f1c6c7d2e1b317cac7113606cc2c1b7a375b1594b5e4ede492375173
+  data.tar.gz: e454bc45988cc864988c81a293fef71fa3158076ef7c714aca66be7519dc37f116b6cd1de194fab75f55fe9fe33bf202f2fd69cb81ab50d3fd1ca1dc0b3f3b30

data/app/components/marty/schedule_jobs_dashboard.rb

@@ -7,6 +7,7 @@ class Marty::ScheduleJobsDashboard < Marty::Grid
     update: ACCESSIBLE_BY,
     delete: ACCESSIBLE_BY,
     destroy: ACCESSIBLE_BY,
+    job_run: ACCESSIBLE_BY,
     edit_window__edit_form__submit: ACCESSIBLE_BY,
     add_window__add_form__submit: ACCESSIBLE_BY
   )
@@ -31,6 +32,10 @@ class Marty::ScheduleJobsDashboard < Marty::Grid
     []
   end
 
+  def default_bbar
+    super + [:do_job_run]
+  end
+
   attribute :job_class do |c|
     c.width = 400
   end
@@ -52,6 +57,13 @@ class Marty::ScheduleJobsDashboard < Marty::Grid
     c.field_config  = editor_config
   end
 
+  action :do_job_run do |a|
+    a.text     = 'Run'
+    a.tooltip  = 'Run'
+    a.icon_cls = 'fa fa-play glyph'
+    a.disabled = true
+  end
+
   endpoint :edit_window__edit_form__submit do |params|
     result = super(params)
     next result if result.empty?
@@ -90,6 +102,17 @@ class Marty::ScheduleJobsDashboard < Marty::Grid
 
     res
   end
+
+  endpoint :job_run do
+    begin
+      s = Marty::BackgroundJob::Schedule.find(client_config['selected'])
+      klass = s.job_class
+      klass.constantize.new.perform
+    rescue StandardError => e
+      next client.netzke_notify(e.message)
+    end
+    client.netzke_notify("#{klass.demodulize} ran successfully.")
+  end
 end
 
 ScheduleJobsDashboard = Marty::ScheduleJobsDashboard

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

@@ -0,0 +1,13 @@
+{
+    netzkeOnDoJobRun: function(params) {
+	Ext.Msg.confirm(
+            'Run Job',
+            Ext.String.format('Are you sure?'),
+            (btn, value, cfg) => {
+		if (btn == "yes") {
+		    this.mask('Performing job...');
+		    this.server.jobRun(() => { this.unmask()});
+		}
+            });
+    }
+}

data/lib/marty/rpc_call.rb

@@ -1,17 +1,21 @@
 class Marty::RpcCall
   # POST to a remote marty
-  def self.marty_post(host, port, path, script, node, attrs, params, options = {},
-                      ssl = false)
+  def self.marty_post(host, port, path, script, node, attrs, params,
+                      options = {}, ssl = false)
     http = Net::HTTP.new(host, port)
+
+    # FIXME: in 5.2.0 put ssl in options hash
     http.use_ssl = ssl
+    http.read_timeout = options[:read_timeout] if options[:read_timeout]
+
     request = Net::HTTP::Post.new(path)
     request.add_field('Content-Type', 'application/json')
-    request.body = (options + {
-                      'script' => script,
-                      'node'   => node,
-                      'attrs'  => attrs.to_json,
-                      'params' => params.to_json,
-                    }).to_json
+    request.body = { 'script' => script,
+                     'node'   => node,
+                     'attrs'  => attrs.to_json,
+                     'params' => params.to_json,
+                    }.to_json
+
     begin
       response = http.request(request)
     rescue StandardError => e
@@ -25,7 +29,8 @@ class Marty::RpcCall
   end
 
   def self.marty_download(
-    host, port, path, job_id, ssl = false, read_timeout = 60)
+    host, port, path, job_id, ssl = false, read_timeout = 60
+  )
 
     params = { job_id: job_id }
     url = path + '?' + URI.encode(URI.encode_www_form(params))
@@ -43,10 +48,12 @@ class Marty::RpcCall
     end
   end
 
-  def self.xml_call(host, port, path, body, use_ssl)
+  # FIXME: in Marty 5.2.0 put ssl in options hash
+  def self.xml_call(host, port, path, body, use_ssl, options = {})
     http = Net::HTTP.new(host, port)
     request = Net::HTTP::Post.new(path)
     http.use_ssl = use_ssl
+    http.read_timeout = options[:read_timeout] if options[:read_timeout]
     request.add_field('Content-Type', 'xml')
     request.add_field('Accept', 'xml')
     request.body = body

data/lib/marty/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.1.3
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4
@@ -292,6 +292,7 @@ files:
 - app/components/marty/reporting.rb
 - app/components/marty/reporting/client/reporting.js
 - app/components/marty/schedule_jobs_dashboard.rb
+- app/components/marty/schedule_jobs_dashboard/client/schedule_jobs_dashboard.js
 - app/components/marty/script_form.rb
 - app/components/marty/script_form/client/script_form.js
 - app/components/marty/script_grid.rb