mission_control-jobs 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c261d6b55b908312495212d5f925b3b4150f59a895b185a5667ce0b9754f9f6
-  data.tar.gz: db330e0f62f17e8b3e46f63233b8f7fffe5a126f746b7d83bc3afa94c9e07664
+  metadata.gz: 8ea81c77ce22c040d30fc8246943945d526a85d1999b0cad6120d59b2a8adeda
+  data.tar.gz: c26e71001519a3cb2326b20eff4d634e180d81b9c334cc7a41ca2148ecfa610c
 SHA512:
-  metadata.gz: 670df5d56e857f5f9b230c884447738763379c803be0014933016554277463bcaf9aa74c0e52289cf3c54783f74ed16fc13338637e8d78b70b1bfd82ffa7849c
-  data.tar.gz: cad6605c7296b828d1078ef09def60152267dc3d07196481a51f1b5f49cec70b5a0b0b9b8fcc1add4739d28bf8ad6b38c7a62197111c0c047a5771ce1504cc4a
+  metadata.gz: 611f367a1baab8aa025f761abbd9bf6e10cc60ab9c4475d7487eea37e54d9b95e63bd87999d96a018586d198ee59a1635b237756d17480efc255895cdf144059
+  data.tar.gz: 5b958d96eb931ff86b0fe98ac437a6d1a4c87c2c9cc6363845ad35082317ab2b0de9566ad22e791831d0e2385172659df42ad2db27bac8cc5bc60646d8cc1029

data/README.md

@@ -54,6 +54,8 @@ Besides `base_controller_class`, you can also set the following for `MissionCont
 - `logger`:  the logger you want Mission Control Jobs to use. Defaults to `ActiveSupport::Logger.new(nil)` (no logging). Notice that this is different from Active Job's logger or Active Job's backend's configured logger.
 - `delay_between_bulk_operation_batches`: how long to wait between batches when performing bulk operations, such as _discard all_ or _retry all_ jobs—defaults to `0`
 - `adapters`: a list of adapters that you want Mission Control to use and extend. By default this will be the adapter you have set for `active_job.queue_adapter`.
+- `internal_query_count_limit`: in count queries, the maximum number of records that will be counted if the adapter needs to limit these queries. True counts above this number will be returned as `INFINITY`. This keeps count queries fast—defaults to `500,000`
+- `scheduled_job_delay_threshold`: the time duration before a scheduled job is considered delayed. Defaults to `1.minute` (a job is considered delayed if it hasn't transitioned from the `scheduled` status 1 minute after the scheduled time).
 
 This library extends Active Job with a querying interface and the following setting:
 - `config.active_job.default_page_size`: the internal batch size that Active Job will use when sending queries to the underlying adapter and the batch size for the bulk operations defined above—defaults to `1000`.
@@ -159,7 +161,7 @@ Typing `jobs_help`, you'll get clear instructions about how to switch between ap
 ```
 >> jobs_help
 You can connect to a job server with
-  connect_to <app_id>:<server_id>
+  connect_to "<app_id>:<server_id>"
 
 Available job servers:
   * bc4:resque_ashburn
@@ -185,19 +187,19 @@ ActiveJob.jobs
 ActiveJob.jobs.failed
 
 # All pending jobs in some queue
-ActiveJob.jobs.pending.where(queue: "some_queue")
+ActiveJob.jobs.pending.where(queue_name: "some_queue")
 
 # All failed jobs of a given class
-ActiveJob.jobs.failed.where(job_class: "SomeJob")
+ActiveJob.jobs.failed.where(job_class_name: "SomeJob")
 
 # All pending jobs of a given class with limit and offset
-ActiveJob.jobs.pending.where(job_class: "SomeJob").limit(10).offset(5)
+ActiveJob.jobs.pending.where(job_class_name: "SomeJob").limit(10).offset(5)
 
 # For adapters that support these statuses:
 # All scheduled/in-progress/finished jobs of a given class
