Workers filters

app/controllers/mission_control/jobs/workers_controller.rb

@@ -1,5 +1,8 @@
 class MissionControl::Jobs::WorkersController < MissionControl::Jobs::ApplicationController
   before_action :ensure_exposed_workers
+  before_action :set_filters, only: :index
+
+  helper_method :active_filters?, :workers_filter_param
 
   def index
     @workers_page = MissionControl::Jobs::Page.new(workers_relation, page: params[:page].to_i)
@@ -18,6 +21,22 @@ def ensure_exposed_workers
     end
 
     def workers_relation
-      MissionControl::Jobs::Current.server.workers_relation
+      MissionControl::Jobs::Current.server.workers_relation.where(**@worker_filters)
+    end
+
+    def active_filters?
+      @worker_filters.any?
+    end
+
+    def workers_filter_param
+      if @worker_filters&.any?
+        { filter: @worker_filters }
+      else
+        {}
+      end
+    end
+
+    def set_filters
+      @worker_filters = { hostname: params.dig(:filter, :hostname).presence, name: params.dig(:filter, :hostname) }.compact
     end
 end

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

@@ -0,0 +1,24 @@
+<div class="filter level-left">
+  <div class="field is-grouped">
+    <div class="control">
+      <%= form_for :filter, url: application_workers_path(MissionControl::Jobs::Current.application), method: :get,
+        data: { controller: "form", action: "input->form#debouncedSubmit" } do |form| %>
+
+        <div class="select is-rounded">
+          <%= form.text_field :hostname, value: @worker_filters[:hostname], class: "input", list: "job-classes", placeholder: "Filter by hostname..." %>
+        </div>
+
+        <div class="select is-rounded">
+          <%= form.text_field :name, value: @worker_filters[:name], class: "input", list: "job-classes", placeholder: "Filter by name..." %>
+        </div>
+
+        <%= hidden_field_tag :server_id, MissionControl::Jobs::Current.server.id %>
+
+      <% end %>
+    </div>
+
+    <div class="control">
+      <%= link_to "Clear", application_workers_path(MissionControl::Jobs::Current.application, hostname: nil, name: nil), class: "button" %>
+    </div>
+  </div>
+</div>

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

@@ -1,6 +1,17 @@
 <% navigation(title: "Workers", section: :workers)  %>
 
-<%= render "mission_control/jobs/workers/workers_page", workers_page: @workers_page %>
+<% if @workers_page.empty? && !active_filters? %>
+  <%= blank_status_notice "There are no active workers" %>
+<% else %>
+  <div class="level is-flex-wrap-wrap">
+    <%= render "mission_control/jobs/workers/filters" %>
+  </div>
 
-<%= render "mission_control/jobs/shared/pagination_toolbar", page: @workers_page, filter_param: {} %>
+  <% if @workers_page.empty? %>
+    <%= blank_status_notice "No workers found with the given filters" %>
+  <% else %>
+    <%= render "mission_control/jobs/workers/workers_page", workers_page: @workers_page %>
 
+    <%= render "mission_control/jobs/shared/pagination_toolbar", page: @workers_page, filter_param: workers_filter_param %>
+  <% end %>
+<% end %>

lib/active_job/queue_adapters/solid_queue_ext/workers.rb

@@ -4,13 +4,13 @@ def exposes_workers?
   end
 
   def fetch_workers(workers_relation)
-    solid_queue_processes_from_workers_relation(workers_relation).collect do |process|
+    workers(workers_relation).collect do |process|
       worker_from_solid_queue_process(process)
     end
   end
 
   def count_workers(workers_relation)
-    solid_queue_processes_from_workers_relation(workers_relation).count
+    workers(workers_relation).count
   end
 
   def find_worker(worker_id)
@@ -20,8 +20,29 @@ def find_worker(worker_id)
   end
 
   private
-    def solid_queue_processes_from_workers_relation(relation)
-      SolidQueue::Process.where(kind: "Worker").offset(relation.offset_value).limit(relation.limit_value)
+
+    def workers(workers_relation)
+      SolidQueue::Process.where(kind: "Worker")
+        .then { |workers| filter_by_hostname(workers, workers_relation.hostname) }
+        .then { |workers| filter_by_name(workers, workers_relation.name) }
+        .then { |workers| limit(workers, workers_relation.limit_value) }
+        .then { |workers| offset(workers, workers_relation.offset_value) }
+    end
+
+    def filter_by_hostname(workers, hostname)
+      hostname.present? ? workers.where(hostname: hostname) : workers
+    end
+
+    def filter_by_name(workers, name)
+      name.present? ? workers.where(pid: name) : workers
+    end
+
+    def limit(workers, limit)
+      workers.limit(limit)
+    end
+
+    def offset(workers, offset)
+      workers.offset(offset)
     end
 
     def worker_from_solid_queue_process(process)

lib/mission_control/jobs/workers_relation.rb

@@ -10,6 +10,8 @@ class MissionControl::Jobs::WorkersRelation
 
   delegate :last, :[], :to_s, :reverse, to: :to_a
 
+  attr_reader :hostname, :name
+
   ALL_WORKERS_LIMIT = 100_000_000 # When no limit value it defaults to "all workers"
 
   def initialize(queue_adapter:)
@@ -18,6 +20,18 @@ def initialize(queue_adapter:)
     set_defaults
   end
 
+  # Returns a +MissionControl::Jobs::WorkersRelation+ with the configured filtering options.
+  #
+  # === Options
+  # * <tt>:hostname</tt> - To only include the workers of a given hostname.
+  # * <tt>:name</tt> - To only include the workers of a given name.
+  def where(hostname: nil, name: nil)
+    # Remove nil arguments to avoid overriding parameters when concatenating +where+ clauses
+    arguments = { hostname: hostname, name: name }.compact.collect { |key, value| [ key, value.to_s ] }.to_h
+
+    clone_with **arguments
+  end
+
   def offset(offset)
     clone_with offset_value: offset
   end
@@ -51,6 +65,8 @@ def empty?
   alias size count
 
   private
+    attr_writer :hostname, :name
+
     def set_defaults
       self.offset_value = 0
       self.limit_value = ALL_WORKERS_LIMIT