marty 6.1.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f1457a8c273c33b4b74c01a76e07fc6b690fb5dd836511c648e7e60211ae2d7
-  data.tar.gz: 570417d238e3225b53914e99c7f293804c75bd3498bb3ce4ba90976a48d81c8b
+  metadata.gz: ba9d8e9da88bf08b792bd49d882e4320dc0e68f338ab5ed35577a4c1c741ae90
+  data.tar.gz: b9b76371c794c41b8383c52a30d03d0ecccbfc428bfe88f598c8ec6778e4e63f
 SHA512:
-  metadata.gz: 90b58649b5c1d327798ed130f0725fec9c08b4aa1bf74cdf09b170d28d8067052563f985b3be49cf76a0a80a835845a1224682ffc973ded8f6eeee196a978318
-  data.tar.gz: 8c73073a407a988bf6a13e7f3ec19305b0253e7e18d1f948bba4e47fbbf2993852c87858b407a6ed0c57ca63c810a5fa417723a90859fff1791b85eac10cf347
+  metadata.gz: ddf969f74e26013d76713537bcddeba889983d83d80ea60d5ace5cb92cc44a77096e73a356524def77ca10a00b473574fa9a94acffbfa1182bbc61c0927b413f
+  data.tar.gz: 4a3f20060711fc70cce936e90197f88a1256f1c814d4cf2fbadde12b28715eeffde3c096e92db1c1a7693d9ad268966e77e4aa2b1ee20b3d7078e93838869f78

data/.gitignore

@@ -5,6 +5,7 @@ spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/log/*.sql
 spec/dummy/tmp/
+spec/dummy/spec/tmp/
 spec/dummy/.sass-cache
 
 # Ignore schema

data/.gitlab-ci.yml

@@ -1,7 +1,8 @@
-image: 415596832415.dkr.ecr.us-west-2.amazonaws.com/cm_tech/docker-ruby-ci-image:2.6.3-20191003	
+image: 415596832415.dkr.ecr.us-west-2.amazonaws.com/cm_tech/docker-ruby-ci-image:2.6.3-extjs-7-20191018143452
 
 services:
   - "postgres:9.6"
+  - "redis:5.0.6-alpine"
 
 before_script:
   - time bundle install --jobs $(nproc) --path vendor "${FLAGS[@]}"
@@ -24,11 +25,23 @@ rspec-without-features:
   script:
     - bundle exec rspec --exclude-pattern "spec/features/**/*_spec.rb"
 
-rspec-features:
+rspec-features-1:
   extends: .base-test
   script:
     - ln -s /opt/support/extjs /cm_tech/marty/spec/dummy/public/extjs
-    - bundle exec rspec spec/features
+    - bundle exec rspec spec/features --tag ~speed
+
+rspec-features-2:
+  extends: .base-test
+  script:
+    - ln -s /opt/support/extjs /cm_tech/marty/spec/dummy/public/extjs
+    - bundle exec rspec spec/features --tag speed:slow
+
+rspec-features-3:
+  extends: .base-test
+  script:
+    - ln -s /opt/support/extjs /cm_tech/marty/spec/dummy/public/extjs
+    - bundle exec rspec spec/features --tag speed:super_slow
 
 cache:
   key: 'marty_bundler_cache'
@@ -44,6 +57,7 @@ variables:
   PGTZ: "America/Los_Angeles"
   POSTGRES_USER: "runner"
   POSTGRES_PASSWORD: ""
+  MARTY_REDIS_URL: 'localhost:6379/1'
   RAILS_ENV: "test"
   RAILS_DUMP_SCHEMA: "false"
   REPOSITORY_URL: '415596832415.dkr.ecr.us-west-2.amazonaws.com/cm_tech/docker-ruby-ci-image'

data/.rubocop.yml

@@ -41,3 +41,8 @@ Lint/UnusedMethodArgument:
 
 Style/SymbolArray:
   EnforcedStyle: brackets
+
+# Marshal serialisation is used in Redis caching
+Security/MarshalLoad:
+  Exclude:
+    - 'lib/marty/cache_adapters/redis.rb'

