rocketjob_mission_control 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffb6fd358569ee47288a00a2f5d909bc37ffb7fe
-  data.tar.gz: 20914808b3f576db0c45b607e72cb1998bad3327
+  metadata.gz: 7962e3b8e27b8b98e946fedd53bfba833a92769f
+  data.tar.gz: 6bf9aa56d4c51a47c459b0f13c33c604161f3b1a
 SHA512:
-  metadata.gz: cc99088dbcaff508741d44553f8003c3c471030925219d7c38cf647e62d76a67c491e4f3adc195a1cd0ba89af34c0b9804b0b090bd0d1036ce97a21a2a8efd10
-  data.tar.gz: e9f4f0278190e8fb8f6d0cbe567e305ac7a3b6363a45b3a7671f3f562bbee998ca6cfa4366df2ce43cf75995011240c15928ff82758f6a26158e3ccd73d0677e
+  metadata.gz: fba1711a8c000adf050fe6dbf840c7aaa70ae189276696bc41edc615280572f7019242633d6b46d99d8e6a95f4c01ebc483b717bf793cac4bde91166ac49f405
+  data.tar.gz: a1f334a2c43f79a67b0b3b98c417957518ac862107b02287c129577fbb31173195ece72303fb78e8678e56b6f468d82ad0c624a7e6a6b8159a6a5796e0753f52

data/app/assets/javascripts/rocket_job_mission_control/datatable.js.coffee

@@ -4,6 +4,7 @@ class @RjmcDatatable
     @columns = columns
     @ordering = opts.ordering ? true
     @searching = opts.searching ? true
+    @pageLength = opts.pageLength ? 100
     @order = opts.order ? []
     @reload = $("[data-behavior='reload']")
     @initializeTable()
@@ -12,6 +13,7 @@ class @RjmcDatatable
   initializeTable: ->
     @data = @table.DataTable
       pagingType: 'full_numbers'
+      pageLength: @pageLength
       responsive: true
       ajax: @table.data('source')
       processing: true

data/app/assets/stylesheets/rocket_job_mission_control/base.scss

@@ -31,17 +31,29 @@ table.datatable {
   margin: 1em 0;
 }
 
