marty 8.3.1 → 8.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a089e78541222d60d9d84b7339c0fdefc8c87f445f0943a471732167e6946e2
-  data.tar.gz: cde4b147a1f9d753327c09665df1aa2045f887c9a6d0cafd0236227ceff3c7f9
+  metadata.gz: 6d2b7a71540fdd0a796cc8bd62725ddfa80231af28875eff79b5cbf1e6b8d65a
+  data.tar.gz: de508c108b52dc8b89d9d873030173594952a5c48ee507c68438f2e01a21d136
 SHA512:
-  metadata.gz: 42d06eccfc9294f7151ab41f12e6a8970c0c086fe8d6cf492c3520d82ed2c9694bc9f231f8fb6e3d6bb4f8f9c251085145a2c7f5d2d04884bc071a68b64dc4ee
-  data.tar.gz: 32f0ce4bd5c4425ab855e4d606b50d117be8609c4cf23ba0968b2ced644fcdc29ca1f5ad7b8b345b6b6bf42a0cee374c973ec8d6ac191ab7c37623c6c729b2be
+  metadata.gz: efbcc2b834193e2525809e494d6e12936d75606b03f7c2fb9970008eb3adac30bb4a193c9bd64323691db0fdd983401aba0e73907df16f839bfb4675551094af
+  data.tar.gz: 1c2834966a5b98f4177a14a297eed967b88a94b7f56c6c3597445e6dcd25ab96cad08465bcbf31f4675a76cc2d977f0a198efae2b15f47e64f771159ae2dfdf6

data/app/components/marty/background_job/delayed_jobs_grid.rb

@@ -0,0 +1,71 @@
+module Marty
+  module BackgroundJob
+    class DelayedJobsGrid < Marty::Grid
+      ACCESSIBLE_BY = [:admin]
+
+      has_marty_permissions(
+        read: ACCESSIBLE_BY,
+        create: nil,
+        update: nil,
+        delete: nil,
+        destroy: ACCESSIBLE_BY,
+        job_run: ACCESSIBLE_BY,
+        edit_window__edit_form__submit: ACCESSIBLE_BY,
+        add_window__add_form__submit: ACCESSIBLE_BY
+      )
+
+      def configure(c)
+        super
+
+        c.title ||= I18n.t(
+          'schedule_jobs_dashboard_view_title',
+          default: 'Delayed Jobs Dashboard'
+        )
+
+        c.model = 'Delayed::Job'
+        c.paging = :buffered
+        c.editing = :in_form
+        c.multi_select = false
+
+        c.attributes = [
+          :id,
+          :handler,
+          :run_at,
+          :locked_at,
+          :locked_by,
+          :created_at,
+          :cron,
+          :last_error
+        ]
+
+        c.store_config.merge!(
+          sorters: [
+            { property: :locked_at, direction: 'DESC' },
+            { property: :run_at, direction: 'DESC' }
+          ])
+
+        # c.scope = lambda do |r|
+        # r.order('locked_at DESC NULLS LAST')
+        # end
+      end
+
+      attribute :locked_at do |c|
+        c.sorting_scope = lambda do |relation, dir|
+          relation.order("locked_at #{dir} NULLS LAST")
+        end
+      end
+
+      def default_context_menu
+        []
+      end
+
+      def default_bbar
+        []
+      end
+
+      attribute :cron do |c|
+        c.width = 400
+      end
+    end
+  end
+end

data/app/components/marty/background_job/schedule_jobs_dashboard.rb

@@ -0,0 +1,53 @@
+require 'marty/background_job/schedule_jobs_grid'
+
+module Marty
+  module BackgroundJob
+    class ScheduleJobsDashboard < Marty::Form
+      include Marty::Extras::Layout
+
+      def configure(c)
+        super
+        c.items = [
+          :schedule_jobs_grid,
+          :schedule_jobs_warnings
+        ]
+      end
+
+      def prepare_warnings
+        djs = ::Marty::BackgroundJob::FetchMissingInScheduleCronJobs.call
+
+        messages = djs.map do |dj|
+          handler_str = dj.handler[/job_class.*\n/]
+          job_class = handler_str.gsub('job_class:', '').strip
+
+          "#{job_class} with cron #{dj.cron} is present " \
+            'in delayed_jobs table, but is missing in the Dashboard.'
+        end
+
+        messages.join('<br>')
+      end
+
+      client_class do |c|
+        c.header   = false
+        c.defaults = { body_style: 'padding:0px' }
+      end
+
+      component :schedule_jobs_grid do |c|
+        c.klass = Marty::BackgroundJob::ScheduleJobsGrid
+        c.region = :north
+        c.min_height = 500
+      end
+
+      component :schedule_jobs_warnings do |c|
+        c.klass = Marty::Panel
+        c.title = I18n.t('jobs.schedule_dashboard.warnings')
+        c.html = prepare_warnings
+        c.min_height = 200
+      end
+
+      def default_bbar
+        []
+      end
+    end
+  end
+end

