solid_queue_monitor 0.1.1 → 0.2.0

data/app/services/solid_queue_monitor/failed_job_service.rb

@@ -0,0 +1,97 @@
+module SolidQueueMonitor
+  class FailedJobService
+    def retry_job(failed_execution_id)
+      failed_execution = SolidQueue::FailedExecution.find_by(id: failed_execution_id)
+      return { success: false, message: "Failed job not found" } unless failed_execution
+      
+      job = failed_execution.job
+      return { success: false, message: "Associated job not found" } unless job
+      
+      ActiveRecord::Base.transaction do
+        SolidQueue::ReadyExecution.create!(
+          job_id: job.id,
+          queue_name: get_queue_name(failed_execution, job),
+          priority: job.priority
+        )
+        
+        failed_execution.destroy!
+      end
+      
+      { success: true, message: "Job moved to ready queue for retry" }
+    end
+    
+    def discard_job(failed_execution_id)
+      failed_execution = SolidQueue::FailedExecution.find_by(id: failed_execution_id)
+      return { success: false, message: "Failed job not found" } unless failed_execution
+      
+      job = failed_execution.job
+      return { success: false, message: "Associated job not found" } unless job
+      
+      ActiveRecord::Base.transaction do
+        job.update!(finished_at: Time.current)
+        
+        failed_execution.destroy!
+      end
+      
+      { success: true, message: "Job has been discarded" }
+    end
+    
+    def retry_all(job_ids)
+      return { success: false, message: "No jobs selected" } if job_ids.blank?
+      
+      success_count = 0
+      failed_count = 0
+      
+      job_ids.each do |id|
+        result = retry_job(id)
+        if result[:success]
+          success_count += 1
+        else
+          failed_count += 1
+        end
+      end
+      
+      if success_count > 0 && failed_count == 0
+        { success: true, message: "All selected jobs have been queued for retry" }
+      elsif success_count > 0 && failed_count > 0
+        { success: true, message: "#{success_count} jobs queued for retry, #{failed_count} failed" }
+      else
+        { success: false, message: "Failed to retry jobs" }
+      end
+    end
+    
+    def discard_all(job_ids)
+      return { success: false, message: "No jobs selected" } if job_ids.blank?
+      
+      success_count = 0
+      failed_count = 0
+      
+      job_ids.each do |id|
+        result = discard_job(id)
+        if result[:success]
+          success_count += 1
+        else
+          failed_count += 1
+        end
+      end
+      
+      if success_count > 0 && failed_count == 0
+        { success: true, message: "All selected jobs have been discarded" }
+      elsif success_count > 0 && failed_count > 0
+        { success: true, message: "#{success_count} jobs discarded, #{failed_count} failed" }
+      else
+        { success: false, message: "Failed to discard jobs" }
+      end
+    end
+    
+    private
+    
+    def get_queue_name(failed_execution, job)
+      if failed_execution.respond_to?(:queue_name) && failed_execution.queue_name.present?
+        failed_execution.queue_name
+      else
+        job.queue_name
+      end
+    end
+  end
+end 

data/app/services/solid_queue_monitor/html_generator.rb

@@ -54,7 +54,32 @@ module SolidQueueMonitor
     def render_message
       return '' unless @message
       class_name = @message_type == 'success' ? 'message-success' : 'message-error'
-      "<div class='message #{class_name}'>#{@message}</div>"
+      <<-HTML
+        <div id="flash-message" class="message #{class_name}">#{@message}</div>
+        <script>
+          // Automatically hide the flash message after 5 seconds
+          document.addEventListener('DOMContentLoaded', function() {
+            var flashMessage = document.getElementById('flash-message');
+            if (flashMessage) {
+              setTimeout(function() {
+                flashMessage.style.opacity = '1';
+                // Fade out animation
+                var fadeEffect = setInterval(function() {
+                  if (!flashMessage.style.opacity) {
+                    flashMessage.style.opacity = 1;
+                  }
+                  if (flashMessage.style.opacity > 0) {
+                    flashMessage.style.opacity -= 0.1;
+                  } else {
+                    clearInterval(fadeEffect);
+                    flashMessage.style.display = 'none';
+                  }
+                }, 50);
+              }, 5000); // 5 seconds
+            }
+          });
+        </script>
+      HTML
     end
 
     def generate_header
