solid_queue_monitor 1.2.2 → 2.0.0

data/app/views/solid_queue_monitor/shared/_jobs_table.html.erb

@@ -0,0 +1,20 @@
+<div class="table-container">
+  <table>
+    <thead>
+      <tr>
+        <% columns.each do |column| %>
+          <% if column[:sort_key] %>
+            <%= sortable_header(column[:sort_key], column[:label], sort: sort, filters: filters) %>
+          <% else %>
+            <th><%= column[:label] %></th>
+          <% end %>
+        <% end %>
+      </tr>
+    </thead>
+    <tbody>
+      <% jobs.each do |job| %>
+        <%= render row_partial, job: job %>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/app/views/solid_queue_monitor/shared/_pagination.html.erb

@@ -0,0 +1,25 @@
+<% if total_pages > 1 %>
+  <div class="pagination">
+    <% if current_page > 1 %>
+      <%= link_to 'Previous', pagination_href(current_page - 1), class: 'pagination-link pagination-nav' %>
+    <% else %>
+      <span class="pagination-link pagination-nav disabled">Previous</span>
+    <% end %>
+
+    <% visible_pages(current_page, total_pages).each do |page| %>
+      <% if page == :gap %>
+        <span class="pagination-gap">...</span>
+      <% elsif page == current_page %>
+        <span class="pagination-current"><%= page %></span>
+      <% else %>
+        <%= link_to page, pagination_href(page), class: 'pagination-link' %>
+      <% end %>
+    <% end %>
+
+    <% if current_page < total_pages %>
+      <%= link_to 'Next', pagination_href(current_page + 1), class: 'pagination-link pagination-nav' %>
+    <% else %>
+      <span class="pagination-link pagination-nav disabled">Next</span>
+    <% end %>
+  </div>
+<% end %>

data/app/views/solid_queue_monitor/workers/_row.html.erb

@@ -0,0 +1,22 @@
+<% status = worker_status(job) %>
+<tr class="<%= worker_row_class(job) %>">
+  <td><%= worker_kind_badge(job.kind) %></td>
+  <td><%= worker_hostname(job) %></td>
+  <td><code><%= job.pid %></code></td>
+  <td><%= worker_queues(job) %></td>
+  <td><%= worker_heartbeat(job.last_heartbeat_at) %></td>
+  <td><%= worker_status_badge(status) %></td>
+  <td><%= worker_jobs_processing(job, claimed_counts: @claimed_counts, claimed_jobs: @claimed_jobs) %></td>
+  <td class="actions-cell">
+    <% if status == :dead %>
+      <form action="<%= remove_worker_path(id: job.id) %>"
+            method="post"
+            class="inline-form"
+            data-confirm="Remove this dead process from the registry?">
+        <button type="submit" class="action-button discard-button" title="Remove dead process">Remove</button>
+      </form>
+    <% else %>
+      <span class="action-placeholder">-</span>
+    <% end %>
+  </td>
+</tr>

data/app/views/solid_queue_monitor/workers/index.html.erb