data/app/components/marty/background_job/schedule_jobs_grid.rb

@@ -0,0 +1,136 @@
+module Marty
+  module BackgroundJob
+    class ScheduleJobsGrid < Marty::Grid
+      ACCESSIBLE_BY = [:admin]
+
+      has_marty_permissions(
+        read: ACCESSIBLE_BY,
+        create: ACCESSIBLE_BY,
+        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
+      )
+
+      def configure(c)
+        super
+
+        c.title ||= I18n.t(
+          'schedule_jobs_dashboard_view_title',
+          default: 'Schedule Jobs Dashboard'
+        )
+
+        c.model = 'Marty::BackgroundJob::Schedule'
+        c.paging = :buffered
+        c.editing = :in_form
+        c.multi_select = false
+
+        c.attributes = [
+          :job_class,
+          :cron,
+          :state
+        ]
+      end
+
+      def default_context_menu
+        []
+      end
+
+      def default_bbar
+        super + [:do_job_run]
+      end
+
+      attribute :job_class do |c|
+        c.width = 400
+      end
+
+      attribute :cron do |c|
+        c.width = 400
+      end
+
+      attribute :state do |c|
+        c.width = 150
+        editor_config = {
+          trigger_action: :all,
+          xtype: :combo,
+          store: Marty::BackgroundJob::Schedule::ALL_STATES,
+          forceSelection: true,
+        }
+
+        c.column_config = { editor: editor_config }
+        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?
+
+        obj_hash = result.first
+
+        Marty::BackgroundJob::UpdateSchedule.call(
+          id: obj_hash['id'],
+          job_class: obj_hash['job_class']
+        )
+
+        result
+      end
+
+      endpoint :add_window__add_form__submit do |params|
+        result = super(params)
+        next result if result.empty?
+
+        obj_hash = result.first
+
+        Marty::BackgroundJob::UpdateSchedule.call(
+          id: obj_hash['id'],
+          job_class: obj_hash['job_class']
+        )
+
+        result
+      end
+
+      endpoint :multiedit_window__multiedit_form__submit do |_params|
+        client.netzke_notify 'Multiediting is disabled for cron schedules'
+      end
+
+      endpoint :destroy do |params|
+        res = params.each_with_object({}) do |id, hash|
+          job_class = model.find_by(id: id)&.job_class
+          result = super([id])
+
+          # Do nothing If it wasn't destroyed
+          next hash.merge(result) unless result[id.to_i] == 'ok'
+
+          Marty::BackgroundJob::UpdateSchedule.call(
+            id: id,
+            job_class: job_class
+          )
+
+          hash.merge(result)
+        end
+
+        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
+  end
+end

data/app/components/marty/background_job/schedule_jobs_logs.rb