data/.rubocop_todo.yml

@@ -175,6 +175,7 @@ Lint/DuplicateMethods:
 Lint/HandleExceptions:
   Exclude:
     - 'spec/support/netzke.rb'
+    - 'lib/marty/delayed_job/scheduled_job_plugin.rb'
 
 # Offense count: 19
 Lint/IneffectiveAccessModifier:
@@ -1028,7 +1029,7 @@ Style/TrailingCommaInHashLiteral:
 
 # Offense count: 12
 # Cop supports --auto-correct.
-Style/UnneededPercentQ:
+Style/RedundantPercentQ:
   Exclude:
     - 'app/components/marty/simple_app.rb'
     - 'spec/features/rule_spec.rb'
@@ -1036,7 +1037,7 @@ Style/UnneededPercentQ:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-Style/UnneededSort:
+Style/RedundantSort:
   Exclude:
     - 'app/models/marty/event.rb'
 

data/Gemfile

@@ -9,7 +9,7 @@ group :default do
   gem 'daemons'
   gem 'delayed_job_active_record'
   gem 'pg'
-  gem 'rails', '>= 5.2.3', '< 6.0.0'
+  gem 'rails'
 end
 
 group :default, :cmit do
@@ -20,6 +20,7 @@ group :default, :cmit do
 end
 
 group :development, :test do
+  gem 'benchmark-ips'
   gem 'capybara'
   gem 'connection_pool'
   gem 'database_cleaner'

data/app/assets/javascripts/marty/extjs/extensions/marty.js

@@ -907,4 +907,26 @@ Ext.define('overrides.grid.column.Column', {
         }
         return this.callParent(arguments)
     }
-  })
+  }
+);
+
+Ext.define('Ext.netzke.marty.MultiSelectCombo', {
+    extend: 	'Ext.form.ComboBox',
+    alias: 	'widget.multiselectcombo',
+    separator: 	",",
+    multiSelect: true,
+
+    setValue: function(v) {
+      if (Ext.isString(v)) {
+          var vArray = v.split(this.separator);
+          this.callParent([vArray]);
+      } else {
+          this.callParent(arguments);
+      }
+    },
+  }
+);
+
+// Fix component fetching in ExtJS 7
+// This flag was false by default in ExtJS 6
+Ext.USE_NATIVE_JSON = false;

data/app/assets/stylesheets/marty/application.css

@@ -1 +1,4 @@
-//= require_tree .
+/*
+*= stub marty/dark_mode
+*= require_tree .
+*/

data/app/assets/stylesheets/marty/dark_mode.css

@@ -0,0 +1,17 @@
+html {
+  background: #000 !important;
+}
+
+body {
+  background-color: #FFF !important;
+  filter: invert(90%) grayscale(10%) hue-rotate(180deg) !important;
+  -moz-filter: invert(90%) grayscale(10%) hue-rotate(180deg) !important;
+  -webkit-filter: invert(90%) grayscale(10%) hue-rotate(180deg) !important;
+}
+
+em, img, svg, image, video, audio, embed, iframe, object, button, canvas, figure:empty {
+  filter: invert(100%) !important;
+  -moz-filter: invert(100%) !important;
+  -webkit-filter: invert(100%) !important;
+}
+

data/app/components/marty/auth_app.rb

@@ -25,7 +25,7 @@ class Marty::AuthApp < Marty::SimpleApp
   end
 
   def user_menu
-    [:sign_out]
+    [:sign_out, :toggle_dark_mode]
   end
 
   action :sign_in do |c|
@@ -37,6 +37,11 @@ class Marty::AuthApp < Marty::SimpleApp
     c.text     = "Sign out #{Mcfly.whodunnit.name}" if Mcfly.whodunnit
   end
 
+  action :toggle_dark_mode do |a|
+    a.text = 'Toggle Dark Mode'
+    a.icon_cls = 'fa fa-adjust glyph'
+  end
+
   endpoint :sign_in do |params|
     user = Marty::User.try_to_login(params[:login], params[:password])
     user ? Netzke::Base.controller.set_user(user) :
