solid_queue_monitor 1.0.1 → 1.2.0

data/app/services/solid_queue_monitor/search_service.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+module SolidQueueMonitor
+  class SearchService
+    RESULTS_LIMIT = 25
+
+    def initialize(query)
+      @query = query
+    end
+
+    def search
+      return empty_results if @query.blank?
+
+      term = "%#{sanitize_query(@query)}%"
+
+      {
+        ready: search_ready_jobs(term),
+        scheduled: search_scheduled_jobs(term),
+        failed: search_failed_jobs(term),
+        in_progress: search_in_progress_jobs(term),
+        completed: search_completed_jobs(term),
+        recurring: search_recurring_tasks(term)
+      }
+    end
+
+    private
+
+    def empty_results
+      {
+        ready: [],
+        scheduled: [],
+        failed: [],
+        in_progress: [],
+        completed: [],
+        recurring: []
+      }
+    end
+
+    def sanitize_query(query)
+      # Escape % to prevent LIKE pattern injection
+      # We don't escape _ because it requires database-specific ESCAPE clauses
+      query.to_s.gsub('%', '\%')
+    end
+
+    def search_ready_jobs(term)
+      SolidQueue::ReadyExecution
+        .joins(:job)
+        .where(job_search_conditions, term: term)
+        .includes(:job)
+        .limit(RESULTS_LIMIT)
+    end
+
+    def search_scheduled_jobs(term)
+      SolidQueue::ScheduledExecution
+        .joins(:job)
+        .where(job_search_conditions, term: term)
+        .includes(:job)
+        .limit(RESULTS_LIMIT)
+    end
+
+    def search_failed_jobs(term)
+      SolidQueue::FailedExecution
+        .joins(:job)
+        .where(failed_job_search_conditions, term: term)
+        .includes(:job)
+        .limit(RESULTS_LIMIT)
+    end
+
+    def search_in_progress_jobs(term)
+      SolidQueue::ClaimedExecution
+        .joins(:job)
+        .where(job_search_conditions, term: term)
+        .includes(:job)
+        .limit(RESULTS_LIMIT)
+    end
+
+    def search_completed_jobs(term)
+      SolidQueue::Job
+        .where.not(finished_at: nil)
+        .where(completed_job_search_conditions, term: term)
+        .order(finished_at: :desc)
+        .limit(RESULTS_LIMIT)
+    end
+
+    def search_recurring_tasks(term)
+      SolidQueue::RecurringTask
+        .where(recurring_task_search_conditions, term: term)
+        .limit(RESULTS_LIMIT)
+    end
+
+    def job_search_conditions
+      <<~SQL.squish
+        solid_queue_jobs.class_name LIKE :term
+        OR solid_queue_jobs.queue_name LIKE :term
+        OR solid_queue_jobs.arguments LIKE :term
+        OR solid_queue_jobs.active_job_id LIKE :term
+      SQL
+    end
+
+    def failed_job_search_conditions
+      <<~SQL.squish
+        solid_queue_jobs.class_name LIKE :term
+        OR solid_queue_jobs.queue_name LIKE :term
+        OR solid_queue_jobs.arguments LIKE :term
+        OR solid_queue_jobs.active_job_id LIKE :term
+        OR solid_queue_failed_executions.error LIKE :term
+      SQL
+    end
+
+    def completed_job_search_conditions
+      <<~SQL.squish
+        class_name LIKE :term
+        OR queue_name LIKE :term
+        OR arguments LIKE :term
+        OR active_job_id LIKE :term
+      SQL
+    end
+
+    def recurring_task_search_conditions
+      <<~SQL.squish
+        solid_queue_recurring_tasks.key LIKE :term
+        OR solid_queue_recurring_tasks.class_name LIKE :term
+      SQL
+    end
+  end
+end

data/app/services/solid_queue_monitor/stats_calculator.rb

@@ -3,15 +3,19 @@
 module SolidQueueMonitor
   class StatsCalculator
     def self.calculate
+      scheduled   = SolidQueue::ScheduledExecution.count
+      ready       = SolidQueue::ReadyExecution.count
+      failed      = SolidQueue::FailedExecution.count
+      in_progress = SolidQueue::ClaimedExecution.count
+      recurring   = SolidQueue::RecurringTask.count
+
       {
-        total_jobs: SolidQueue::Job.count,
-        unique_queues: SolidQueue::Job.distinct.count(:queue_name),
-        scheduled: SolidQueue::ScheduledExecution.count,
-        ready: SolidQueue::ReadyExecution.count,
-        failed: SolidQueue::FailedExecution.count,
-        in_progress: SolidQueue::ClaimedExecution.count,
-        completed: SolidQueue::Job.where.not(finished_at: nil).count,
-        recurring: SolidQueue::RecurringTask.count
+        active_jobs: ready + scheduled + in_progress + failed,
+        scheduled: scheduled,
+        ready: ready,
+        failed: failed,
+        in_progress: in_progress,
+        recurring: recurring
       }
     end
   end

data/app/services/solid_queue_monitor/stylesheet_generator.rb

@@ -66,6 +66,16 @@ module SolidQueueMonitor
           margin-bottom: 0.5rem;
         }
 
+        .solid_queue_monitor .header-title-link {
+          color: var(--text-color);
+          text-decoration: none;
+          transition: color 0.2s;
+        }
+
+        .solid_queue_monitor .header-title-link:hover {
+          color: var(--primary-color);
+        }
+
         .solid_queue_monitor .navigation {
           display: flex;
           flex-wrap: wrap;
@@ -195,6 +205,22 @@ module SolidQueueMonitor
           color: var(--text-muted);
         }
 