@@ -0,0 +1,87 @@
+module Marty
+  module BackgroundJob
+    class ScheduleJobsLogs < Marty::Grid
+      ACCESSIBLE_BY = [:admin]
+
+      has_marty_permissions(
+        read: ACCESSIBLE_BY,
+        create: ACCESSIBLE_BY,
+        update: ACCESSIBLE_BY,
+        delete: ACCESSIBLE_BY,
+        destroy: ACCESSIBLE_BY,
+        destroy_all: ACCESSIBLE_BY,
+        ignore: ACCESSIBLE_BY,
+        edit_window__edit_form__submit: ACCESSIBLE_BY,
+        add_window__add_form__submit: ACCESSIBLE_BY
+      )
+
+      def configure(c)
+        super
+
+        c.title ||= I18n.t('schedule_jobs_dashboard_view_title', default: "Scheduled Job's Logs")
+        c.model = 'Marty::BackgroundJob::Log'
+        c.paging = :buffered
+        c.editing = :in_form
+        c.multi_select = true
+
+        c.attributes = [
+          :job_class,
+          :status,
+          :error,
+          :created_at
+        ]
+
+        c.store_config.merge!(sorters: [{ property: :id, direction: 'DESC' }])
+      end
+
+      def default_context_menu
+        []
+      end
+
+      def default_bbar
+        [:delete, :destroy_all, :ignore]
+      end
+
+      attribute :job_class do |c|
+        c.width = 400
+        c.read_only = true
+      end
+
+      attribute :status do |c|
+        c.read_only = true
+      end
+
+      attribute :error do |c|
+        c.width = 800
+        c.read_only = true
+        c.getter = ->(record) { record.error.to_json }
+      end
+
+      action :destroy_all do |a|
+        a.text     = 'Delete all'
+        a.tooltip  = 'Delete all logs'
+        a.icon_cls = 'fa fa-trash glyph'
+      end
+
+      action :ignore do |a|
+        a.text     = 'Ignore in diag'
+        a.tooltip  = 'Ignore in diag'
+        a.icon_cls = 'fa fa-trash glyph'
+      end
+
+      endpoint :destroy_all do
+        Marty::BackgroundJob::Log.delete_all
+        client.reload
+      end
+
+      endpoint :ignore do |ids|
+        Marty::BackgroundJob::Log.
+          where(id: ids).
+          where(status: :failure).
+          each { |record| record.update(status: :failure_ignore) }
+
+        client.reload
+      end
+    end
+  end
+end

data/app/components/marty/main_auth_app.rb

@@ -1,20 +1,21 @@
 require 'marty/api_auth_view'
 require 'marty/api_config_view'
 require 'marty/api_log_view'
+require 'marty/background_job/delayed_jobs_grid'
+require 'marty/background_job/schedule_jobs_dashboard'
+require 'marty/background_job/schedule_jobs_logs'
 require 'marty/config_view'
 require 'marty/data_grid_view'
-require 'marty/schedule_jobs_dashboard'
-require 'marty/schedule_jobs_logs'
 require 'marty/data_grid_user_view'
 require 'marty/import_type_view'
 require 'marty/new_posting_window'
+require 'marty/notifications/config_view'
+require 'marty/notifications/deliveries_view'
 require 'marty/posting_window'
 require 'marty/promise_view'
 require 'marty/reporting'
 require 'marty/scripting'
 require 'marty/user_view'
-require 'marty/notifications/config_view'
-require 'marty/notifications/deliveries_view'
 
 class Marty::MainAuthApp < Marty::AuthApp
   extend ::Marty::Permissions
@@ -116,6 +117,7 @@ class Marty::MainAuthApp < Marty::AuthApp
           :bg_status,
           :bg_stop,
           :bg_restart,
+          :delayed_jobs_grid,
           :schedule_jobs_dashboard,
           :schedule_jobs_logs,
         ]
@@ -298,6 +300,14 @@ class Marty::MainAuthApp < Marty::AuthApp
     a.disabled = !self.class.has_perm?(:admin)
   end
 
+  action :delayed_jobs_grid do |a|
+    a.text     = 'Delayed Jobs Dashboard'
+    a.tooltip  = 'Show running delayed jobs'
+    a.icon_cls = 'fa fa-clock glyph'
+    a.disabled = !self.class.has_perm?(:admin)
+    a.handler = :netzke_load_component_by_action
+  end
+
   action :schedule_jobs_dashboard do |a|
     a.text     = 'Schedule Jobs Dashboard'
     a.tooltip  = 'Edit Delayed Jobs Cron schedules'
@@ -438,9 +448,9 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   component :api_config_view
 
-  component :schedule_jobs_dashboard
-
-  component :schedule_jobs_logs
+  component :delayed_jobs_grid do |c|
+    c.klass = ::Marty::BackgroundJob::DelayedJobsGrid
+  end
 
   component :config_view
 
@@ -472,6 +482,14 @@ class Marty::MainAuthApp < Marty::AuthApp
 
   component :reporting
 
+  component :schedule_jobs_dashboard do |c|
+    c.klass = ::Marty::BackgroundJob::ScheduleJobsDashboard
+  end
+
+  component :schedule_jobs_logs do |c|
+    c.klass = ::Marty::BackgroundJob::ScheduleJobsLogs
+  end
+
   component :scripting do |c|
     c.allow_edit = self.class.has_scripting_perm?
   end

data/lib/marty/data_conversion.rb

