Add pending job view template, simplify date range checks, add enqueued and scheduled filter fields, add tests for enqueued and scheduled jobs

Author: jhash

app/controllers/concerns/mission_control/jobs/job_filters.rb

@@ -12,16 +12,18 @@ def set_filters
       @job_filters = {
         job_class_name: params.dig(:filter, :job_class_name).presence,
         queue_name: params.dig(:filter, :queue_name).presence,
-        finished_at: finished_at_range_params
+        finished_at: date_range_params(:finished_at),
+        enqueued_at: date_range_params(:enqueued_at),
+        scheduled_at: date_range_params(:scheduled_at)
       }.compact
     end
 
     def active_filters?
       @job_filters.any?
     end
 
-    def finished_at_range_params
-      range_start, range_end = params.dig(:filter, :finished_at_start), params.dig(:filter, :finished_at_end)
+    def date_range_params(date_type)
+      range_start, range_end = params.dig(:filter, :"#{date_type}_start"), params.dig(:filter, :"#{date_type}_end")
       if range_start || range_end
         (parse_with_time_zone(range_start)..parse_with_time_zone(range_end))
       end

app/views/mission_control/jobs/jobs/_filters.html.erb

@@ -13,14 +13,63 @@
         </div>
 
         <% if jobs_status == "finished" %>
+          <div class="field is-flex is-flex-direction-column is-align-items-flex-start">
+            <label class="has-text-grey is-size-7">
+              Finished from:
+            </label>
+            <div class="select is-rounded">
+              <%= form.datetime_field :finished_at_start, value: @job_filters[:finished_at]&.begin, class: "input", placeholder: "Finished from" %>
+            </div>
+          </div>
+
+          <div class="field is-flex is-flex-direction-column is-align-items-flex-start">
+            <label class="has-text-grey is-size-7">
+              Finished to:
+            </label>
+            <div class="select is-rounded">
+              <%# TODO: add max date of today? %>
+              <%= form.datetime_field :finished_at_end, value: @job_filters[:finished_at]&.end, class: "input", placeholder: "Finished to" %>
+            </div>
+          </div>
+        <% end %>
+
+        <div class="field is-flex is-flex-direction-column is-align-items-flex-start">
+          <label class="has-text-grey is-size-7">
+            Enqueued from:
+          </label>
           <div class="select is-rounded">
-            <%= form.datetime_field :finished_at_start, value: @job_filters[:finished_at]&.begin, class: "input", placeholder: "Finished from" %>
+            <%= form.datetime_field :enqueued_at_start, value: @job_filters[:enqueued_at]&.begin, class: "input", placeholder: "Enqueued from" %>
           </div>
+        </div>
 
+        <div class="field is-flex is-flex-direction-column is-align-items-flex-start">
+          <label class="has-text-grey is-size-7">
+            Enqueued to:
+          </label>
           <div class="select is-rounded">
-            <%= form.datetime_field :finished_at_end, value: @job_filters[:finished_at]&.end, class: "input", placeholder: "Finished to" %>
+            <%# TODO: add max date of today? %>
+            <%= form.datetime_field :enqueued_at_end, value: @job_filters[:enqueued_at]&.end, class: "input", placeholder: "Enqueued to" %>
           </div>
-        <% end %>
+        </div>
+
+        <div class="field is-flex is-flex-direction-column is-align-items-flex-start">
+          <label class="has-text-grey is-size-7">
+            Scheduled from:
+          </label>
+          <div class="select is-rounded">
+            <%= form.datetime_field :scheduled_at_start, value: @job_filters[:scheduled_at]&.begin, class: "input", placeholder: "Scheduled from" %>
+          </div>
+        </div>
+
+        <div class="field is-flex is-flex-direction-column is-align-items-flex-start">
+          <label class="has-text-grey is-size-7">
+            Scheduled to:
+          </label>
+          <div class="select is-rounded">
+            <%# TODO: add max date of today? %>
+            <%= form.datetime_field :scheduled_at_end, value: @job_filters[:scheduled_at]&.end, class: "input", placeholder: "Scheduled to" %>
+          </div>
+        </div>
 
         <%= hidden_field_tag :server_id, MissionControl::Jobs::Current.server.id %>
 

app/views/mission_control/jobs/jobs/pending/_job.html.erb

@@ -0,0 +1,2 @@
+<td><%= link_to job.queue_name, application_queue_path(@application, job.queue) %></td>
+<td><div class="has-text-grey">Ready to run</div></td> 

lib/active_job/jobs_relation.rb