@@ -49,4 +54,8 @@ class Marty::AuthApp < Marty::SimpleApp
     Netzke::Base.controller.logout_user
     true
   end
+
+  endpoint :toggle_dark_mode do
+    Netzke::Base.controller.toggle_dark_mode
+  end
 end

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

@@ -87,5 +87,9 @@
         window.location.href = "/";
       }
     })
+  },
+
+  netzkeOnToggleDarkMode: function() {
+      this.server.toggleDarkMode(() => { window.location.href = "/" });
   }
 }

data/app/components/marty/extras/layout.rb

@@ -73,7 +73,7 @@ module Layout
   ######################################################################
   # PG ENUM field handling
 
-  def enum_column(c, class_or_array, col = nil)
+  def enum_column(c, class_or_array, col = nil, allow_null = true)
     col ||= c.name.demodulize.tableize.singularize
     vals = class_or_array.is_a?(Array) ? class_or_array : class_or_array::VALUES
     editor_config = {
@@ -81,7 +81,7 @@ module Layout
       xtype:          :combo,
 
       # hacky: extjs has issues with forceSelection true and clearing combos
-      store:          vals + ['---'],
+      store:          vals + (allow_null ? ['---'] : []),
 
       # we can dynamically add enums (i.e. they're not in VALUES) --
       # turn off forced selection.

data/app/components/marty/extras/misc.rb

@@ -3,7 +3,7 @@ module Marty::Extras::Misc
     editor_config: {
       trigger_action: :all,
       xtype: :combo,
-      store: (1..12).map { |x| [x, '%02d' % x] },
+      store: (1..12).map { |x| [x, '%<x>02d' % { x: x }] },
       # FIXME: for some reason, with Netzke 0.8.2, the label show
       # up in the grid editor.  This hack seems to fix the
       # problem.  However, the label in the add-in-form now looks

data/app/components/marty/log_view.rb

@@ -75,7 +75,6 @@ class Marty::LogView < Marty::Grid
   end
 
   column :details do |c|
-    c.getter = lambda { |r| CGI.escapeHTML(r.details.pretty_inspect) }
     c.filter_with = lambda { |r, v, op|
       r.where("details::text  #{op} '%#{v}%'")
     }

data/app/components/marty/main_auth_app.rb

@@ -6,7 +6,6 @@ require 'marty/data_grid_view'
 require 'marty/schedule_jobs_dashboard'
 require 'marty/schedule_jobs_logs'
 require 'marty/data_grid_user_view'
-require 'marty/event_view'
 require 'marty/import_type_view'
 require 'marty/new_posting_window'
 require 'marty/posting_window'
@@ -85,7 +84,6 @@ class Marty::MainAuthApp < Marty::AuthApp
         :import_type_view,
         :user_view,
         :config_view,
-        :event_view,
         :reload_scripts,
         :load_seed,
       ] + background_jobs_menu + log_menu + api_menu
@@ -134,7 +132,7 @@ class Marty::MainAuthApp < Marty::AuthApp
   def app_title
     e = ENV['RAILS_ENV']
 
-    title = "#{app_moniker} #{Rails.application.class.parent_name.titleize}"
+    title = "#{app_moniker} #{::Marty::RailsApp.application_name.titleize}"
     title += " - #{e.capitalize}" unless e == 'production'
     title += ' [TIME WARPED]' if warped
     title
@@ -202,13 +200,6 @@ class Marty::MainAuthApp < Marty::AuthApp
       !self.class.has_perm?(:user_manager)
   end
 
-  action :event_view do |a|
-    a.text      = I18n.t('event_view')
-    a.handler   = :netzke_load_component_by_action
-    a.icon_cls = 'fa fa-bolt glyph'
-    a.disabled  = !self.class.has_perm?(:admin)
-  end
-
   action :config_view do |a|
     a.text      = I18n.t('config_view')
     a.handler   = :netzke_load_component_by_action
@@ -297,6 +288,14 @@ class Marty::MainAuthApp < Marty::AuthApp
     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'
+    a.icon_cls = 'fa fa-cog glyph'
+    a.disabled = !self.class.has_perm?(:admin)
+    a.handler = :netzke_load_component_by_action
+  end
+
   action :schedule_jobs_logs do |a|
     a.text     = "Schedule Job's Logs"
     a.tooltip  = "Show Scheduled Job's logs"
@@ -411,8 +410,6 @@ class Marty::MainAuthApp < Marty::AuthApp
   component :data_grid_view
   component :data_grid_user_view
 
-  component :event_view
-
   component :import_type_view
 
   component :log_view do |c|

data/app/components/marty/promise_view.rb

@@ -30,6 +30,7 @@ class Marty::PromiseView < Netzke::Tree::Base
       { name: :title, xtype: :treecolumn },
       :user__login,
       :job_id,
+      :priority,
       :start_dt,
       :end_dt,
       :status,
@@ -91,6 +92,10 @@ class Marty::PromiseView < Netzke::Tree::Base
     config.width = 100
   end
 
+  attribute :priority do |config|
+    config.width = 90
+  end
+
   attribute :job_id do |config|
     config.width = 90
   end

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

@@ -28,19 +28,23 @@
     if (status === true) return "green-row";
     return "orange-row";
   },