@@ -56,7 +56,7 @@ class Marty::DataConversion
       # Dates are kept as float in Google spreadsheets.  Need to
       # convert them to dates.
       begin
-        FLOAT_PAT.match?(v) ? EXCEL_START_DATE + v.to_f :
+        FLOAT_PAT.match?(v.to_s) ? EXCEL_START_DATE + v.to_f :
           Mcfly.is_infinity(v) ? 'infinity' : v.to_date
       rescue StandardError => e
         raise "date conversion failed for #{v.inspect}}"

data/lib/marty/version.rb

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

data/spec/features/delayed_jobs_grid_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+feature 'Delayed Jobs Dashboard', js: true do
+  before do
+    Delayed::Job.delete_all
+    populate_test_users
+  end
+
+  context 'as dev' do
+    before do
+      log_in_as('dev1')
+      wait_for_ajax
+      press('System')
+      press('Background Jobs')
+      press('Schedule Jobs Dashboard')
+      wait_for_ajax
+    end
+
+    it 'access denied' do
+      expect(page).to_not have_content 'Schedule Jobs Dashboard'
+    end
+  end
+
+  context 'as admin' do
+    let(:jobs_view) { netzke_find('delayed_jobs_grid') }
+
+    let!(:schedule) do
+      ['TestJob', 'Test2Job', 'TestFailingJob'].each do |klass_name|
+        Marty::BackgroundJob::Schedule.create(
+          job_class: klass_name,
+          cron: '0 0 * * *',
+          state: 'on'
+        ).tap do |job|
+          Marty::BackgroundJob::UpdateSchedule.call(
+            id: job.id,
+            job_class: job.job_class
+          )
+        end
+      end
+    end
+
+    let(:time1) { 10.hours.ago }
+
+    let(:time2) { 20.hours.ago }
+
+    before do
+      @djs = Delayed::Job.all
+      @djs.first.update!(locked_at: time1)
+      @djs.last.update!(locked_at: time2)
+
+      log_in_as('admin1')
+      wait_for_ajax
+      press('System')
+      press('Background Jobs')
+      press('Delayed Jobs Dashboard')
+
+      wait_for_ajax
+
+      expect(page).to have_content 'Delayed Jobs Dashboard'
+    end
+
+    it 'shows delayed jobs' do
+      expect(jobs_view.row_count).to eq @djs.size
+      expect(jobs_view.row_count).to eq 3
+      locked_at = jobs_view.get_col_vals('locked_at', 3, 0, false).map do |str|
+        next unless str
+
+        Time.zone.parse(str).to_s
+      end
+
+      expect(locked_at).to eq(
+        [
+          time1.to_s,
+          time2.to_s,
+          nil
+        ]
+      )
+    end
+  end
+end

data/spec/lib/data_conversion_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+module Marty
+  describe DataConversion do
+    describe '#convert' do
+      describe 'date' do
+        let(:date) { 1.day.ago.to_date }
+
+        it 'converts float strings to date' do
+          res = described_class.convert('40000.0', :date)
+          expect(res).to eq Date.new(2009, 7, 6)
+        end
+
+        it 'converts date to date' do
+          res = described_class.convert(date, :date)
+          expect(res).to eq date
+        end
+
+        it 'converts infinity' do
+          ['Infinity', 'infinity', ::Float::INFINITY].each do |value|
+            res = described_class.convert(value, :date)
+            expect(res).to eq 'infinity'
+          end
+        end
+
+        it 'raises error if the value is not valid' do
+          expect { described_class.convert(true, :date) }.
+            to raise_error(/date conversion failed for true/)
+        end
+      end
+
+      describe 'boolean' do
+        it 'converts true' do
+          ['true', '1', 'y', 't'].each do |value|
+            res = described_class.convert(value, :boolean)
+            expect(res).to eq true
+          end
+        end
+
+        it 'converts false' do
+          ['false', '0', 'n', 'f'].each do |value|
+            res = described_class.convert(value, :boolean)
+            expect(res).to eq false
+          end
+        end
+
+        it 'raises error if the value is not valid' do
+          expect { described_class.convert(1.day.ago, :boolean) }.
+            to raise_error(/unknown boolean/)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 8.3.1
+  version: 8.4.1
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -310,6 +310,12 @@ files:
 - app/components/marty/api_log_view.rb
 - app/components/marty/auth_app.rb
 - app/components/marty/auth_app/client/auth_app.js