@@ -0,0 +1,82 @@
+<% content_for :title, 'Workers' %>
+
+<div class="workers-summary">
+  <div class="summary-card">
+    <span class="summary-label">Total Processes</span>
+    <span class="summary-value"><%= @summary[:total] %></span>
+  </div>
+  <div class="summary-card summary-healthy">
+    <span class="summary-label">Healthy</span>
+    <span class="summary-value"><%= @summary[:healthy] %></span>
+  </div>
+  <div class="summary-card summary-stale">
+    <span class="summary-label">Stale</span>
+    <span class="summary-value"><%= @summary[:stale] %></span>
+  </div>
+  <div class="summary-card summary-dead">
+    <span class="summary-label">Dead</span>
+    <span class="summary-value"><%= @summary[:dead] %></span>
+    <% if @summary[:dead].positive? %>
+      <% suffix = @summary[:dead] > 1 ? 'es' : '' %>
+      <a href="#"
+         class="summary-action"
+         data-confirm-submit="prune-all-form"
+         data-confirm="Remove all <%= @summary[:dead] %> dead process<%= suffix %>? This will clean up processes that have stopped sending heartbeats.">
+        Prune all
+      </a>
+      <form id="prune-all-form" action="<%= prune_workers_path %>" method="post" class="is-hidden"></form>
+    <% end %>
+  </div>
+</div>
+
+<div class="filter-form-container">
+  <%= form_with url: workers_path, method: :get, local: true, html: { class: 'filter-form' } do |form| %>
+    <div class="filter-group">
+      <%= form.label :kind, 'Kind:' %>
+      <%= form.select :kind,
+                      options_for_select([['All', ''], %w[Worker Worker], %w[Dispatcher Dispatcher], %w[Scheduler Scheduler]], @filters[:kind]) %>
+    </div>
+    <div class="filter-group">
+      <%= form.label :hostname, 'Hostname:' %>
+      <%= form.text_field :hostname, value: @filters[:hostname], placeholder: 'Filter by hostname' %>
+    </div>
+    <div class="filter-group">
+      <%= form.label :status, 'Status:' %>
+      <%= form.select :status,
+                      options_for_select([['All', ''], %w[Healthy healthy], %w[Stale stale], %w[Dead dead]], @filters[:status]) %>
+    </div>
+    <div class="filter-actions">
+      <%= form.submit 'Apply Filters', class: 'filter-button' %>
+      <%= link_to 'Reset', workers_path, class: 'reset-button' %>
+    </div>
+  <% end %>
+</div>
+
+<% if @process_records.empty? %>
+  <div class="empty-state">
+    <p>No worker processes found.</p>
+    <p class="empty-state-hint">Workers will appear here when Solid Queue processes are running.</p>
+  </div>
+<% else %>
+  <% columns = [
+    { sort_key: nil, label: 'Kind' },
+    { sort_key: :hostname, label: 'Hostname' },
+    { sort_key: nil, label: 'PID' },
+    { sort_key: nil, label: 'Queues' },
+    { sort_key: :last_heartbeat_at, label: 'Last Heartbeat' },
+    { sort_key: nil, label: 'Status' },
+    { sort_key: nil, label: 'Jobs Processing' },
+    { sort_key: nil, label: 'Actions' }
+  ] %>
+
+  <%= render 'solid_queue_monitor/shared/jobs_table',
+             jobs: @process_records,
+             columns: columns,
+             sort: @sort,
+             filters: @filters,
+             row_partial: 'solid_queue_monitor/workers/row' %>
+<% end %>
+
+<%= render 'solid_queue_monitor/shared/pagination',
+           current_page: @processes[:current_page],
+           total_pages: @processes[:total_pages] %>

data/config/routes.rb

@@ -15,7 +15,7 @@ SolidQueueMonitor::Engine.routes.draw do
   resources :failed_jobs, only: [:index]
   resources :in_progress_jobs, only: [:index]
   resources :queues, only: [:index]
-  get 'queues/:queue_name', to: 'queues#show', as: :queue_details, constraints: { queue_name: /[^\/]+/ }
+  get 'queues/:queue_name', to: 'queues#show', as: :queue_details, constraints: { queue_name: %r{[^/]+} }
   resources :workers, only: [:index]
   resources :jobs, only: [:show]
 
@@ -33,4 +33,9 @@ SolidQueueMonitor::Engine.routes.draw do
 
   post 'remove_worker/:id', to: 'workers#remove', as: :remove_worker
   post 'prune_workers', to: 'workers#prune', as: :prune_workers
+
+  get 'assets/:file',
+      to: 'assets#show',
+      as: :asset,
+      constraints: { file: /[A-Za-z0-9_\-]+-[a-f0-9]+\.(css|js)/ }
 end

data/lib/solid_queue_monitor/engine.rb

@@ -5,9 +5,11 @@ module SolidQueueMonitor
     isolate_namespace SolidQueueMonitor
 
     config.autoload_paths << root.join('app', 'services')
+    config.autoload_paths << root.join('app', 'helpers')
 
     # Optional: Add eager loading for production
     config.eager_load_paths << root.join('app', 'services')
+    config.eager_load_paths << root.join('app', 'helpers')
 
     # Ensure session middleware is available
     initializer 'solid_queue_monitor.middleware' do |app|

data/lib/solid_queue_monitor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidQueueMonitor
-  VERSION = '1.2.2'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solid_queue_monitor
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Vishal Sadriya
@@ -48,7 +48,10 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/solid_queue_monitor/application.js
+- app/assets/stylesheets/solid_queue_monitor/application.css
 - app/controllers/solid_queue_monitor/application_controller.rb