+
   listenFn: function (obj, search_text) {
     var lg = this.ownerCt.ownerCt;
     lg.getStore().getProxy().extraParams.live_search = search_text;
     lg.getStore().load();
   },
+
   netzkeOnDownload: function () {
     var jid = this.getSelectionModel().getSelection()[0].getId();
     // FIXME: seems pretty hacky
     window.location = this.jobPath(jid);
   },
+
   netzkeOnRefresh: function () {
     this.store.load();
   },
+
   netzkeOnClear: function (params) {
     var me = this;
     Ext.Msg.show({
@@ -53,5 +57,12 @@
         (btn == "ok" && value == "CLEAR") && me.server.clear({});
       }
     });
+  },
+
+  // Updates model's `expanded` column if it's present.
+  // Since promises don't have such column, we don't need to send that
+  // extra request for every node expand event.
+  netzkeOnNodeStateChange: function() {
+    return;
   }
 }

data/app/components/marty/schedule_jobs_dashboard.rb

@@ -1,117 +1,51 @@
-class Marty::ScheduleJobsDashboard < Marty::Grid
-  ACCESSIBLE_BY = [:admin]
+require 'marty/schedule_jobs_grid'
 
-  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
-  )
+class Marty::ScheduleJobsDashboard < Marty::Form
+  include Marty::Extras::Layout
 
   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
+    c.items = [
+      :schedule_jobs_grid,
+      :schedule_jobs_warnings
     ]
   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
+  def prepare_warnings
+    djs = ::Marty::BackgroundJob::FetchMissingInScheduleCronJobs.call
 
-  endpoint :edit_window__edit_form__submit do |params|
-    result = super(params)
-    next result if result.empty?
+    messages = djs.map do |dj|
+      handler_str = dj.handler[/job_class.*\n/]
+      job_class = handler_str.gsub('job_class:', '').strip
 
-    obj_hash = result.first
-    Marty::BackgroundJob::UpdateSchedule.call(id: obj_hash['id'], job_class: obj_hash['job_class'])
+      "#{job_class} with cron #{dj.cron} is present in delayed_jobs table, " \
+        'but is missing in the Dashboard.'
+    end
 
-    result
+    messages.join('<br>')
   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
+  client_class do |c|
+    c.header   = false
+    # c.layout   = :border
+    c.defaults = { body_style: 'padding:0px' }
   end
 
-  endpoint :multiedit_window__multiedit_form__submit do |_params|
-    client.netzke_notify 'Multiediting is disabled for cron schedules'
+  component :schedule_jobs_grid do |c|
+    c.klass = Marty::ScheduleJobsGrid
+    c.region = :north
+    c.min_height = 500
   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
+  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
 
-  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.")
+  def default_bbar
+    []
   end
 end