+- app/components/marty/background_job/delayed_jobs_grid.rb
+- app/components/marty/background_job/schedule_jobs_dashboard.rb
+- app/components/marty/background_job/schedule_jobs_grid.rb
+- app/components/marty/background_job/schedule_jobs_grid/client/schedule_jobs_grid.js
+- app/components/marty/background_job/schedule_jobs_logs.rb
+- app/components/marty/background_job/schedule_jobs_logs/client/schedule_jobs_logs.js
 - app/components/marty/base_rule_view.rb
 - app/components/marty/base_rule_view/client/base_rule_view.js
 - app/components/marty/config_view.rb
@@ -356,11 +362,6 @@ files:
 - app/components/marty/report_select/client/report_select.js
 - app/components/marty/reporting.rb
 - app/components/marty/reporting/client/reporting.js
-- app/components/marty/schedule_jobs_dashboard.rb
-- app/components/marty/schedule_jobs_grid.rb
-- app/components/marty/schedule_jobs_grid/client/schedule_jobs_grid.js
-- app/components/marty/schedule_jobs_logs.rb
-- app/components/marty/schedule_jobs_logs/client/schedule_jobs_logs.js
 - app/components/marty/script_form.rb
 - app/components/marty/script_form/client/script_form.js
 - app/components/marty/script_grid.rb
@@ -1695,6 +1696,7 @@ files:
 - spec/features/data_blame_report_spec.rb
 - spec/features/data_grid_spec.rb
 - spec/features/data_import_spec.rb
+- spec/features/delayed_jobs_grid_spec.rb
 - spec/features/endpoint_access.rb
 - spec/features/enum_spec.rb
 - spec/features/enum_values_report_spec.rb
@@ -1737,6 +1739,7 @@ files:
 - spec/job_helper.rb
 - spec/jobs/cron_job_spec.rb
 - spec/lib/data_blame_spec.rb
+- spec/lib/data_conversion_spec.rb
 - spec/lib/data_exporter_spec.rb
 - spec/lib/data_importer_spec.rb
 - spec/lib/delorean_query_spec.rb

data/app/components/marty/schedule_jobs_dashboard.rb

@@ -1,52 +0,0 @@
-require 'marty/schedule_jobs_grid'
-
-class Marty::ScheduleJobsDashboard < Marty::Form
-  include Marty::Extras::Layout
-
-  def configure(c)
-    super
-    c.items = [
-      :schedule_jobs_grid,
-      :schedule_jobs_warnings
-    ]
-  end
-
-  def prepare_warnings
-    djs = ::Marty::BackgroundJob::FetchMissingInScheduleCronJobs.call
-
-    messages = djs.map do |dj|
-      handler_str = dj.handler[/job_class.*\n/]
-      job_class = handler_str.gsub('job_class:', '').strip
-
-      "#{job_class} with cron #{dj.cron} is present in delayed_jobs table, " \
-        'but is missing in the Dashboard.'
-    end
-
-    messages.join('<br>')
-  end
-
-  client_class do |c|
-    c.header   = false
-    # c.layout   = :border
-    c.defaults = { body_style: 'padding:0px' }
-  end
-
-  component :schedule_jobs_grid do |c|
-    c.klass = Marty::ScheduleJobsGrid
-    c.region = :north
-    c.min_height = 500
-  end
-
-  component :schedule_jobs_warnings do |c|
-    c.klass = Marty::Panel
-    c.title = I18n.t('jobs.schedule_dashboard.warnings')
-    c.html = prepare_warnings
-    c.min_height = 200
-  end
-
-  def default_bbar
-    []
-  end
-end
-
-ScheduleJobsDashboard = Marty::ScheduleJobsDashboard

data/app/components/marty/schedule_jobs_grid.rb

