rocketjob_mission_control 2.0.0 → 2.1.0

data/app/datatables/rocket_job_mission_control/scheduled_jobs_datatable.rb

@@ -1,6 +1,5 @@
 module RocketJobMissionControl
   class ScheduledJobsDatatable < JobsDatatable
-    delegate :run_now_job_path, to: :@view
     private
 
     def data
@@ -10,7 +9,7 @@ module RocketJobMissionControl
           '1' => h(job.description.try(:truncate, 50)),
           '2' => h(time_till_run(job)),
           '3' => h(cron_schedule(job)),
-          '4' => run_now(job),
+          '4' => action_buttons(job),
           'DT_RowClass' => "card callout callout-#{job.state}"
         }
       end
@@ -28,9 +27,5 @@ module RocketJobMissionControl
     def cron_schedule(job)
       job.cron_schedule if job.respond_to?(:cron_schedule)
     end
-
-    def run_now(job)
-      "#{ link_to 'Run', run_now_job_path(job), method: :patch, class: 'btn btn-default btn-xs', data: { confirm: "Run #{job.class.name} now?" } }"
-    end
   end
 end

data/app/helpers/rocket_job_mission_control/jobs_helper.rb

@@ -20,20 +20,12 @@ module RocketJobMissionControl
         action,
         path,
         method: http_method,
+        title: "#{action} job",
         class:  'btn btn-default',
         data:   {confirm: t(:confirm, scope: [:job, :action], action: action)}
       )
     end
 
-    def view_logs_link(job)
-      link_to(
-        'view logs',
-        "http://localhost:5601/app/kibana#/discover?_g=(refreshInterval:(display:'5%20seconds',pause:!f,section:1,value:5000),time:(from:now-15m,mode:quick,to:now))&_a=(columns:!(level,duration,name,message,host),index:'semantic_logger-*',interval:auto,query:(query_string:(analyze_wildcard:!t,query:'tags:#{job.id.to_s}')),sort:!(timestamp,desc))",
-        class:  'btn btn-default',
-        target: '_blank'
-      )
-    end
-
     def job_states
       @job_states ||= RocketJob::Job.aasm.states.map { |state| state.name.to_s }
     end

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

@@ -7,9 +7,8 @@
         %span.icon-bar
         %span.icon-bar
       %a.navbar-brand.brand{ href: 'http://rocketjob.io', target: '_blank'}
-        = image_tag('rocket_job_mission_control/rocket-icon-64x64.png', size: '32x32')
-        Rocket
-        %span Job
+        = image_tag('rocket_job_mission_control/rocket-icon-64x64.png')
+        Rocket Job
     .navbar-collapse.collapse
       %ul.nav.navbar-nav
         %li
@@ -30,4 +29,4 @@
             Directory Monitors
       %ul.nav.navbar-nav.navbar-right
         %li
-          %a{:href => main_app.root_path } Home
+          %a{:href => '/' } Home

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

@@ -2,7 +2,7 @@
   .list
     .row
       .col-sm-10
-        %h2 Active Processes
+        %h2 Active Workers
       .col-sm-2
         .btn.btn-default.pull-right.dt-reload{ data: { behavior: 'reload' } }
           %i.fa.fa-refresh

data/app/views/rocket_job_mission_control/dirmon_entries/_sidebar.html.haml

@@ -2,7 +2,7 @@
   %li
     = link_to(new_dirmon_entry_path) do
       %i.fa.fa-plus
-      New Entry
+      Create
   %li
     = link_to(dirmon_entries_path) do
       %i.fa.fa-list

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