@@ -64,8 +89,9 @@ module SolidQueueMonitor
           <nav class="navigation">
             <a href="#{root_path}" class="nav-link">Overview</a>
             <a href="#{ready_jobs_path}" class="nav-link">Ready Jobs</a>
-            <a href="#{recurring_jobs_path}" class="nav-link">Recurring Jobs</a>
+            <a href="#{in_progress_jobs_path}" class="nav-link">In Progress Jobs</a>
             <a href="#{scheduled_jobs_path}" class="nav-link">Scheduled Jobs</a>
+            <a href="#{recurring_jobs_path}" class="nav-link">Recurring Jobs</a>
             <a href="#{failed_jobs_path}" class="nav-link">Failed Jobs</a>
             <a href="#{queues_path}" class="nav-link">Queues</a>
           </nav>

data/app/services/solid_queue_monitor/stats_calculator.rb

@@ -7,6 +7,7 @@ module SolidQueueMonitor
         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
       }

data/app/services/solid_queue_monitor/stylesheet_generator.rb

@@ -200,6 +200,7 @@ module SolidQueueMonitor
           padding: 1rem;
           margin-bottom: 1rem;
           border-radius: 0.375rem;
+          transition: opacity 0.5s ease-in-out;
         }
 
         .solid_queue_monitor .message-success {
@@ -318,12 +319,50 @@ module SolidQueueMonitor
         }
       }
 