+table.dataTable thead .sorting:after {
+    content: "\f0c9";
+}
+
 table.dataTable thead .sorting_asc:after {
-    content: "\e155";
+    content: "\f160";
+}
+
+table.dataTable thead .sorting_desc:after {
+    content: "\f161";
 }
 
 table.dataTable thead .sorting:after, table.dataTable thead .sorting_asc:after, table.dataTable thead .sorting_desc:after {
-    position: absolute;
-    top: 8px;
-    left: 8px;
-    display: block;
-    font-family: 'Glyphicons Halflings';
-    opacity: 0.5;
+  position: absolute;
+  top: 8px;
+  left: 8px;
+  display: block;
+  // display: inline-block;
+  font: normal normal normal 14px/1 FontAwesome;
+  font-size: inherit;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
 table.dataTable thead > tr > th {

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -161,9 +161,7 @@ module RocketJobMissionControl
     def dirmon_params
       params
         .fetch(:rocket_job_dirmon_entry, {})
-        .permit(:name, :archive_directory, :pattern, :job_class_name).tap do |whitelist|
-        whitelist[:properties] = params[:rocket_job_dirmon_entry][:properties] if params.fetch(:rocket_job_dirmon_entry, {})[:properties]
-      end
+        .permit(:name, :archive_directory, :pattern, :job_class_name)
     end
   end
 end

data/app/controllers/rocket_job_mission_control/jobs/index_filters_controller.rb

@@ -4,7 +4,7 @@ module RocketJobMissionControl
       before_filter :show_sidebar
 
       def running
-        @jobs = RocketJob::Job.where(state: :running).sort(_id: :desc)
+        @jobs = RocketJob::Job.where(state: :running).sort(started_at: :desc)
         respond_to do |format|
           format.html
           format.json { render(json: RunningJobsDatatable.new(view_context, @jobs)) }
@@ -12,7 +12,7 @@ module RocketJobMissionControl
       end
 
       def paused
-        @jobs = RocketJob::Job.where(state: :paused).sort(_id: :desc)
+        @jobs = RocketJob::Job.where(state: :paused).sort(completed_at: :desc)
         respond_to do |format|
           format.html
           format.json { render(json: InterruptedJobsDatatable.new(view_context, @jobs)) }
@@ -20,7 +20,7 @@ module RocketJobMissionControl
       end
 
       def completed
-        @jobs = RocketJob::Job.where(state: :completed).sort(_id: :desc)
+        @jobs = RocketJob::Job.where(state: :completed).sort(completed_at: :desc)
         respond_to do |format|
           format.html
           format.json { render(json: CompletedJobsDatatable.new(view_context, @jobs)) }
@@ -28,7 +28,7 @@ module RocketJobMissionControl
       end
 
       def aborted
-        @jobs = RocketJob::Job.where(state: :aborted).sort(_id: :desc)
+        @jobs = RocketJob::Job.where(state: :aborted).sort(completed_at: :desc)
         respond_to do |format|
           format.html
           format.json { render(json: InterruptedJobsDatatable.new(view_context, @jobs)) }
@@ -36,7 +36,7 @@ module RocketJobMissionControl
       end
 
       def failed
-        @jobs = RocketJob::Job.where(state: :failed).sort(_id: :desc)
+        @jobs = RocketJob::Job.where(state: :failed).sort(completed_at: :desc)
         respond_to do |format|
           format.html
           format.json { render(json: InterruptedJobsDatatable.new(view_context, @jobs)) }
@@ -44,7 +44,7 @@ module RocketJobMissionControl
       end
 
       def queued
-        @jobs = RocketJob::Job.queued_now.sort(_id: :desc)
+        @jobs = RocketJob::Job.queued_now.sort(created_at: :desc)
         respond_to do |format|
           format.html
           format.json { render(json: QueuedJobsDatatable.new(view_context, @jobs)) }
@@ -52,7 +52,7 @@ module RocketJobMissionControl
       end
 
       def scheduled
-        @jobs = RocketJob::Job.scheduled.sort(_id: :desc)
+        @jobs = RocketJob::Job.scheduled.sort(run_at: :asc)
         respond_to do |format|
           format.html
           format.json { render(json: ScheduledJobsDatatable.new(view_context, @jobs)) }

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -13,6 +13,7 @@ module RocketJobMissionControl
     end
 
     def update
+      JobSanitizer.new(params).sanitize
       if @job.update_attributes(job_params)
         redirect_to job_path(@job)
       else

data/app/datatables/rocket_job_mission_control/jobs_datatable.rb

@@ -62,7 +62,9 @@ module RocketJobMissionControl
     def action_buttons(job)
       events = valid_events(job)
       buttons = "<div class='inline-job-actions'>"
-      buttons += "#{ link_to( 'Edit', edit_job_path(job), class: 'btn btn-default', title: 'Edit job') }"
+      unless job.completed? || job.aborted?
+        buttons += "#{ link_to( 'Edit', edit_job_path(job), class: 'btn btn-default', title: 'Edit job') }"
+      end
       if job.scheduled?
         buttons += "#{ job_action_link('Run', run_now_job_path(job), :patch) }"
       end
@@ -85,7 +87,7 @@ module RocketJobMissionControl
         buttons += "#{ job_action_link('Retry', retry_job_path(job), :patch) }"
       end
       if job.respond_to?(:input) && job.input.failed_count > 0
-        buttons += "#{ link_to('view errors', job_failures_path(job), class: 'btn btn-default') }"
+        buttons += "#{ link_to('View Errors', job_failures_path(job), class: 'btn btn-default') }"
       end
       buttons += "</div>"
     end

data/app/datatables/rocket_job_mission_control/workers_datatable.rb

@@ -80,7 +80,7 @@ module RocketJobMissionControl
 
     def filter_records(records)
       return records unless (params[:search].present? && params[:search][:value].present?)
-      conditions = params[:search][:value]#build_conditions_for(params[:search][:value])
+      conditions = params[:search][:value]
       records = RocketJobMissionControl::Workers::Search.new(conditions, records).execute if conditions
       records
     end

data/app/interactors/rocket_job_mission_control/dirmon_entries/search.rb

@@ -4,7 +4,7 @@ module RocketJobMissionControl
       attr_reader :results, :search_term
 
       def initialize(search_term, search_subset)
-        @search_term = search_term
+        @search_term = Regexp.escape(search_term)
         @results     = search_subset
       end
 

data/app/interactors/rocket_job_mission_control/jobs/search.rb

@@ -4,7 +4,7 @@ module RocketJobMissionControl
       attr_reader :results, :search_term
 
       def initialize(search_term, search_subset)
-        @search_term = search_term
+        @search_term = Regexp.escape(search_term)
         @results     = search_subset
       end
 

data/app/interactors/rocket_job_mission_control/workers/search.rb

@@ -4,7 +4,7 @@ module RocketJobMissionControl
       attr_reader :results, :search_term
 
       def initialize(search_term, search_subset)
-        @search_term = search_term
+        @search_term = Regexp.escape(search_term)
         @results     = search_subset
       end
 

data/app/models/job_sanitizer.rb

@@ -0,0 +1,17 @@
+class JobSanitizer
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def sanitize
+    sanitize_log_level
+    params
+  end
+
+  private
+  def sanitize_log_level
+    params[:job][:log_level] = nil if params[:job][:log_level].blank?
+  end
+end

data/app/views/layouts/rocket_job_mission_control/application.html.haml

@@ -18,7 +18,7 @@
 
     = csrf_meta_tag
 
-    %link{href: "//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css", rel: "stylesheet"}/
+    %link{href: "https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css", rel: "stylesheet"}/
 
   %body.rocket_job
     #wrapper

data/app/views/layouts/rocket_job_mission_control/partials/_header.html.haml

@@ -18,7 +18,7 @@
         %li
           = link_to workers_path, class: active_page(workers_path) do
             %i.fa.fa-database
-            Workers
+            Servers
         %li
           = link_to active_processes_path, class: active_page(active_processes_path) do
             %i.fa.fa-circle-o-notch

data/app/views/rocket_job_mission_control/jobs/edit.html.haml

@@ -18,15 +18,15 @@
         = f.number_field :priority, value: @job.priority, class: 'form-control'
       .col-md-4
         = f.label :log_level
-        = f.select :log_level, ['', 'trace', 'debug', 'info', 'warn', 'error', 'fatal'], {}, { class: 'form-control' }
-      - if @job.method_exists?(:max_active_workers)
+        = f.select :log_level, ['trace', 'debug', 'info', 'warn', 'error', 'fatal'], { include_blank: true }, { class: 'form-control' }
+      - if @job.respond_to?(:max_active_workers)
         .col-md-4
           = f.label :max_active_workers
-          = f.number_field :max_active_workers, class: 'form-control'
-      - if @job.method_exists?(:cron_schedule)
+          = f.number_field :max_active_workers, value: @job.max_active_workers, min: 0,  class: 'form-control'
+      - if @job.respond_to?(:cron_schedule)
         .col-md-4
           = f.label :cron_schedule
-          = f.text_field :cron_schedule, class: 'form-control'
+          = f.text_field :cron_schedule, value: @job.cron_schedule, class: 'form-control'
     .row
       .col-md-12
         .buttons

data/app/views/rocket_job_mission_control/jobs/show.html.haml

@@ -30,9 +30,10 @@
             = job_action_link('Retry', rocket_job_mission_control.retry_job_path(@job), :patch)
 
           - if @job.respond_to?(:input) && @job.input.failed_count > 0
-            = link_to('view errors', job_failures_path(@job), class: 'btn btn-default')
-        .btn-group
-          = link_to "Edit", edit_job_path(@job), class: "btn btn-default"
+            = link_to('View Errors', job_failures_path(@job), class: 'btn btn-default')
+        - unless @job.completed? || @job.aborted?
+          .btn-group
+            = link_to "Edit", edit_job_path(@job), class: "btn btn-default"
 
       .col-md-12
         = render partial: 'status', locals: { job: @job }

data/app/views/rocket_job_mission_control/workers/index.html.haml

@@ -3,7 +3,7 @@
     .list
       .row
         .col-md-6
-          %h2 Worker Processes
+          %h2 Servers
         .col-md-6
           .col-sm-10
             .worker-collection-actions

data/app/views/rocket_job_mission_control/workers/index_filters/paused.html.haml

@@ -3,7 +3,7 @@
     .list
       .row
         .col-md-6
-          %h2 Paused Worker Processes
+          %h2 Paused Servers
         .col-md-6
           .col-sm-10
             .worker-collection-actions
@@ -33,5 +33,5 @@
   jQuery(function() {
     new RjmcDatatable(
       $('.workers-datatable'),
-      [{data: '0'}, {data: '1', orderable: false}, {data: '2', orderable: false}, {data: '3', orderable: false}, {data: '4', orderable: false}]);
+      [{data: '0'}, {data: '1', orderable: false}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/workers/index_filters/running.html.haml

@@ -3,7 +3,7 @@
     .list
       .row
         .col-md-6
-          %h2 Running Worker Processes
+          %h2 Running Servers
         .col-md-6
           .col-sm-10
             .worker-collection-actions
@@ -33,5 +33,5 @@
   jQuery(function() {
     new RjmcDatatable(
       $('.workers-datatable'),
-      [{data: '0'}, {data: '1', orderable: false}, {data: '2', orderable: false}, {data: '3', orderable: false}, {data: '4', orderable: false}]);
+      [{data: '0'}, {data: '1', orderable: false}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/workers/index_filters/starting.html.haml

@@ -3,7 +3,7 @@
     .list
       .row
         .col-md-6
-          %h2 Starting Worker Processes
+          %h2 Starting Servers
         .col-md-6
           .col-sm-10
             .worker-collection-actions
@@ -33,5 +33,5 @@
   jQuery(function() {
     new RjmcDatatable(
       $('.workers-datatable'),
-      [{data: '0'}, {data: '1', orderable: false}, {data: '2', orderable: false}, {data: '3', orderable: false}, {data: '4', orderable: false}]);
+      [{data: '0'}, {data: '1', orderable: false}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/workers/index_filters/stopping.html.haml

@@ -3,7 +3,7 @@
     .list
       .row
         .col-md-6
-          %h2 Stopping Worker Processes
+          %h2 Stopping Servers
         .col-md-6
           .col-sm-10
             .worker-collection-actions
@@ -33,5 +33,5 @@
   jQuery(function() {
     new RjmcDatatable(
       $('.workers-datatable'),
-      [{data: '0'}, {data: '1', orderable: false}, {data: '2', orderable: false}, {data: '3', orderable: false}, {data: '4', orderable: false}]);
+      [{data: '0'}, {data: '1', orderable: false}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
   });

data/config/locales/en.yml

@@ -38,21 +38,21 @@ en:
         other: "%{count} years" # default was: "almost %{count} years"
   worker:
     stop:
-      success: "Worker successfully stopped."
-      failure: "Error attempting to stop worker."
+      success: "Server successfully stopped."
+      failure: "Error attempting to stop server."
     destroy:
-      success: "Worker successfully destroyed."
-      failure: "Error attempting to destroy worker."
+      success: "Server successfully destroyed."
+      failure: "Error attempting to destroy server."
     pause:
-      success: "Worker successfully paused."
-      failure: "Error attempting to pause worker."
+      success: "Server successfully paused."
+      failure: "Error attempting to pause server."
     resume:
-      success: "Worker successfully resumed."
-      failure: "Error attempting to resume worker."
+      success: "Server successfully resumed."
+      failure: "Error attempting to resume server."
     update_all:
-      success: "Workers have been %{worker_action}."
+      success: "Servers have been %{worker_action}."
       invalid: "Action not allowed."
-      confirm: "Are you sure you want to %{action} workers?"
+      confirm: "Are you sure you want to %{action} servers?"
   job:
     find:
       failure: "Could not find job with id: %{id}!"

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/controllers/dirmon_entries/index_filters_controller_spec.rb

@@ -35,23 +35,28 @@ module RocketJobMissionControl
 
           describe "with #{state} dirmons" do
             let(:not_state) { states[i-1] }
-            let!(:state_dirmon) { RocketJob::DirmonEntry.create!(state: state,
-              pattern: '21',
-              arguments: ['42'],
-              job_class_name: 'AJob') }
+            let!(:state_dirmon) {
+              RocketJob::DirmonEntry.create!(
+                state:          state,
+                pattern:        '21',
+                arguments:      ['42'],
+                job_class_name: 'AJob'
+              )
+            }
 
             before do
               RocketJob::DirmonEntry.create!(
-              name: 'Test',
-              state: not_state,
-              arguments: ['42'],
-              pattern: '21',
-              job_class_name: 'AJob')
+                name:           'Test',
+                state:          not_state,
+                arguments:      ['42'],
+                pattern:        '21',
+                job_class_name: 'AJob'
+              )
               get state.to_sym
             end
 
             after do
-              DatabaseCleaner.clean
+              RocketJob::DirmonEntry.delete_all
             end
 
             it "succeeds" do

data/spec/controllers/jobs/index_filters_controller_spec.rb

@@ -43,7 +43,8 @@ module RocketJobMissionControl
             end
 
             after do
-              DatabaseCleaner.clean
+              RocketJob::Worker.delete_all
+              RocketJob::Job.delete_all
             end
 
             it "succeeds" do