+- app/controllers/solid_queue_monitor/assets_controller.rb
 - app/controllers/solid_queue_monitor/base_controller.rb
 - app/controllers/solid_queue_monitor/failed_jobs_controller.rb
 - app/controllers/solid_queue_monitor/in_progress_jobs_controller.rb
@@ -60,32 +63,69 @@ files:
 - app/controllers/solid_queue_monitor/scheduled_jobs_controller.rb
 - app/controllers/solid_queue_monitor/search_controller.rb
 - app/controllers/solid_queue_monitor/workers_controller.rb
-- app/presenters/solid_queue_monitor/base_presenter.rb
-- app/presenters/solid_queue_monitor/failed_jobs_presenter.rb
-- app/presenters/solid_queue_monitor/in_progress_jobs_presenter.rb
-- app/presenters/solid_queue_monitor/job_details_presenter.rb
-- app/presenters/solid_queue_monitor/jobs_presenter.rb
-- app/presenters/solid_queue_monitor/queue_details_presenter.rb
-- app/presenters/solid_queue_monitor/queues_presenter.rb
-- app/presenters/solid_queue_monitor/ready_jobs_presenter.rb
-- app/presenters/solid_queue_monitor/recurring_jobs_presenter.rb
-- app/presenters/solid_queue_monitor/scheduled_jobs_presenter.rb
-- app/presenters/solid_queue_monitor/search_results_presenter.rb
-- app/presenters/solid_queue_monitor/stats_presenter.rb
-- app/presenters/solid_queue_monitor/workers_presenter.rb
+- app/helpers/solid_queue_monitor/application_helper.rb
+- app/helpers/solid_queue_monitor/chart_helper.rb
+- app/helpers/solid_queue_monitor/job_details_helper.rb
+- app/helpers/solid_queue_monitor/jobs_helper.rb
+- app/helpers/solid_queue_monitor/pagination_helper.rb
+- app/helpers/solid_queue_monitor/sort_helper.rb
+- app/helpers/solid_queue_monitor/workers_helper.rb
+- app/services/solid_queue_monitor/asset_cache.rb
 - app/services/solid_queue_monitor/authentication_service.rb
 - app/services/solid_queue_monitor/chart_data_service.rb
-- app/services/solid_queue_monitor/chart_presenter.rb
 - app/services/solid_queue_monitor/execute_job_service.rb
 - app/services/solid_queue_monitor/failed_job_service.rb
-- app/services/solid_queue_monitor/html_generator.rb
 - app/services/solid_queue_monitor/pagination_service.rb
 - app/services/solid_queue_monitor/queue_pause_service.rb
 - app/services/solid_queue_monitor/reject_job_service.rb
 - app/services/solid_queue_monitor/search_service.rb
 - app/services/solid_queue_monitor/stats_calculator.rb
 - app/services/solid_queue_monitor/status_calculator.rb