+      .solid_queue_monitor .filter-and-actions-container {
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+        gap: 1rem;
+        margin-bottom: 1rem;
+      }
+
       .solid_queue_monitor .filter-form-container {
         background: white;
         padding: 1rem;
         border-radius: 0.5rem;
-        margin-bottom: 1rem;
         box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+        flex: 3;
+      }
+
+      .solid_queue_monitor .bulk-actions-container {
+        display: flex;
+        flex-direction: row;
+        gap: 0.75rem;
+        padding: 1rem;
+        background: white;
+        border-radius: 0.5rem;
+        box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+        flex: 2;
+        align-items: center;
+        justify-content: center;
+      }
+
+      .solid_queue_monitor .large-button {
+        padding: 0.75rem 1.25rem;
+        font-size: 0.9rem;
+        text-align: center;
+        flex: 1;
+      }
+
+      @media (max-width: 992px) {
+        .solid_queue_monitor .filter-and-actions-container {
+          flex-direction: column;
+        }
+        
+        .solid_queue_monitor .bulk-actions-container {
+          width: 100%;
+        }
       }
 
       .solid_queue_monitor .filter-form {
@@ -390,6 +429,116 @@ module SolidQueueMonitor
       .solid_queue_monitor .reset-button:hover {
         background: #e5e7eb;
       }
+      
+      /* Action buttons for retry/discard */
+      .solid_queue_monitor .action-button {
+        padding: 0.5rem 1rem;
+        border-radius: 0.375rem;
+        font-size: 0.75rem;
+        font-weight: 500;
+        cursor: pointer;
+        transition: background-color 0.2s;
+        border: none;
+        text-decoration: none;
+      }
+      
+      .solid_queue_monitor .retry-button {
+        background: #3b82f6;
+        color: white;
+      }
+      
+      .solid_queue_monitor .retry-button:hover {
+        background: #2563eb;
+      }
+      
+      .solid_queue_monitor .discard-button {
+        background: #ef4444;
+        color: white;
+      }
+      
+      .solid_queue_monitor .discard-button:hover {
+        background: #dc2626;
+      }
+      
+      .solid_queue_monitor .action-button:disabled {
+        opacity: 0.5;
+        cursor: not-allowed;
+      }
+      
+      .solid_queue_monitor .inline-form {
+        display: inline-block;
+        margin-right: 0.5rem;
+      }
+      
+      .solid_queue_monitor .actions-cell {
+        white-space: nowrap;
+      }
+      
+      .solid_queue_monitor .bulk-actions {
+        display: flex;
+        gap: 0.5rem;
+      }
+      
+      .solid_queue_monitor .error-message {
+        color: #dc2626;
+        font-weight: 500;
+        margin-bottom: 0.25rem;
+      }
+      
+      .solid_queue_monitor .error-backtrace {
+        font-size: 0.75rem;
+        white-space: pre-wrap;
+        max-height: 200px;
+        overflow-y: auto;
+        background: #f3f4f6;
+        padding: 0.5rem;
+        border-radius: 0.25rem;
+        margin-top: 0.5rem;
+      }
+      
+      .solid_queue_monitor details {
+        margin-top: 0.25rem;
+      }
+      
+      .solid_queue_monitor summary {
+        cursor: pointer;
+        color: #6b7280;
+        font-size: 0.75rem;
+      }
+      
+      .solid_queue_monitor summary:hover {
+        color: #4b5563;
+      }
+      
+      .solid_queue_monitor .job-checkbox,
+      .solid_queue_monitor .select-all-checkbox {
+        width: 1rem;
+        height: 1rem;
+      }
+
+      .solid_queue_monitor .bulk-actions-bar {
+        display: flex;
+        gap: 0.75rem;
+        margin: 1rem 0;
+        background: white;
+        padding: 0.75rem;
+        border-radius: 0.5rem;
+        box-shadow: 0 1px 3px rgba(0,0,0,0.1);
+      }
+      
+      .solid_queue_monitor .bulk-actions-bar .action-button {
+        padding: 0.6rem 1rem;
+        font-size: 0.875rem;
+      }
+
+      .solid_queue_monitor .execute-button {
+        background: var(--primary-color);
+        color: white;
+      }
+      
+      .solid_queue_monitor .execute-button:hover {
+        background: #2563eb;
+      }
       CSS
     end
   end

data/config/routes.rb

@@ -1,11 +1,17 @@
 SolidQueueMonitor::Engine.routes.draw do
-  root to: 'monitor#index'
+  root to: 'overview#index', as: :root
   
-  get 'ready_jobs', to: 'monitor#ready_jobs'
-  get 'scheduled_jobs', to: 'monitor#scheduled_jobs'
-  get 'failed_jobs', to: 'monitor#failed_jobs'
-  get 'recurring_jobs', to: 'monitor#recurring_jobs'
-  get 'queues', to: 'monitor#queues'
+  resources :ready_jobs, only: [:index]
+  resources :scheduled_jobs, only: [:index]
+  resources :recurring_jobs, only: [:index]
+  resources :failed_jobs, only: [:index]
+  resources :in_progress_jobs, only: [:index]
+  resources :queues, only: [:index]
   
-  post 'execute_jobs', to: 'monitor#execute_jobs'
+  post 'execute_jobs', to: 'scheduled_jobs#create', as: :execute_jobs
+  
+  post 'retry_failed_job/:id', to: 'failed_jobs#retry', as: :retry_failed_job
+  post 'discard_failed_job/:id', to: 'failed_jobs#discard', as: :discard_failed_job
+  post 'retry_failed_jobs', to: 'failed_jobs#retry_all', as: :retry_failed_jobs
+  post 'discard_failed_jobs', to: 'failed_jobs#discard_all', as: :discard_failed_jobs
 end

data/lib/solid_queue_monitor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidQueueMonitor
-  VERSION = "0.1.1"
-end
+  VERSION = "0.2.0"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: solid_queue_monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Vishal Sadriya
 bindir: exe
 cert_chain: []
-date: 2025-03-15 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -187,9 +187,18 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- 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
 - app/controllers/solid_queue_monitor/monitor_controller.rb
+- app/controllers/solid_queue_monitor/overview_controller.rb
+- app/controllers/solid_queue_monitor/queues_controller.rb
+- 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/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/jobs_presenter.rb
 - app/presenters/solid_queue_monitor/queues_presenter.rb
 - app/presenters/solid_queue_monitor/ready_jobs_presenter.rb
@@ -198,6 +207,7 @@ files:
 - app/presenters/solid_queue_monitor/stats_presenter.rb
 - app/services/solid_queue_monitor/authentication_service.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/stats_calculator.rb