-ActiveJob.jobs.scheudled.where(job_class: "SomeJob")
-ActiveJob.jobs.in_progress.where(job_class: "SomeJob")
-ActiveJob.jobs.finished.where(job_class: "SomeJob")
+ActiveJob.jobs.scheduled.where(job_class_name: "SomeJob")
+ActiveJob.jobs.in_progress.where(job_class_name: "SomeJob")
+ActiveJob.jobs.finished.where(job_class_name: "SomeJob")
 
 # For adapters that support filtering by worker:
 # All jobs in progress being run by a given worker
@@ -211,13 +213,13 @@ Some examples of bulk operations:
 ActiveJob.jobs.failed.retry_all
 
 # Retry all the jobs of a given class (only possible for failed jobs)
-ActiveJob.jobs.failed.where(job_class: "SomeJob").retry_all
+ActiveJob.jobs.failed.where(job_class_name: "SomeJob").retry_all
 
 # Discard all failed jobs
 ActiveJob.jobs.failed.discard_all
 
 # Discard all pending jobs of a given class
-ActiveJob.jobs.pending.where(job_class: "SomeJob").discard_all
+ActiveJob.jobs.pending.where(job_class_name: "SomeJob").discard_all
 # Or all pending jobs in a given queue:
 ActiveJob.jobs.pending.where(queue_name: "some-queue").discard_all
 ```

data/app/controllers/concerns/mission_control/jobs/adapter_features.rb

@@ -2,19 +2,23 @@ module MissionControl::Jobs::AdapterFeatures
   extend ActiveSupport::Concern
 
   included do
-    helper_method :supported_job_statuses, :queue_pausing_supported?, :workers_exposed?
+    helper_method :supported_job_statuses, :queue_pausing_supported?, :workers_exposed?, :recurring_tasks_supported?
   end
 
   private
-    def workers_exposed?
-      MissionControl::Jobs::Current.server.queue_adapter.exposes_workers?
-    end
-
     def supported_job_statuses
-      MissionControl::Jobs::Current.server.queue_adapter.supported_statuses & ActiveJob::JobsRelation::STATUSES
+      MissionControl::Jobs::Current.server.queue_adapter.supported_job_statuses & ActiveJob::JobsRelation::STATUSES
     end
 
     def queue_pausing_supported?
       MissionControl::Jobs::Current.server.queue_adapter.supports_queue_pausing?
     end
+
+    def workers_exposed?
+      MissionControl::Jobs::Current.server.queue_adapter.exposes_workers?
+    end
+
+    def recurring_tasks_supported?
+      MissionControl::Jobs::Current.server.queue_adapter.supports_recurring_tasks?
+    end
 end

data/app/controllers/concerns/mission_control/jobs/failed_jobs_bulk_operations.rb

@@ -12,6 +12,6 @@ module MissionControl::Jobs::FailedJobsBulkOperations
     # or causing replication lag in MySQL). This should be enough for most scenarios. For
     # cases where we need to retry a huge sets of jobs, we offer a runbook that uses the API.
     def bulk_limited_filtered_failed_jobs
-      ApplicationJob.jobs.failed.where(**@job_filters).limit(MAX_NUMBER_OF_JOBS_FOR_BULK_OPERATIONS)
+      ActiveJob.jobs.failed.where(**@job_filters).limit(MAX_NUMBER_OF_JOBS_FOR_BULK_OPERATIONS)
     end
 end

data/app/controllers/concerns/mission_control/jobs/not_found_redirections.rb

@@ -7,7 +7,7 @@ module MissionControl::Jobs::NotFoundRedirections
     end
 
     rescue_from(MissionControl::Jobs::Errors::ResourceNotFound) do |error|
-      redirect_to root_url, alert: error.message
+      redirect_to best_location_for_resource_not_found_error(error), alert: error.message
     end
   end
 
@@ -22,4 +22,12 @@ module MissionControl::Jobs::NotFoundRedirections
         root_path
       end
     end
+
+    def best_location_for_resource_not_found_error(error)
+      if error.message.match?(/recurring task/i)
+        application_recurring_tasks_path(@application)
+      else
+        root_url
+      end
+    end
 end

data/app/controllers/concerns/mission_control/jobs/queue_scoped.rb

@@ -7,6 +7,6 @@ module MissionControl::Jobs::QueueScoped
 
   private
     def set_queue
-      @queue = ActiveJob::Base.queues[params[:queue_id]] or raise MissionControl::Jobs::Errors::ResourceNotFound, "Queue '#{params[:queue_id]}' not found"
+      @queue = ActiveJob.queues[params[:queue_id]] or raise MissionControl::Jobs::Errors::ResourceNotFound, "Queue '#{params[:queue_id]}' not found"
     end
 end

data/app/controllers/mission_control/jobs/bulk_discards_controller.rb

@@ -14,7 +14,7 @@ class MissionControl::Jobs::BulkDiscardsController < MissionControl::Jobs::Appli
         bulk_limited_filtered_failed_jobs
       else
         # we don't want to apply any limit since "discarding all" without parameters can be optimized in the adapter as a much faster operation
-        ApplicationJob.jobs.failed
+        ActiveJob.jobs.failed
       end
     end
 end

data/app/controllers/mission_control/jobs/discards_controller.rb

@@ -8,6 +8,6 @@ class MissionControl::Jobs::DiscardsController < MissionControl::Jobs::Applicati
 
   private
     def jobs_relation
-      ApplicationJob.jobs.failed
+      ActiveJob.jobs.failed
     end
 end

data/app/controllers/mission_control/jobs/dispatches_controller.rb

@@ -0,0 +1,13 @@
+class MissionControl::Jobs::DispatchesController < MissionControl::Jobs::ApplicationController
+  include MissionControl::Jobs::JobScoped
+
+  def create
+    @job.dispatch
+    redirect_to application_jobs_url(@application, :blocked), notice: "Dispatched job with id #{@job.job_id}"
+  end
+
+  private
+  def jobs_relation
+    ApplicationJob.jobs.blocked
+  end
+end

data/app/controllers/mission_control/jobs/jobs_controller.rb

@@ -5,7 +5,7 @@ class MissionControl::Jobs::JobsController < MissionControl::Jobs::ApplicationCo
 
   def index
     @job_class_names = jobs_with_status.job_class_names
-    @queue_names = ApplicationJob.queues.map(&:name)
+    @queue_names = ActiveJob.queues.map(&:name)
 
     @jobs_page = MissionControl::Jobs::Page.new(filtered_jobs_with_status, page: params[:page].to_i)
     @jobs_count = @jobs_page.total_count
@@ -24,11 +24,11 @@ class MissionControl::Jobs::JobsController < MissionControl::Jobs::ApplicationCo
     end
 
     def jobs_with_status
-      ApplicationJob.jobs.with_status(jobs_status)
+      ActiveJob.jobs.with_status(jobs_status)
     end
 
     def filtered_jobs
-      ApplicationJob.jobs.where(**@job_filters)
+      ActiveJob.jobs.where(**@job_filters)
     end
 
     helper_method :jobs_status

data/app/controllers/mission_control/jobs/queues_controller.rb

@@ -11,14 +11,14 @@ class MissionControl::Jobs::QueuesController < MissionControl::Jobs::Application
 
   private
     def set_queue
-      @queue = ApplicationJob.queues[params[:id]]
+      @queue = ActiveJob.queues[params[:id]]
     end
 
     def filtered_queues
-      if prefix = ApplicationJob.queue_name_prefix
-        ApplicationJob.queues.select { |queue| queue.name.start_with?(prefix) }
+      if prefix = ActiveJob::Base.queue_name_prefix
+        ActiveJob.queues.select { |queue| queue.name.start_with?(prefix) }
       else
-        ApplicationJob.queues
+        ActiveJob.queues
       end
     end
 end

data/app/controllers/mission_control/jobs/recurring_tasks_controller.rb

@@ -0,0 +1,23 @@
+class MissionControl::Jobs::RecurringTasksController < MissionControl::Jobs::ApplicationController
+  before_action :ensure_supported_recurring_tasks
+  before_action :set_recurring_task, only: :show
+
+  def index
+    @recurring_tasks = MissionControl::Jobs::Current.server.recurring_tasks
+  end
+
+  def show
+    @jobs_page = MissionControl::Jobs::Page.new(@recurring_task.jobs, page: params[:page].to_i)
+  end
+
+  private
+    def ensure_supported_recurring_tasks
+      unless recurring_tasks_supported?
+        redirect_to root_url, alert: "This server doesn't support recurring tasks"
+      end
+    end
+
+    def set_recurring_task
+      @recurring_task = MissionControl::Jobs::Current.server.find_recurring_task(params[:id])
+    end
+end

data/app/controllers/mission_control/jobs/retries_controller.rb

@@ -8,6 +8,6 @@ class MissionControl::Jobs::RetriesController < MissionControl::Jobs::Applicatio
 
   private
     def jobs_relation
-      ApplicationJob.jobs.failed
+      ActiveJob.jobs.failed
     end
 end

data/app/controllers/mission_control/jobs/workers_controller.rb

@@ -2,7 +2,8 @@ class MissionControl::Jobs::WorkersController < MissionControl::Jobs::Applicatio
   before_action :ensure_exposed_workers
 
   def index
-    @workers = MissionControl::Jobs::Current.server.workers.sort_by { |worker| -worker.jobs.count }
+    @workers_page = MissionControl::Jobs::Page.new(workers_relation, page: params[:page].to_i)
+    @workers_count = @workers_page.total_count
   end
 
   def show
@@ -15,4 +16,8 @@ class MissionControl::Jobs::WorkersController < MissionControl::Jobs::Applicatio
         redirect_to root_url, alert: "This server doesn't expose workers"
       end
     end
+
+    def workers_relation
+      MissionControl::Jobs::Current.server.workers_relation
+    end
 end

data/app/helpers/mission_control/jobs/jobs_helper.rb

@@ -18,14 +18,18 @@ module MissionControl::Jobs::JobsHelper
   def attribute_names_for_job_status(status)
     case status.to_s
     when "failed"      then [ "Error", "" ]
-    when "blocked"     then [ "Queue", "Blocked by", "Block expiry" ]
+    when "blocked"     then [ "Queue", "Blocked by", "Block expiry", "" ]
     when "finished"    then [ "Queue", "Finished" ]
-    when "scheduled"   then [ "Queue", "Scheduled" ]
+    when "scheduled"   then [ "Queue", "Scheduled", "" ]
     when "in_progress" then [ "Queue", "Run by", "Running for" ]
     else               []
     end
   end
 
+  def job_delayed?(job)
+    job.scheduled_at.before?(MissionControl::Jobs.scheduled_job_delay_threshold.ago)
+  end
+
   private
     def renderable_job_arguments_for(job)
       job.serialized_arguments.collect do |argument|

data/app/helpers/mission_control/jobs/navigation_helper.rb

@@ -8,6 +8,7 @@ module MissionControl::Jobs::NavigationHelper
       end
 
       sections[:workers] = [ "Workers", application_workers_path(@application) ] if workers_exposed?
+      sections[:recurring_tasks] = [ "Recurring tasks", application_recurring_tasks_path(@application) ] if recurring_tasks_supported?
     end
   end
 
@@ -45,7 +46,7 @@ module MissionControl::Jobs::NavigationHelper
   end
 
   def jobs_count_with_status(status)
-    count = ApplicationJob.jobs.with_status(status).count
+    count = ActiveJob.jobs.with_status(status).count
     count.infinite? ? "..." : number_to_human(count)
   end
 end

data/app/models/mission_control/jobs/page.rb

@@ -1,16 +1,16 @@
 class MissionControl::Jobs::Page
   DEFAULT_PAGE_SIZE = 10
 
-  attr_reader :jobs_relation, :index, :page_size
+  attr_reader :records, :index, :page_size
 
-  def initialize(jobs_relation, page: 1, page_size: DEFAULT_PAGE_SIZE)
-    @jobs_relation = jobs_relation
+  def initialize(relation, page: 1, page_size: DEFAULT_PAGE_SIZE)
+    @relation = relation
     @page_size = page_size
     @index = [ page, 1 ].max
   end
 
-  def jobs
-    jobs_relation.limit(page_size).offset(offset)
+  def records
+    @relation.limit(page_size).offset(offset)
   end
 
   def first?
@@ -18,7 +18,7 @@ class MissionControl::Jobs::Page
   end
 
   def last?
-    index == pages_count || empty? || jobs.empty?
+    index == pages_count || empty? || records.empty?
   end
 
   def empty?
@@ -34,11 +34,11 @@ class MissionControl::Jobs::Page
   end
 
   def pages_count
-    (total_count.to_f / 10).ceil unless total_count.infinite?
+    (total_count.to_f / page_size).ceil unless total_count.infinite?
   end
 
   def total_count
-    @total_count ||= jobs_relation.count # Potentially expensive when filtering and a lot of jobs, with adapter in charge of doing the filtering in memory
+    @total_count ||= @relation.count # Potentially expensive when filtering a lot of records, with the adapter in charge of doing the filtering in memory
   end
 
   private

data/app/models/mission_control/jobs/recurring_task.rb

@@ -0,0 +1,17 @@
+class MissionControl::Jobs::RecurringTask
+  include ActiveModel::Model
+
+  attr_accessor :id, :job_class_name, :arguments, :schedule, :last_enqueued_at
+
+  def initialize(queue_adapter: ActiveJob::Base.queue_adapter, **kwargs)
+    @queue_adapter = queue_adapter
+    super(**kwargs)
+  end
+
+  def jobs
+    ActiveJob::JobsRelation.new(queue_adapter: queue_adapter).where(recurring_task_id: id)
+  end
+
+  private
+    attr_reader :queue_adapter
+end

data/app/views/layouts/mission_control/jobs/_application_selection.html.erb

@@ -1,5 +1,5 @@
 <nav class="navbar" role="navigation" aria-label="main navigation">
-  <div class="navbar-menu is-active">
+  <div class="navbar-menu is-active mb-4">
     <div class="navbar-start">
     </div>
 

data/app/views/mission_control/jobs/jobs/_error_information.html.erb

@@ -1,5 +1,4 @@
 <% if job.failed? %>
-  <a id="error"></a>
   <h2 class="subtitle">Error information</h2>
 
   <table class="table">

data/app/views/mission_control/jobs/jobs/_general_information.html.erb

@@ -10,7 +10,7 @@
   </tr>
   <tr>
     <th>Job id</th>
-    <td><%= job.job_id %>    </td>
+    <td><%= job.job_id %></td>
   </tr>
   <tr>
     <th>Queue</th>

data/app/views/mission_control/jobs/jobs/_jobs_page.html.erb

@@ -1,15 +1,13 @@
 <table class="jobs <%= jobs_status %> table queues is-hoverable is-fullwidth">
-  <tbody>
   <thead>
-  <tr>
-    <th style="width: 35%;">Job</th>
-    <% attribute_names_for_job_status(jobs_status).each do |attribute| %>
-      <th><%= attribute %></th>
-    <% end %>
-  </tr>
+    <tr>
+      <th style="width: 35%;">Job</th>
+      <% attribute_names_for_job_status(jobs_status).each do |attribute| %>
+        <th><%= attribute %></th>
+      <% end %>
+    </tr>
   </thead>
-
-  <%= render partial: "mission_control/jobs/jobs/job", collection: jobs_page.jobs %>
-
+  <tbody>
+    <%= render partial: "mission_control/jobs/jobs/job", collection: jobs_page.records %>
   </tbody>
 </table>

data/app/views/mission_control/jobs/jobs/_title.html.erb

@@ -8,6 +8,9 @@
       <% if job.failed? %>
         <%= render "mission_control/jobs/jobs/failed/actions", job: job %>
       <% end %>
+      <% if job.blocked? %>
+        <%= render "mission_control/jobs/jobs/blocked/actions", job: job %>
+      <% end %>
     </div>
   </div>
 </h1>

data/app/views/mission_control/jobs/jobs/blocked/_actions.html.erb

@@ -0,0 +1,3 @@
+<div class="buttons is-right">
+  <%= button_to "Dispatch", application_job_dispatch_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
+</div>

data/app/views/mission_control/jobs/jobs/blocked/_job.html.erb

@@ -1,3 +1,6 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
 <td><div class="is-family-monospace is-size-7"><%= job.blocked_by %></div></td>
 <td><%= bidirectional_time_distance_in_words_with_title(job.blocked_until) %></td>
+<td class="pr-0">
+  <%= render "mission_control/jobs/jobs/blocked/actions", job: job %>
+</td>

data/app/views/mission_control/jobs/jobs/index.html.erb

@@ -3,7 +3,7 @@
 <% if @jobs_page.empty? && !active_filters? %>
   <%= blank_status_notice "There are no #{jobs_status.dasherize} jobs #{blank_status_emoji(jobs_status)}" %>
 <% else %>
-  <div class="level">
+  <div class="level is-flex-wrap-wrap">
     <%= render "mission_control/jobs/jobs/filters", job_class_names: @job_class_names, queue_names: @queue_names %>
     <%= render "mission_control/jobs/jobs/toolbar", jobs_count: @jobs_count %>
   </div>
@@ -13,7 +13,7 @@
   <% else %>
     <%= render "mission_control/jobs/jobs/jobs_page", jobs_page: @jobs_page %>
 
-    <%= render "mission_control/jobs/shared/pagination_toolbar", jobs_page: @jobs_page %>
+    <%= render "mission_control/jobs/shared/pagination_toolbar", page: @jobs_page, filter_param: jobs_filter_param %>
   <% end %>
 <% end %>
 

data/app/views/mission_control/jobs/jobs/scheduled/_actions.html.erb

@@ -0,0 +1,4 @@
+<div class="buttons is-right">
+  <%= button_to "Discard", application_job_discard_path(@application, job.job_id), class: "button is-danger is-light mr-0",
+    form: { data: { turbo_confirm: "This will delete the job and can't be undone. Are you sure?" } } %>
+</div>

data/app/views/mission_control/jobs/jobs/scheduled/_job.html.erb

@@ -1,7 +1,10 @@
 <td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
 <td>
   <%= bidirectional_time_distance_in_words_with_title(job.scheduled_at) %>
-  <% if job.scheduled_at.before? 1.minute.ago %>
+  <% if job_delayed?(job) %>
     <div class="is-danger tag ml-4">delayed</div>
   <% end %>
 </td>
+<td class="pr-0">
+  <%= render "mission_control/jobs/jobs/scheduled/actions", job: job %>
+</td>

data/app/views/mission_control/jobs/queues/_queue_title.html.erb

@@ -14,4 +14,4 @@
   </div>
 </h1>
 
-<h2 class="subtitle"><%= queue.size %> pending jobs</h2>
+<h2 class="subtitle"><%= pluralize queue.size, "pending job" %></h2>

data/app/views/mission_control/jobs/queues/show.html.erb

@@ -14,12 +14,12 @@
     </tr>
     </thead>
 
-    <%= render partial: "mission_control/jobs/queues/job", collection: @jobs_page.jobs %>
+    <%= render partial: "mission_control/jobs/queues/job", collection: @jobs_page.records %>
 
     </tbody>
   </table>
 
-  <%= render "mission_control/jobs/shared/pagination_toolbar", jobs_page: @jobs_page %>
+  <%= render "mission_control/jobs/shared/pagination_toolbar", page: @jobs_page, filter_param: {} %>
 <% end %>
 
 

data/app/views/mission_control/jobs/recurring_tasks/_general_information.html.erb

@@ -0,0 +1,16 @@
+<table class="table">
+  <tbody>
+  <tr>
+    <th>Job class</th>
+    <td><%= recurring_task.job_class_name %></td>
+  </tr>
+  <tr>
+    <th>Arguments</th>
+    <td><div class="is-family-monospace"><%= recurring_task.arguments.join(",") %></div></td>
+  </tr>
+  <tr>
+    <th>Schedule</th>
+    <td><%= recurring_task.schedule %></td>
+  </tr>
+  </tbody>
+</table>

data/app/views/mission_control/jobs/recurring_tasks/_recurring_task.html.erb

@@ -0,0 +1,14 @@
+<tr class="recurring_task">
+  <td>
+    <%= link_to recurring_task.id, application_recurring_task_path(@application, recurring_task.id) %>
+  </td>
+  <td>
+    <%= link_to recurring_task.job_class_name, application_recurring_task_path(@application, recurring_task.id) %>
+
+    <% if recurring_task.arguments.present? %>
+      <div class="is-family-monospace"><%= recurring_task.arguments.join(",") %></div>
+    <% end %>
+  </td>
+  <td> <%= recurring_task.schedule %> </td>
+  <td><div class="has-text-grey"><%= recurring_task.last_enqueued_at ? bidirectional_time_distance_in_words_with_title(recurring_task.last_enqueued_at) : "Never" %></div></td>
+</tr>

data/app/views/mission_control/jobs/recurring_tasks/_title.html.erb

@@ -0,0 +1,7 @@
+<h1 class="title">
+  <div class="level">
+    <div class="level-left">
+      <%= recurring_task.id %>
+    </div>
+  </div>
+</h1>

data/app/views/mission_control/jobs/recurring_tasks/index.html.erb

@@ -0,0 +1,16 @@
+<% navigation(title: "Recurring tasks", section: :recurring_tasks)  %>
+
+<table class="recurring-tasks table jobs is-hoverable is-fullwidth">
+  <tbody>
+  <thead>
+  <tr>
+    <th></th>
+    <th>Job</th>
+    <th>Schedule</th>
+    <th>Last enqueued at</th>
+  </tr>
+  </thead>
+
+  <%= render partial: "mission_control/jobs/recurring_tasks/recurring_task", collection: @recurring_tasks %>
+  </tbody>
+</table>

data/app/views/mission_control/jobs/recurring_tasks/show.html.erb

@@ -0,0 +1,14 @@
+<% navigation(title: @recurring_task.id, section: :recurring_tasks) %>
+
+<%= render "mission_control/jobs/recurring_tasks/title", recurring_task: @recurring_task %>
+<%= render "mission_control/jobs/recurring_tasks/general_information", recurring_task: @recurring_task %>
+
+<% if @jobs_page.empty? %>
+  <%= blank_status_notice "No jobs found for this recurring task" %>
+<% else %>
+  <h2 class="subtitle"><%= pluralize @recurring_task.jobs.count, "job" %></h2>
+
+  <%= render "mission_control/jobs/shared/jobs", jobs: @jobs_page.records %>
+
+  <%= render "mission_control/jobs/shared/pagination_toolbar", page: @jobs_page, filter_param: jobs_filter_param %>
+<% end %>

data/app/views/mission_control/jobs/{workers → shared}/_job.html.erb

@@ -14,6 +14,13 @@
   </td>
 
   <td>
-    <div class="has-text-grey"><%= job.started_at ? time_distance_in_words_with_title(job.started_at) : "(Finished)" %></div>
+    <div class="has-text-grey">
+      <% if job.started_at %>
+        Running for <%= time_distance_in_words_with_title(job.started_at) %>
+      <% elsif job.finished_at %>
+        Finished <%= time_ago_in_words_with_title(job.finished_at) %> ago
+      <% else %>
+        Pending
+      <% end %>
   </td>
 </tr>

data/app/views/mission_control/jobs/shared/_jobs.html.erb

@@ -0,0 +1,14 @@
+<table class="jobs table is-hoverable is-fullwidth">
+  <tbody>
+  <thead>
+  <tr>
+    <th style="width: 30%;">Job</th>
+    <th></th>
+    <th style="width: 20%;"></th>
+  </tr>
+  </thead>
+
+  <%= render partial: "mission_control/jobs/shared/job", collection: jobs %>
+
+  </tbody>
+</table>

data/app/views/mission_control/jobs/shared/_pagination_toolbar.html.erb

@@ -1,5 +1,5 @@
 <nav class="buttons is-right" role="navigation" aria-label="pagination">
-  <span class="mr-3"><%= jobs_page.index %> / <%= jobs_page.pages_count || "..." %></span>
-  <%= link_to "Previous page", url_for(page: jobs_page.previous_index, **jobs_filter_param), class: "pagination-previous", disabled: jobs_page.first? %>
-  <%= link_to "Next page", url_for(page: jobs_page.next_index, **jobs_filter_param), class: "pagination-next", disabled: jobs_page.last? %>
+  <span class="mr-3"><%= page.index %> / <%= page.pages_count || "..." %></span>
+  <%= link_to "Previous page", url_for(page: page.previous_index, **filter_param), class: "pagination-previous", disabled: page.first? %>
+  <%= link_to "Next page", url_for(page: page.next_index, **filter_param), class: "pagination-next", disabled: page.last? %>
 </nav>