-- app/services/solid_queue_monitor/stylesheet_generator.rb
+- app/views/layouts/solid_queue_monitor/application.html.erb
+- app/views/solid_queue_monitor/failed_jobs/_row.html.erb
+- app/views/solid_queue_monitor/failed_jobs/index.html.erb
+- app/views/solid_queue_monitor/in_progress_jobs/_row.html.erb
+- app/views/solid_queue_monitor/in_progress_jobs/index.html.erb
+- app/views/solid_queue_monitor/jobs/_arguments.html.erb
+- app/views/solid_queue_monitor/jobs/_error.html.erb
+- app/views/solid_queue_monitor/jobs/_execution_history.html.erb
+- app/views/solid_queue_monitor/jobs/_header.html.erb
+- app/views/solid_queue_monitor/jobs/_metadata.html.erb
+- app/views/solid_queue_monitor/jobs/_raw_data.html.erb
+- app/views/solid_queue_monitor/jobs/_timeline.html.erb
+- app/views/solid_queue_monitor/jobs/_timing.html.erb
+- app/views/solid_queue_monitor/jobs/_worker.html.erb
+- app/views/solid_queue_monitor/jobs/show.html.erb
+- app/views/solid_queue_monitor/overview/_chart.html.erb
+- app/views/solid_queue_monitor/overview/_recent_job_row.html.erb
+- app/views/solid_queue_monitor/overview/_recent_jobs.html.erb
+- app/views/solid_queue_monitor/overview/_stat_card.html.erb
+- app/views/solid_queue_monitor/overview/_stats.html.erb
+- app/views/solid_queue_monitor/overview/index.html.erb
+- app/views/solid_queue_monitor/queues/_job_row.html.erb
+- app/views/solid_queue_monitor/queues/_row.html.erb
+- app/views/solid_queue_monitor/queues/index.html.erb
+- app/views/solid_queue_monitor/queues/show.html.erb
+- app/views/solid_queue_monitor/ready_jobs/_row.html.erb
+- app/views/solid_queue_monitor/ready_jobs/index.html.erb
+- app/views/solid_queue_monitor/recurring_jobs/_row.html.erb
+- app/views/solid_queue_monitor/recurring_jobs/index.html.erb
+- app/views/solid_queue_monitor/scheduled_jobs/_row.html.erb
+- app/views/solid_queue_monitor/scheduled_jobs/index.html.erb
+- app/views/solid_queue_monitor/search/_completed_row.html.erb
+- app/views/solid_queue_monitor/search/_failed_row.html.erb
+- app/views/solid_queue_monitor/search/_job_row.html.erb
+- app/views/solid_queue_monitor/search/_recurring_row.html.erb
+- app/views/solid_queue_monitor/search/_section.html.erb
+- app/views/solid_queue_monitor/search/index.html.erb
+- app/views/solid_queue_monitor/shared/_filters.html.erb
+- app/views/solid_queue_monitor/shared/_flash.html.erb
+- app/views/solid_queue_monitor/shared/_footer.html.erb
+- app/views/solid_queue_monitor/shared/_header.html.erb
+- app/views/solid_queue_monitor/shared/_jobs_table.html.erb
+- app/views/solid_queue_monitor/shared/_pagination.html.erb
+- app/views/solid_queue_monitor/workers/_row.html.erb
+- app/views/solid_queue_monitor/workers/index.html.erb
 - config/database.yml
 - config/initializers/solid_queue_monitor.rb
 - config/routes.rb

data/app/presenters/solid_queue_monitor/base_presenter.rb

