rocketjob_mission_control 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e4abab0ff95e45876f0040c82ba295c7df6cea6
-  data.tar.gz: 956f19de4f8194730a9945f98ff980f5494fd219
+  metadata.gz: ffb6fd358569ee47288a00a2f5d909bc37ffb7fe
+  data.tar.gz: 20914808b3f576db0c45b607e72cb1998bad3327
 SHA512:
-  metadata.gz: 551b600165582ad1513873c326afcd05830cdcfbf51030e4a808581a5311f03b460fc90b853f8ed03f851e3abaa8c809558a544e2061e836aa0fce41c99e8cb4
-  data.tar.gz: 2e617a157fa542861d6b7a2a63b2ab4bc7291527706346aab37af25081192f790bd39e785eee4e7300206293bbc5b76e4fab09a4144a4c0d4cef90cfd0718ae8
+  metadata.gz: cc99088dbcaff508741d44553f8003c3c471030925219d7c38cf647e62d76a67c491e4f3adc195a1cd0ba89af34c0b9804b0b090bd0d1036ce97a21a2a8efd10
+  data.tar.gz: e9f4f0278190e8fb8f6d0cbe567e305ac7a3b6363a45b3a7671f3f562bbee998ca6cfa4366df2ce43cf75995011240c15928ff82758f6a26158e3ccd73d0677e

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

@@ -1,17 +1,7 @@
-$(document).load ->
-  registerJobPriority()
-
-$(document).on 'ready page:change', ->
-  registerJobPriority()
-
-registerJobPriority = ->
-  $('#increase_priority').on 'click', ->
-    $('#job_priority').val(parseInt($('#job_priority').val(), 10) + 1)
-
-  $('#decrease_priority').on 'click', ->
-    $('#job_priority').val(parseInt($('#job_priority').val(), 10) - 1)
-
 $(document).ready ->
+  toggleCanvas()
+
+toggleCanvas = ->
   $('[data-toggle=offcanvas]').click ->
     $(this).toggleClass 'visible-xs text-center'
     $(this).find('i').toggleClass 'fa-chevron-right fa-chevron-left'

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

@@ -2,6 +2,10 @@ html, body, #wrapper, #wrapper > .container-fluid, #main, .row.row-offcanvas.row
   height: 100%
 }
 
+.navbar-default {
+  background-image: linear-gradient(90deg, #000000, #99120f);
+}
+
 #wrapper {
   background-color: #f7f7f7;
 }
@@ -13,6 +17,8 @@ html, body, #wrapper, #wrapper > .container-fluid, #main, .row.row-offcanvas.row
   padding-top:20px;
 }
 
+/* Datatables */
+
 table.datatable {
   border-collapse: collapse;
 }
@@ -42,11 +48,35 @@ table.dataTable thead > tr > th {
     padding-left: 30px;
 }
 
+.datatable .card td {
+    vertical-align: middle;
+}
+
+.inline-job-actions > a {
+  display: inline-block;
+  padding: 1px 5px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 1px;
+}
+
 .job-list {
   height: 100%;
   min-height: 768px;
 }
 