+        .solid_queue_monitor .sortable-header {
+          color: var(--text-muted);
+          text-decoration: none;
+          cursor: pointer;
+          transition: color 0.2s;
+        }
+
+        .solid_queue_monitor .sortable-header:hover {
+          color: var(--primary-color);
+        }
+
+        .solid_queue_monitor .sortable-header.active {
+          color: var(--primary-color);
+          font-weight: 600;
+        }
+
         .solid_queue_monitor .status-badge {
           display: inline-block;
           padding: 0.25rem 0.5rem;
@@ -1178,6 +1204,98 @@ module SolidQueueMonitor
         gap: 0.75rem;
       }
 
+      /* Header Search Box */
+      .solid_queue_monitor .header-search-form {
+        display: flex;
+        align-items: center;
+        gap: 0;
+        flex: 1;
+        max-width: 400px;
+        margin: 0 1rem;
+      }
+
+      .solid_queue_monitor .header-search-input {
+        flex: 1;
+        padding: 0.5rem 0.75rem;
+        border: 1px solid var(--input-border);
+        border-right: none;
+        border-radius: 0.375rem 0 0 0.375rem;
+        font-size: 0.875rem;
+        background: var(--input-background);
+        color: var(--text-color);
+        outline: none;
+        transition: border-color 0.2s, box-shadow 0.2s;
+      }
+
+      .solid_queue_monitor .header-search-input:focus {
+        border-color: var(--primary-color);
+        box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.1);
+      }
+
+      .solid_queue_monitor .header-search-input::placeholder {
+        color: var(--text-muted);
+      }
+
+      .solid_queue_monitor .header-search-button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 0.5rem 0.75rem;
+        background: var(--primary-color);
+        color: white;
+        border: 1px solid var(--primary-color);
+        border-radius: 0 0.375rem 0.375rem 0;
+        cursor: pointer;
+        transition: background-color 0.2s;
+      }
+
+      .solid_queue_monitor .header-search-button:hover {
+        background: #2563eb;
+        border-color: #2563eb;
+      }
+
+      .solid_queue_monitor .header-search-button svg {
+        width: 16px;
+        height: 16px;
+      }
+
+      @media (max-width: 768px) {
+        .solid_queue_monitor .header-search-form {
+          max-width: 100%;
+          margin: 0.5rem 0;
+          order: 3;
+          width: 100%;
+        }
+      }
+
+      /* Search Results Page */
+      .solid_queue_monitor .results-summary {
+        margin: 1rem 0;
+        padding: 0.75rem 1rem;
+        background: var(--card-background);
+        border-radius: 0.375rem;
+        box-shadow: var(--card-shadow);
+      }
+
+      .solid_queue_monitor .results-summary p {
+        margin: 0;
+        color: var(--text-muted);
+        font-size: 0.875rem;
+      }
+
+      .solid_queue_monitor .search-results-section {
+        margin-top: 1.5rem;
+      }
+
+      .solid_queue_monitor .search-results-section h3 {
+        font-size: 1rem;
+        font-weight: 600;
+        color: var(--text-color);
+        margin-bottom: 0.75rem;
+        padding-bottom: 0.5rem;
+        border-bottom: 1px solid var(--border-color);
+      }
+
       /* Workers Page Styles */
       .solid_queue_monitor .workers-summary {
         display: grid;

data/config/routes.rb

@@ -7,6 +7,7 @@ SolidQueueMonitor::Engine.routes.draw do
   root to: 'overview#index'
 
   get 'chart_data', to: 'overview#chart_data', as: :chart_data
+  get 'search', to: 'search#index', as: :search
 
   resources :ready_jobs, only: [:index]
   resources :scheduled_jobs, only: [:index]

data/lib/generators/solid_queue_monitor/templates/initializer.rb

@@ -20,4 +20,7 @@ SolidQueueMonitor.setup do |config|
 
   # Auto-refresh interval in seconds (default: 30)
   # config.auto_refresh_interval = 30
+
+  # Disable the chart on the overview page to skip chart queries entirely.
+  # config.show_chart = true
 end

data/lib/solid_queue_monitor/version.rb

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

data/lib/solid_queue_monitor.rb

@@ -7,7 +7,7 @@ module SolidQueueMonitor
   class Error < StandardError; end
   class << self
     attr_accessor :username, :password, :jobs_per_page, :authentication_enabled,
-                  :auto_refresh_enabled, :auto_refresh_interval
+                  :auto_refresh_enabled, :auto_refresh_interval, :show_chart
   end
 
   @username = 'admin'
@@ -16,6 +16,7 @@ module SolidQueueMonitor
   @authentication_enabled = false
   @auto_refresh_enabled = true
   @auto_refresh_interval = 30 # seconds
+  @show_chart = true
 
   def self.setup
     yield self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solid_queue_monitor
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Vishal Sadriya
@@ -58,6 +58,7 @@ files:
 - app/controllers/solid_queue_monitor/ready_jobs_controller.rb
 - app/controllers/solid_queue_monitor/recurring_jobs_controller.rb
 - 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
@@ -69,6 +70,7 @@ files:
 - 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/services/solid_queue_monitor/authentication_service.rb
@@ -80,6 +82,7 @@ files:
 - 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
@@ -116,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Simple monitoring interface for Solid Queue
 test_files: []