@@ -1,211 +0,0 @@
-# frozen_string_literal: true
-
-module SolidQueueMonitor
-  class BasePresenter
-    include ActionView::Helpers::DateHelper
-    include ActionView::Helpers::TextHelper
-    include Rails.application.routes.url_helpers
-    include SolidQueueMonitor::Engine.routes.url_helpers
-
-    def default_url_options
-      { only_path: true }
-    end
-
-    def section_wrapper(_title, content)
-      <<-HTML
-        <div class="section-wrapper">
-          <div class="section">
-            #{content}
-          </div>
-        </div>
-      HTML
-    end
-
-    def generate_pagination(current_page, total_pages)
-      return '' if total_pages <= 1
-
-      html = '<div class="pagination">'
-
-      # Previous page link
-      html += if current_page > 1
-                "<a href=\"?page=#{current_page - 1}#{query_params}\" class=\"pagination-link pagination-nav\">Previous</a>"
-              else
-                '<span class="pagination-link pagination-nav disabled">Previous</span>'
-              end
-
-      # Page links
-      visible_pages = calculate_visible_pages(current_page, total_pages)
-
-      visible_pages.each do |page|
-        html += if page == :gap
-                  '<span class="pagination-gap">...</span>'
-                elsif page == current_page
-                  "<span class=\"pagination-current\">#{page}</span>"
-                else
-                  "<a href=\"?page=#{page}#{query_params}\" class=\"pagination-link\">#{page}</a>"
-                end
-      end
-
-      # Next page link
-      html += if current_page < total_pages
-                "<a href=\"?page=#{current_page + 1}#{query_params}\" class=\"pagination-link pagination-nav\">Next</a>"
-              else
-                '<span class="pagination-link pagination-nav disabled">Next</span>'
-              end
-
-      html += '</div>'
-      html
-    end
-
-    def calculate_visible_pages(current_page, total_pages)
-      if total_pages <= 7
-        (1..total_pages).to_a
-      else
-        case current_page
-        when 1..3
-          [1, 2, 3, 4, :gap, total_pages]
-        when (total_pages - 2)..total_pages
-          [1, :gap, total_pages - 3, total_pages - 2, total_pages - 1, total_pages]
-        else
-          [1, :gap, current_page - 1, current_page, current_page + 1, :gap, total_pages]
-        end
-      end
-    end
-
-    def format_datetime(datetime)
-      return '-' unless datetime
-
-      datetime.strftime('%Y-%m-%d %H:%M:%S')
-    end
-
-    def format_arguments(arguments)
-      return '-' if arguments.blank?
-
-      # Extract and format the arguments more cleanly
-      formatted_args = if arguments.is_a?(Hash) && arguments['arguments'].present?
-                         format_job_arguments(arguments)
-                       elsif arguments.is_a?(Array) && arguments.length == 1 && arguments[0].is_a?(Hash) && arguments[0]['arguments'].present?
-                         format_job_arguments(arguments[0])
-                       else
-                         arguments.inspect
-                       end
-
-      if formatted_args.length <= 50
-        "<code class='args-single-line'>#{formatted_args}</code>"
-      else
-        <<-HTML
-          <div class="args-container">
-            <code class="args-content">#{formatted_args}</code>
-          </div>
-        HTML
-      end
-    end
-
-    def format_hash(hash)
-      return '-' if hash.blank?
-
-      formatted = hash.map do |key, value|
-        "<strong>#{key}:</strong> #{value.to_s.truncate(50)}"
-      end.join(', ')
-
-      "<code>#{formatted}</code>"
-    end
-
-    def queue_link(queue_name, css_class: nil)
-      return '-' if queue_name.blank?
-
-      classes = ['queue-link', css_class].compact.join(' ')
-      "<a href=\"#{queue_details_path(queue_name: queue_name)}\" class=\"#{classes}\">#{queue_name}</a>"
-    end
-
-    def sortable_header(column, label)
-      return "<th>#{label}</th>" unless @sort
-
-      column_str = column.to_s
-      is_active = @sort[:sort_by] == column_str
-      next_direction = is_active && @sort[:sort_direction] == 'asc' ? 'desc' : 'asc'
-      arrow = sort_arrow(is_active)
-      css_class = is_active ? 'sortable-header active' : 'sortable-header'
-
-      "<th><a href=\"?sort_by=#{column}&sort_direction=#{next_direction}#{filter_query_string}\" class=\"#{css_class}\">#{label}#{arrow}</a></th>"
-    end
-
-    def sort_arrow(is_active)
-      return ' &udarr;' unless is_active
-
-      @sort[:sort_direction] == 'asc' ? ' &uarr;' : ' &darr;'
-    end
-
-    def filter_query_string
-      params = []
-      params << "class_name=#{@filters[:class_name]}" if @filters && @filters[:class_name].present?
-      params << "queue_name=#{@filters[:queue_name]}" if @filters && @filters[:queue_name].present?
-      params << "arguments=#{@filters[:arguments]}" if @filters && @filters[:arguments].present?
-      params << "status=#{@filters[:status]}" if @filters && @filters[:status].present?
-
-      params.empty? ? '' : "&#{params.join('&')}"
-    end
-
-    def request_path
-      if defined?(controller) && controller.respond_to?(:request)
-        controller.request.path
-      else
-        '/solid_queue'
-      end
-    end
-
-    def engine_mount_point
-      path_parts = request_path.split('/')
-      if path_parts.length >= 3
-        "/#{path_parts[1]}/#{path_parts[2]}"
-      else
-        '/solid_queue'
-      end
-    end
-
-    private
-
-    def query_params
-      params = build_filter_params + build_sort_params
-      params.empty? ? '' : "&#{params.join('&')}"
-    end
-
-    def build_filter_params
-      return [] unless @filters
-
-      filter_keys = %i[class_name queue_name status]
-      filter_keys.filter_map do |key|
-        "#{key}=#{@filters[key]}" if @filters[key].present?
-      end
-    end
-
-    def build_sort_params
-      return [] unless @sort
-
-      sort_keys = %i[sort_by sort_direction]
-      sort_keys.filter_map do |key|
-        "#{key}=#{@sort[key]}" if @sort[key].present?
-      end
-    end
-
-    def full_path(route_name, *args)
-      SolidQueueMonitor::Engine.routes.url_helpers.send(route_name, *args)
-    rescue NoMethodError
-      Rails.application.routes.url_helpers.send("solid_queue_#{route_name}", *args)
-    end
-
-    def format_job_arguments(job_data)
-      args = if job_data['arguments'].is_a?(Array)
-               if job_data['arguments'].first.is_a?(Hash) && job_data['arguments'].first['_aj_ruby2_keywords'].present?
-                 job_data['arguments'].first.except('_aj_ruby2_keywords')
-               else
-                 job_data['arguments']
-               end
-             else
-               job_data['arguments']
-             end
-
-      args.inspect
-    end
-  end
-end