@@ -0,0 +1,34 @@
+.container-fluid
+  .lead= "Edit #{@job._type}"
+
+  - if @job.errors.present?
+    .alert.alert-alert
+      Invalid Job!
+      - @job.errors.messages.each_pair do |field, message|
+        .message
+          = "#{field.to_s.humanize} is not valid."
+
+  = form_for(@job, as: :job, url: job_path(@job)) do |f|
+    .row
+      .col-md-8
+        = f.label :description
+        = f.text_area :description, value: @job.description, class: 'form-control description-block'
+      .col-md-4
+        = f.label :priority
+        = 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)
+        .col-md-4
+          = f.label :max_active_workers
+          = f.number_field :max_active_workers, class: 'form-control'
+      - if @job.method_exists?(:cron_schedule)
+        .col-md-4
+          = f.label :cron_schedule
+          = f.text_field :cron_schedule, class: 'form-control'
+    .row
+      .col-md-12
+        .buttons
+          = f.submit 'Update', class: 'btn btn-primary'
+          = link_to 'Cancel', :back, class: 'btn btn-default'

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

@@ -13,12 +13,13 @@
           %th Description
           %th Created
           %th Duration
+          %th Actions
       %tbody
 
 :javascript
   jQuery(function() {
     new RjmcDatatable(
       $(".jobs-datatable"),
-      [{data: '0'}, {data: '1'}, {data: '2'}, {data: '3', orderable: false}]
+      [{data: '0'}, {data: '1'}, {data: '2'}, {data: '3', orderable: false}, {data: '4', orderable: false}]
     );
   });

data/app/views/rocket_job_mission_control/jobs/index_filters/aborted.html.haml

@@ -12,11 +12,12 @@
           %th Class
           %th Description
           %th Aborted