@@ -1,118 +0,0 @@
-class Marty::ScheduleJobsGrid < Marty::Grid
-  ACCESSIBLE_BY = [:admin]
-
-  has_marty_permissions(
-    read: ACCESSIBLE_BY,
-    create: ACCESSIBLE_BY,
-    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
-  )
-
-  def configure(c)
-    super
-
-    c.title ||= I18n.t('schedule_jobs_dashboard_view_title', default: 'Schedule Jobs Dashboard')
-    c.model = 'Marty::BackgroundJob::Schedule'
-    c.paging = :buffered
-    c.editing = :in_form
-    c.multi_select = false
-
-    c.attributes = [
-      :job_class,
-      :cron,
-      :state
-    ]
-  end
-
-  def default_context_menu
-    []
-  end
-
-  def default_bbar
-    super + [:do_job_run]
-  end
-
-  attribute :job_class do |c|
-    c.width = 400
-  end
-
-  attribute :cron do |c|
-    c.width = 400
-  end
-
-  attribute :state do |c|
-    c.width = 150
-    editor_config = {
-      trigger_action: :all,
-      xtype: :combo,
-      store: Marty::BackgroundJob::Schedule::ALL_STATES,
-      forceSelection: true,
-    }
-
-    c.column_config = { editor: editor_config }
-    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?
-
-    obj_hash = result.first
-    Marty::BackgroundJob::UpdateSchedule.call(id: obj_hash['id'], job_class: obj_hash['job_class'])
-
-    result
-  end
-
-  endpoint :add_window__add_form__submit do |params|
-    result = super(params)
-    next result if result.empty?
-
-    obj_hash = result.first
-    Marty::BackgroundJob::UpdateSchedule.call(id: obj_hash['id'], job_class: obj_hash['job_class'])
-
-    result
-  end
-
-  endpoint :multiedit_window__multiedit_form__submit do |_params|
-    client.netzke_notify 'Multiediting is disabled for cron schedules'
-  end
-
-  endpoint :destroy do |params|
-    res = params.each_with_object({}) do |id, hash|
-      job_class = model.find_by(id: id)&.job_class
-      result = super([id])
-
-      # Do nothing If it wasn't destroyed
-      next hash.merge(result) unless result[id.to_i] == 'ok'
-
-      Marty::BackgroundJob::UpdateSchedule.call(id: id, job_class: job_class)
-      hash.merge(result)
-    end
-
-    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
-
-ScheduleJobsGrid = Marty::ScheduleJobsGrid

data/app/components/marty/schedule_jobs_logs.rb

@@ -1,85 +0,0 @@
-class Marty::ScheduleJobsLogs < Marty::Grid
-  ACCESSIBLE_BY = [:admin]
-
-  has_marty_permissions(
-    read: ACCESSIBLE_BY,
-    create: ACCESSIBLE_BY,
-    update: ACCESSIBLE_BY,
-    delete: ACCESSIBLE_BY,
-    destroy: ACCESSIBLE_BY,
-    destroy_all: ACCESSIBLE_BY,
-    ignore: ACCESSIBLE_BY,
-    edit_window__edit_form__submit: ACCESSIBLE_BY,
-    add_window__add_form__submit: ACCESSIBLE_BY
-  )
-
-  def configure(c)
-    super
-
-    c.title ||= I18n.t('schedule_jobs_dashboard_view_title', default: "Scheduled Job's Logs")
-    c.model = 'Marty::BackgroundJob::Log'
-    c.paging = :buffered
-    c.editing = :in_form
-    c.multi_select = true
-
-    c.attributes = [
-      :job_class,
-      :status,
-      :error,
-      :created_at
-    ]
-
-    c.store_config.merge!(sorters: [{ property: :id, direction: 'DESC' }])
-  end
-
-  def default_context_menu
-    []
-  end
-
-  def default_bbar
-    [:delete, :destroy_all, :ignore]
-  end
-
-  attribute :job_class do |c|
-    c.width = 400
-    c.read_only = true
-  end
-
-  attribute :status do |c|
-    c.read_only = true
-  end
-
-  attribute :error do |c|
-    c.width = 800
-    c.read_only = true
-    c.getter = ->(record) { record.error.to_json }
-  end
-
-  action :destroy_all do |a|
-    a.text     = 'Delete all'
-    a.tooltip  = 'Delete all logs'
-    a.icon_cls = 'fa fa-trash glyph'
-  end
-
-  action :ignore do |a|
-    a.text     = 'Ignore in diag'
-    a.tooltip  = 'Ignore in diag'
-    a.icon_cls = 'fa fa-trash glyph'
-  end
-
-  endpoint :destroy_all do
-    Marty::BackgroundJob::Log.delete_all
-    client.reload
-  end
-
-  endpoint :ignore do |ids|
-    Marty::BackgroundJob::Log.
-      where(id: ids).
-      where(status: :failure).
-      each { |record| record.update(status: :failure_ignore) }
-
-    client.reload
-  end
-end
-
-ScheduleJobsLogs = Marty::ScheduleJobsLogs