+
+/* Job Edit Page */
+
+.edit_job {
+  textarea.description-block {
+    height: 166px;
+  }
+  .buttons {
+    margin-top: 1em;
+  }
+}
+
 .job-status {
   .lead {
     color: #50555b;
@@ -167,6 +197,7 @@ table.dataTable thead > tr > th {
 
 #sidebar .nav li > a:hover {
     color: #000;
+    background-color: #dddddd;
 }
 
 @media screen and (max-width: 768px) {
@@ -214,16 +245,20 @@ table.dataTable thead > tr > th {
       left: 50%;
       margin-left: -96px !important;
       display: block;
+      img {
+        display: inline;
+        height: 40px;
+      }
   }
 
   .first { left: 15px; }
   .last { right: 15px; }
 
   a.navbar-brand.brand {
-    font-size: 28px;
-    color: orange;
+    font-size: 36px;
+    color: white;
     font-weight: bold;
-    margin-top: -5px;
+    margin-top: -10px;
 
     span {
       display: inline-block;
@@ -246,8 +281,6 @@ table.dataTable thead > tr > th {
 .job-search-box { padding: 20px 100px; }
 
 .list {
-  a { display: block; }
-
   .card:nth-child(1) { border-top: 1px solid #ddd; }
   .card:nth-child(odd) { background-color: #fff; }
 

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

@@ -17,7 +17,7 @@ $text-color:                                $gray-dark;
 $link-color:                                $brand-primary;
 $link-hover-color:                          darken($link-color, 15%);
 
-$font-family-sans-serif:                    "Helvetica Neue", Helvetica, Arial, sans-serif;
+$font-family-sans-serif:                    Arial, sans-serif;
 $font-family-serif:                         Georgia, "Times New Roman", Times, serif;
 $font-family-monospace:                     Menlo, Monaco, Consolas, "Courier New", monospace;
 $font-family-base:                          $font-family-sans-serif;

data/app/controllers/rocket_job_mission_control/active_processes_controller.rb

@@ -4,19 +4,20 @@ module RocketJobMissionControl
       # The list of workers actively processing jobs
       # [Array[Array<worker_name [String], job [RocketJob::Job], slice_id [String]]]
       sorted = true
-      t      = Time.new
       busy   = []
-      RocketJob::Job.running.sort(:worker_name).collect do |job|
-        if job.respond_to?(:input)
+      # Need paused, failed or aborted since workers may still be working on active slices
+      RocketJob::Job.where(state: [:running, :paused, :failed, :aborted]).sort(:worker_name).collect do |job|
+        if job.respond_to?(:input) && job.sub_state == :processing
           sorted = false
           job.input.each('state' => 'running') do |slice|
-            busy << [slice.worker_name, job, slice.started_at]
+            busy << {worker_name: slice.worker_name, klass: job.class.name, description: job.description, started_at: slice.started_at, id: job.id}
           end
-        else
-          busy << [job.worker_name, job, job.started_at]
+        elsif job.running?
+          busy << {worker_name: job.worker_name, klass: job.class.name, description: job.description, started_at: job.started_at, id: job.id}
         end
       end
-      @busy = sorted ? busy : busy.sort_by { |result| result.first }
+      @busy = sorted ? busy : busy.sort_by { |h| h[:worker_name] }
+
       respond_to do |format|
         format.html
         format.json { render(json: ActiveProcessesDatatable.new(view_context, @busy)) }

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

@@ -4,58 +4,58 @@ module RocketJobMissionControl
       before_filter :show_sidebar
 
       def running
-        running_jobs = RocketJob::Job.where(state: :running).sort(_id: :desc)
+        @jobs = RocketJob::Job.where(state: :running).sort(_id: :desc)
         respond_to do |format|
           format.html
-          format.json { render(json: RunningJobsDatatable.new(view_context, running_jobs)) }
+          format.json { render(json: RunningJobsDatatable.new(view_context, @jobs)) }
         end
       end
 
       def paused
-        paused_jobs = RocketJob::Job.where(state: :paused).sort(_id: :desc)
+        @jobs = RocketJob::Job.where(state: :paused).sort(_id: :desc)
         respond_to do |format|
           format.html
-          format.json { render(json: InterruptedJobsDatatable.new(view_context, paused_jobs)) }
+          format.json { render(json: InterruptedJobsDatatable.new(view_context, @jobs)) }
         end
       end
 
       def completed
-        completed_jobs = RocketJob::Job.where(state: :completed).sort(_id: :desc)
+        @jobs = RocketJob::Job.where(state: :completed).sort(_id: :desc)
         respond_to do |format|
           format.html
-          format.json { render(json: CompletedJobsDatatable.new(view_context, completed_jobs)) }
+          format.json { render(json: CompletedJobsDatatable.new(view_context, @jobs)) }
         end
       end
 
       def aborted
-        aborted_jobs = RocketJob::Job.where(state: :aborted).sort(_id: :desc)
+        @jobs = RocketJob::Job.where(state: :aborted).sort(_id: :desc)
         respond_to do |format|
           format.html
-          format.json { render(json: InterruptedJobsDatatable.new(view_context, aborted_jobs)) }
+          format.json { render(json: InterruptedJobsDatatable.new(view_context, @jobs)) }
         end
       end
 
       def failed
-        failed_jobs = RocketJob::Job.where(state: :failed).sort(_id: :desc)
+        @jobs = RocketJob::Job.where(state: :failed).sort(_id: :desc)
         respond_to do |format|
           format.html
-          format.json { render(json: InterruptedJobsDatatable.new(view_context, failed_jobs)) }
+          format.json { render(json: InterruptedJobsDatatable.new(view_context, @jobs)) }
         end
       end
 
       def queued
-        queued_jobs = RocketJob::Job.queued_now.sort(_id: :desc)
+        @jobs = RocketJob::Job.queued_now.sort(_id: :desc)
         respond_to do |format|
           format.html
-          format.json { render(json: QueuedJobsDatatable.new(view_context, queued_jobs)) }
+          format.json { render(json: QueuedJobsDatatable.new(view_context, @jobs)) }
         end
       end
 
       def scheduled
-        scheduled_jobs = RocketJob::Job.scheduled.sort(_id: :desc)
+        @jobs = RocketJob::Job.scheduled.sort(_id: :desc)
         respond_to do |format|
           format.html
-          format.json { render(json: ScheduledJobsDatatable.new(view_context, scheduled_jobs)) }
+          format.json { render(json: ScheduledJobsDatatable.new(view_context, @jobs)) }
         end
       end
 

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -13,9 +13,11 @@ module RocketJobMissionControl
     end
 
     def update
-      @job.update_attributes!(job_params)
-
-      redirect_to job_path(@job)
+      if @job.update_attributes(job_params)
+        redirect_to job_path(@job)
+      else
+        render :edit
+      end
     end
 
     def abort
@@ -66,6 +68,9 @@ module RocketJobMissionControl
     def show
     end
 
+    def edit
+    end
+
     private
 
     def show_sidebar
@@ -87,7 +92,7 @@ module RocketJobMissionControl
     end
 
     def job_params
-      params.require(:job).permit(:priority)
+      params.require(:job).permit(RocketJob::Job.rocket_job_properties)
     end
 
     def error_occurred(exception)

data/app/controllers/rocket_job_mission_control/workers_controller.rb

@@ -45,7 +45,7 @@ module RocketJobMissionControl
     end
 
     def destroy
-      if @worker.destroy
+      if @worker.nil? || @worker.destroy
         flash[:notice] = t(:success, scope: [:worker, :destroy])
       else
         flash[:alert] = t(:failure, scope: [:worker, :destroy])

data/app/datatables/rocket_job_mission_control/active_processes_datatable.rb

@@ -1,6 +1,6 @@
 module RocketJobMissionControl
   class ActiveProcessesDatatable
-    delegate :params, :link_to, :job_path, :job_icon, to: :@view
+    delegate :params, :link_to, :job_path, :state_icon, to: :@view
     delegate :h, to: 'ERB::Util'
 
     def initialize(view, processes)
@@ -20,12 +20,12 @@ module RocketJobMissionControl
     private
 
     def data
-      processes.map do |worker_name, job, started_at|
+      processes.map do |h|
         {
-          '0' => worker_name_with_icon(worker_name, job),
-          '1' => job_name_with_link(job),
-          '2' => h(job.description.try(:truncate, 50)),
-          '3' => h(duration(started_at)),
+          '0' => worker_name_with_icon(h[:worker_name]),
+          '1' => job_name_with_link(h[:klass], h[:id]),
+          '2' => h(h[:description].try!(:truncate, 50)),
+          '3' => h(duration(h[:started_at])),
           'DT_RowClass' => "card callout callout-running"
         }
       end
@@ -57,17 +57,17 @@ module RocketJobMissionControl
       Kaminari.paginate_array(records).page(page).per(per_page)
     end
 
-    def worker_name_with_icon(worker_name, job)
+    def worker_name_with_icon(worker_name)
       <<-EOS
-        <i class="fa #{job_icon(job)}" style="font-size: 75%" title="#{job.state}"></i>
+        <i class="fa #{state_icon(:running)}" style="font-size: 75%" title="running"></i>
         #{worker_name}
       EOS
     end
 
-    def job_name_with_link(job)
+    def job_name_with_link(job_class_name, job_id)
       <<-EOS
-        <a href="#{job_path(job.id)}">
-          #{job.class.name}
+        <a href="#{job_path(job_id)}">
+          #{job_class_name}
         </a>
       EOS
     end

data/app/datatables/rocket_job_mission_control/completed_jobs_datatable.rb

@@ -9,13 +9,14 @@ module RocketJobMissionControl
           '1' => h(job.description.try(:truncate, 50)),
           '2' => h(job.duration),
           '3' => h(completed_ago(job)),
+          '4' => action_buttons(job),
           'DT_RowClass' => "card callout callout-#{job.state}"
         }
       end
     end
 
     def sort_column(index)
-      columns = %w[_type description duration completed_at]
+      columns = %w[_type description machine_duration completed_at]
       columns[index.to_i]
     end
 

data/app/datatables/rocket_job_mission_control/interrupted_jobs_datatable.rb

@@ -8,6 +8,7 @@ module RocketJobMissionControl
           '0' => class_with_link(job),
           '1' => h(job.description.try(:truncate, 50)),
           '2' => h(interrupted_ago(job)),
+          '3' => action_buttons(job),
           'DT_RowClass' => "card callout callout-#{job.state}"
         }
       end

data/app/datatables/rocket_job_mission_control/jobs_datatable.rb

@@ -1,6 +1,8 @@
 module RocketJobMissionControl
   class JobsDatatable
-    delegate :params, :link_to, :job_path, :job_icon, to: :@view
+    delegate :params, :link_to, :job_path, :job_icon, :edit_job_path,
+    :abort_job_path, :job_path, :fail_job_path, :run_now_job_path, :pause_job_path,
+    :resume_job_path, :retry_job_path, :job_failures_path, :job_action_link, to: :@view
     delegate :h, to: 'ERB::Util'
 
     def initialize(view, jobs)
@@ -26,6 +28,7 @@ module RocketJobMissionControl
           '1' => h(job.description.try(:truncate, 50)),
           '2' => h(job.created_at),
           '3' => h(job.duration),
+          '4' => action_buttons(job),
           'DT_RowClass' => "card callout callout-#{job.state}"
         }
       end
@@ -49,13 +52,48 @@ module RocketJobMissionControl
 
     def class_with_link(job)
       <<-EOS
-        <a href="#{job_path(job.id)}">
+        <a class='job-link' href="#{job_path(job.id)}">
           <i class="fa #{job_icon(job)}" style="font-size: 75%" title="#{job.state}"></i>
           #{job.class.name}
         </a>
       EOS
     end
 
+    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') }"
+      if job.scheduled?
+        buttons += "#{ job_action_link('Run', run_now_job_path(job), :patch) }"
+      end
+      if events.include?(:abort)
+        buttons += "#{ job_action_link('Abort', abort_job_path(job), :patch) }"
+      end
+      if job.completed? || job.aborted?
+        buttons += "#{ job_action_link('Destroy', job_path(job), :delete) }"
+      end
+      if events.include?(:fail)
+        buttons += "#{ job_action_link('Fail', fail_job_path(job), :patch) }"
+      end
+      if events.include?(:pause)
+        buttons += "#{ job_action_link('Pause', pause_job_path(job), :patch) }"
+      end
+      if events.include?(:resume)
+        buttons += "#{ job_action_link('Resume', resume_job_path(job), :patch) }"
+      end
+      if events.include?(:retry)
+        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') }"
+      end
+      buttons += "</div>"
+    end
+
+    def valid_events(job)
+      job.aasm.events.collect{ |e| e.name }
+    end
+
     def page
       (params[:start].to_i / per_page) + 1
     end
@@ -84,7 +122,6 @@ module RocketJobMissionControl
     def filter_records(records)
       return records unless (params[:search].present? && params[:search][:value].present?)
       conditions = params[:search][:value]
-      ap conditions
       records = RocketJobMissionControl::Jobs::Search.new(conditions, records).execute if conditions
       records
     end

data/app/datatables/rocket_job_mission_control/queued_jobs_datatable.rb

@@ -9,6 +9,7 @@ module RocketJobMissionControl
           '1' => h(job.description.try(:truncate, 50)),
           '2' => h(job.priority),
           '3' => h(job.duration),
+          '4' => action_buttons(job),
           'DT_RowClass' => "card callout callout-#{job.state}"
         }
       end

data/app/datatables/rocket_job_mission_control/running_jobs_datatable.rb

@@ -10,6 +10,7 @@ module RocketJobMissionControl
           '2' => progress(job),
           '3' => h(job.priority),
           '4' => h(started(job)),
+          '5' => action_buttons(job),
           'DT_RowClass' => "card callout callout-#{job.state}"
         }
       end