@@ -51,6 +51,9 @@ def initialize(queue_adapter: ActiveJob::Base.queue_adapter, default_page_size:
   # * <tt>:queue_name</tt> - To only include the jobs in the provided queue.
   # * <tt>:worker_id</tt> - To only include the jobs processed by the provided worker.
   # * <tt>:recurring_task_id</tt> - To only include the jobs corresponding to runs of a recurring task.
+  # * <tt>:finished_at</tt> - (Range) To only include the jobs finished between the provided range
+  # * <tt>:scheduled_at</tt> - (Range) To only include the jobs scheduled between the provided range
+  # * <tt>:enqueued_at</tt> - (Range) To only include the jobs enqueued between the provided range
   def where(job_class_name: nil, queue_name: nil, worker_id: nil, recurring_task_id: nil, finished_at: nil, scheduled_at: nil, enqueued_at: nil)
     # Remove nil arguments to avoid overriding parameters when concatenating +where+ clauses
     arguments = { job_class_name: job_class_name,
@@ -60,7 +63,7 @@ def where(job_class_name: nil, queue_name: nil, worker_id: nil, recurring_task_i
       finished_at: finished_at,
       scheduled_at: scheduled_at,
       enqueued_at: enqueued_at
-    }.compact.collect { |key, value| [ key, value.to_s ] }.to_h
+    }.compact
 
     # TODO: is this collect needed? .collect { |key, value| [ key, value.to_s ] }.to_h
 
@@ -271,36 +274,24 @@ def loaded?
 
     # Filtering for not natively supported filters is performed in memory
     def filter(jobs)
-      jobs.filter { |job| satisfy_filter?(job) }
+      jobs.filter { |job| satisfies_filters?(job) }
     end
 
-    def satisfy_date_filter?(filter_value, job_value)
-      return false if job_value.nil?
+    def satisfies_filter?(filter_value, job_value)
+      return filter_value.cover?(job_value) if filter_value.is_a?(Range) # TODO: needed? && job_value.is_a?(ActiveSupport::TimeWithZone)
 
-      # Treat date ranges
-      if filter_value.include?("..")
-        start_date, end_date = filter_value.split("..").map { |date| Time.zone.parse(date) }
-        filter_range = (start_date..end_date)
-        return filter_range.cover?(job_value)
-      end
-
-      filter = Time.zone.parse(filter_value)
-      job_value >= filter
+      filter_value == job_value
     end
 
-    def satisfy_filter?(job)
+    def satisfies_filters?(job)
       filters.all? do |property|
         filter_value = public_send(property)
         job_value = job.public_send(property)
 
-        is_date_filter?(property) ? satisfy_date_filter?(filter_value, job_value) : filter_value == job_value
+        satisfies_filter?(filter_value, job_value)
       end
     end
 
-    def is_date_filter?(property)
-      [ :finished_at, :scheduled_at, :enqueued_at ].include?(property)
-    end
-
     def filters
       @filters ||= FILTERS.select { |property| public_send(property).present? && !queue_adapter.supports_job_filter?(self, property) }
     end

test/controllers/jobs_controller_test.rb

@@ -63,6 +63,48 @@ class MissionControl::Jobs::JobsControllerTest < ActionDispatch::IntegrationTest
     assert_select "tr.job", 1
   end
 
+  test "get pending jobs filtered by enqueued_at date" do
+    job = DummyJob.perform_later(42)
+
+    get mission_control_jobs.application_jobs_url(@application, :pending)
+    assert_response :ok
+    assert_select "tr.job", 1
+
+    get mission_control_jobs.application_jobs_url(@application, :pending, filter: { enqueued_at_start: 1.hour.from_now.to_s })
+    assert_response :ok
+    assert_select "tr.job", 0
+
+    get mission_control_jobs.application_jobs_url(@application, :pending, filter: { enqueued_at_start: 1.hour.ago.to_s, enqueued_at_end: 1.hour.from_now })
+    assert_response :ok
+    assert_select "tr.job", 1
+
+    get mission_control_jobs.application_jobs_url(@application, :pending, filter: { enqueued_at_end: 1.hour.from_now })
+    assert_response :ok
+    assert_select "tr.job", 1
+  end
+
+  test "get scheduled jobs filtered by scheduled_at date" do
+    job = DummyJob.set(wait: 30.minutes).perform_later(42)
+
+    get mission_control_jobs.application_jobs_url(@application, :scheduled)
+    assert_response :ok
+    assert_select "tr.job", 1
+
+    get mission_control_jobs.application_jobs_url(@application, :scheduled, filter: { scheduled_at_start: 1.hour.from_now.to_s })
+    assert_response :ok
+    assert_select "tr.job", 0
+
+    get mission_control_jobs.application_jobs_url(@application, :scheduled, filter: { scheduled_at_start: 15.minutes.from_now.to_s, scheduled_at_end: 45.minutes.from_now })
+    assert_response :ok
+    assert_select "tr.job", 1
+
+    get mission_control_jobs.application_jobs_url(@application, :scheduled, filter: { scheduled_at_end: 45.minutes.from_now })
+    assert_response :ok
+    assert_select "tr.job", 1
+  end
+
+  # TODO: hitting clear on the date input should refresh the list?
+
   test "redirect to queue when job doesn't exist" do
     job = DummyJob.perform_later(42)