+          %th Actions
       %tbody
 
 :javascript
   jQuery(function() {
     new RjmcDatatable(
       $(".jobs-datatable"),
-      [{data: '0'}, {data: '1'}, {data: '2'}]);
+      [{data: '0', width: '30%'}, {data: '1', width: '30%'}, {data: '2'}, {data: '3', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/jobs/index_filters/completed.html.haml

@@ -13,11 +13,12 @@
           %th Description
           %th Duration
           %th Completed
+          %th Actions
       %tbody
 
 :javascript
   jQuery(function() {
     new RjmcDatatable(
       $(".jobs-datatable"),
-      [{data: '0'}, {data: '1'}, {data: '2', orderable: false}, {data: '3'}]);
+      [{data: '0'}, {data: '1'}, {data: '2', orderable: false}, {data: '3'}, {data: '4', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/jobs/index_filters/failed.html.haml

@@ -12,11 +12,12 @@
           %th Class
           %th Description
           %th Failed
+          %th Actions
       %tbody
 
 :javascript
   jQuery(function() {
     new RjmcDatatable(
       $(".jobs-datatable"),
-      [{data: '0'}, {data: '1'}, {data: '2'}]);
+      [{data: '0', width: '30%'}, {data: '1', width: '30%'}, {data: '2'}, {data: '3', orderable: false}]);
   });

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

@@ -12,11 +12,12 @@
           %th Class
           %th Description
           %th Paused
+          %th Actions
       %tbody
 
 :javascript
   jQuery(function() {
     new RjmcDatatable(
       $(".jobs-datatable"),
-      [{data: '0'}, {data: '1'}, {data: '2'}]);
+      [{data: '0', width: '30%'}, {data: '1', width: '30%'}, {data: '2'}, {data: '3', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/jobs/index_filters/queued.html.haml

@@ -13,11 +13,12 @@
           %th Description
           %th Priority
           %th Queued For
+          %th Actions
       %tbody
 
 :javascript
   jQuery(function() {
     new RjmcDatatable(
       $(".jobs-datatable"),
-      [{data: '0'}, {data: '1'}, {data: '2'}, {data: '3', orderable: false}]);
+      [{data: '0'}, {data: '1'}, {data: '2'}, {data: '3', orderable: false}, {data: '4', orderable: false}]);
   });

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

@@ -14,11 +14,12 @@
           %th Progress
           %th Priority
           %th Started
+          %th Actions
       %tbody
 
 :javascript
   jQuery(function() {
     new RjmcDatatable(
       $(".jobs-datatable"),
-      [{data: '0'}, {data: '1'}, {data: '2', orderable: false}, {data: '3'}, {data: '4'}]);
+      [{data: '0'}, {data: '1'}, {data: '2', orderable: false}, {data: '3'}, {data: '4'}, {data: '5', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/jobs/index_filters/scheduled.html.haml

@@ -13,12 +13,12 @@
           %th Description
           %th Runs in
           %th Cron Schedule
-          %th Run Now
+          %th Actions
       %tbody
 
 :javascript
   jQuery(function() {
     new RjmcDatatable(
       $(".jobs-datatable"),
-      [{data: '0'}, {data: '1'}, {data: '2', orderable: false}, {data: '3'}, {data: '4', orderable: false}]);
+      [{data: '0'}, {data: '1'}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
   });

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

@@ -8,46 +8,31 @@
         .right{ class: @job.state.to_s }
           = @job.state
 
-      .priority.pull-right
-        = form_for(@job, as: :job, url: job_path(@job), html: {method: :patch}) do |f|
+      .btn-toolbar.job-actions.pull-right
+        .btn-group
+          - valid_events = @job.aasm.events.collect{ |e| e.name }
+          - if valid_events.include?(:abort)
+            = job_action_link('Abort', rocket_job_mission_control.abort_job_path(@job), :patch)
 
-          .input-group.priority-group
-            = f.text_field(:priority, value: @job.priority, class: 'form-control')
+          - if @job.completed? || @job.aborted?
+            = job_action_link('Destroy', rocket_job_mission_control.job_path(@job), :delete)
 
-            .input-group-btn-vertical
-              %button#increase_priority.btn.btn-default.up{ type: 'button' }
-                %i.fa.fa-caret-up
+          - if valid_events.include?(:fail)
+            = job_action_link('Fail', rocket_job_mission_control.fail_job_path(@job), :patch)
 
-              %button#decrease_priority.btn.btn-default.down{ type: 'button' }
-                %i.fa.fa-caret-down
+          - if valid_events.include?(:pause)
+            = job_action_link('Pause', rocket_job_mission_control.pause_job_path(@job), :patch)
 
-            = submit_tag "set", class: "btn btn-sm btn-primary priority-set"
+          - if valid_events.include?(:resume)
+            = job_action_link('Resume', rocket_job_mission_control.resume_job_path(@job), :patch)
 
-      .job-actions.btn-group.pull-right{ style: 'margin-right: 1em;' }
-        - valid_events = @job.aasm.events.collect{ |e| e.name }
-        - if valid_events.include?(:abort)
-          = job_action_link('abort', rocket_job_mission_control.abort_job_path(@job), :patch)
+          - if valid_events.include?(:retry)
+            = job_action_link('Retry', rocket_job_mission_control.retry_job_path(@job), :patch)
 
-        - if @job.completed? || @job.aborted?
-          = job_action_link('destroy', rocket_job_mission_control.job_path(@job), :delete)
+          - 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"
 
-        - if valid_events.include?(:fail)
-          = job_action_link('fail', rocket_job_mission_control.fail_job_path(@job), :patch)
-
-        - if valid_events.include?(:pause)
-          = job_action_link('pause', rocket_job_mission_control.pause_job_path(@job), :patch)
-
-        - if valid_events.include?(:resume)
-          = job_action_link('resume', rocket_job_mission_control.resume_job_path(@job), :patch)
-
-        - if valid_events.include?(:retry)
-          = 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')
-
-        = view_logs_link(@job)
-
-      .clearfix
-
-      = render partial: 'status', locals: { job: @job }
+      .col-md-12
+        = render partial: 'status', locals: { job: @job }

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

@@ -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/routes.rb

@@ -1,6 +1,6 @@
 RocketJobMissionControl::Engine.routes.draw do
 
-  resources :jobs, only: [:index, :show, :update, :destroy] do
+  resources :jobs, only: [:index, :show, :update, :destroy, :edit] do
     collection do
       get :running,   to: 'jobs/index_filters#running'
       get :scheduled, to: 'jobs/index_filters#scheduled'

data/lib/rocket_job_mission_control/engine.rb

@@ -13,5 +13,11 @@ module RocketJobMissionControl
     require 'coffee-rails'
     require 'kaminari'
     require 'jquery-datatables-rails'
+
+    config.to_prepare do
+      Rails.application.config.assets.precompile += %w(
+        rocket_job_mission_control/rocket-icon-64x64.png
+      )
+    end
   end
 end

data/lib/rocket_job_mission_control/version.rb

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

data/spec/controllers/dirmon_entries/index_filters_controller_spec.rb

@@ -0,0 +1,74 @@
+require 'rails_helper'
+
+class AJob < RocketJob::Job
+  def perform(id)
+    id
+  end
+end
+
+module RocketJobMissionControl
+  module DirmonEntries
+    RSpec.describe IndexFiltersController do
+      routes { Engine.routes }
+
+      states = %w(pending enabled failed disabled)
+
+      states.each_with_index do |state, i|
+        describe "GET ##{state}" do
+          describe "with no #{state} dirmons" do
+            before do
+              get state.to_sym
+            end
+
+            it "succeeds" do
+              expect(response.status).to be(200)
+            end
+
+            it 'renders template' do
+              expect(response).to render_template(state)
+            end
+
+            it "returns no jobs" do
+              expect(assigns(:dirmons).count).to eq(0)
+            end
+          end
+
+          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') }
+
+            before do
+              RocketJob::DirmonEntry.create!(
+              name: 'Test',
+              state: not_state,
+              arguments: ['42'],
+              pattern: '21',
+              job_class_name: 'AJob')
+              get state.to_sym
+            end
+
+            after do
+              DatabaseCleaner.clean
+            end
+
+            it "succeeds" do
+              expect(response.status).to be(200)
+            end
+
+            it 'renders template' do
+              expect(response).to render_template(state)
+            end
+
+            it "grabs a filtered list of dirmons" do
+              expect(assigns(:dirmons)).to match_array([state_dirmon])
+
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/controllers/jobs/index_filters_controller_spec.rb

@@ -0,0 +1,65 @@
+require 'rails_helper'
+
+module RocketJobMissionControl
+  module Jobs
+    RSpec.describe IndexFiltersController do
+      routes { Engine.routes }
+
+      states = %w(running paused completed aborted failed queued scheduled)
+
+      states.each_with_index do |state, i|
+        describe "GET ##{state}" do
+          describe "with no #{state} jobs" do
+            before do
+              get state.to_sym
+            end
+
+            it "succeeds" do
+              expect(response.status).to be(200)
+            end
+
+            it 'renders template' do
+              expect(response).to render_template(state)
+            end
+
+            it "returns no jobs" do
+              expect(assigns(:jobs).count).to eq(0)
+            end
+          end
+
+          describe "with #{state} jobs" do
+            let(:not_state) { states[i-1] }
+            let(:state_job) {
+              if state == 'scheduled'
+                RocketJob::Job.create(state: :queued, run_at: Date.tomorrow)
+              else
+                RocketJob::Job.create(state: state)
+              end
+            }
+
+            before do
+              RocketJob::Job.create(state: not_state)
+              get state.to_sym
+            end
+
+            after do
+              DatabaseCleaner.clean
+            end
+
+            it "succeeds" do
+              expect(response.status).to be(200)
+            end
+
+            it 'renders template' do
+              expect(response).to render_template(state)
+            end
+
+            it "grabs a filtered list of rocket jobs" do
+              expect(assigns(:jobs)).to match_array([state_job])
+            end
+          end
+        end
+      end
+    end
+  end
+end