solid_queue_monitor 0.1.1 → 0.2.0

data/app/presenters/solid_queue_monitor/base_presenter.rb

@@ -22,55 +22,37 @@ module SolidQueueMonitor
     def generate_pagination(current_page, total_pages)
       return '' if total_pages <= 1
       
-      links = []
+      html = '<div class="pagination">'
       
       # Previous page link
       if current_page > 1
-        links << "<a href='?page=#{current_page - 1}#{query_params}' class='pagination-link'>&laquo; Previous</a>"
+        html += "<a href=\"?page=#{current_page - 1}#{query_params}\" class=\"pagination-link pagination-nav\">Previous</a>"
       else
-        links << "<span class='pagination-link disabled'>&laquo; Previous</span>"
+        html += '<span class="pagination-link pagination-nav disabled">Previous</span>'
       end
       
-      # Page number links
-      if total_pages <= 7
-        # Show all pages if there are 7 or fewer
-        (1..total_pages).each do |page|
-          links << page_link(page, current_page)
-        end
-      else
-        # Show first page, last page, and pages around current
-        links << page_link(1, current_page)
-        
-        if current_page > 3
-          links << "<span class='pagination-gap'>...</span>"
-        end
-        
-        start_page = [current_page - 1, 2].max
-        end_page = [current_page + 1, total_pages - 1].min
-        
-        (start_page..end_page).each do |page|
-          links << page_link(page, current_page)
-        end
-        
-        if current_page < total_pages - 2
-          links << "<span class='pagination-gap'>...</span>"
+      # Page links
+      visible_pages = calculate_visible_pages(current_page, total_pages)
+      
+      visible_pages.each do |page|
+        if page == :gap
+          html += "<span class=\"pagination-gap\">...</span>"
+        elsif page == current_page
+          html += "<span class=\"pagination-current\">#{page}</span>"
+        else
+          html += "<a href=\"?page=#{page}#{query_params}\" class=\"pagination-link\">#{page}</a>"
         end
-        
-        links << page_link(total_pages, current_page)
       end
       
       # Next page link
       if current_page < total_pages
-        links << "<a href='?page=#{current_page + 1}#{query_params}' class='pagination-link'>Next &raquo;</a>"
+        html += "<a href=\"?page=#{current_page + 1}#{query_params}\" class=\"pagination-link pagination-nav\">Next</a>"
       else
-        links << "<span class='pagination-link disabled'>Next &raquo;</span>"
+        html += '<span class="pagination-link pagination-nav disabled">Next</span>'
       end
       
-      <<-HTML
-        <div class="pagination">
-          #{links.join}
-        </div>
-      HTML
+      html += '</div>'
+      html
     end
 
     def calculate_visible_pages(current_page, total_pages)
@@ -96,12 +78,15 @@ module SolidQueueMonitor
     def format_arguments(arguments)
       return '-' unless arguments.present?
       
-      if arguments.is_a?(Array) && arguments.length == 1 && arguments[0].is_a?(Hash)
-        # Handle ActiveJob-style arguments
-        format_hash(arguments[0])
-      else
-        "<code>#{arguments.to_json}</code>"
+      # For ActiveJob format
+      if arguments.is_a?(Hash) && arguments['arguments'].present?
+        return "<code>#{arguments['arguments'].inspect}</code>"
+      elsif arguments.is_a?(Array) && arguments.length == 1 && arguments[0].is_a?(Hash) && arguments[0]['arguments'].present?
+        return "<code>#{arguments[0]['arguments'].inspect}</code>"
       end
+      
+      # For regular arguments format
+      "<code>#{arguments.inspect}</code>"
     end
 
     def format_hash(hash)
@@ -114,23 +99,47 @@ module SolidQueueMonitor
       "<code>#{formatted}</code>"
     end
 
-    private
+    # Helper method to get the current request path
+    def request_path
+      # Try to get the current path from the controller's request
+      if defined?(controller) && controller.respond_to?(:request)
+        controller.request.path
+      else
+        # Fallback to a default path if we can't get the current path
+        "/solid_queue"
+      end
+    end
 
-    def page_link(page, current_page)
-      if page == current_page
-        "<span class='pagination-current'>#{page}</span>"
+    # Helper method to get the mount point of the engine
+    def engine_mount_point
+      path_parts = request_path.split('/')
+      if path_parts.length >= 3
+        "/#{path_parts[1]}/#{path_parts[2]}"
       else
-        "<a href='?page=#{page}#{query_params}' class='pagination-link'>#{page}</a>"
+        "/solid_queue"
       end
     end
 
+    private
+
     def query_params
       params = []
-      params << "class_name=#{CGI.escape(@filters[:class_name])}" if @filters && @filters[:class_name].present?
-      params << "queue_name=#{CGI.escape(@filters[:queue_name])}" if @filters && @filters[:queue_name].present?
-      params << "status=#{CGI.escape(@filters[:status])}" if @filters && @filters[:status].present?
+      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 << "status=#{@filters[:status]}" if @filters && @filters[:status].present?
       
       params.empty? ? '' : "&#{params.join('&')}"
     end
+
+    # Helper method to get the full path for a route
+    def full_path(route_name, *args)
+      begin
+        # Try to use the engine routes first
+        SolidQueueMonitor::Engine.routes.url_helpers.send(route_name, *args)
+      rescue NoMethodError
+        # Fall back to main app routes
+        Rails.application.routes.url_helpers.send("solid_queue_#{route_name}", *args)
+      end
+    end
   end
 end

data/app/presenters/solid_queue_monitor/failed_jobs_presenter.rb

@@ -1,5 +1,8 @@
 module SolidQueueMonitor
   class FailedJobsPresenter < BasePresenter
+    include Rails.application.routes.url_helpers
+    include SolidQueueMonitor::Engine.routes.url_helpers
+
     def initialize(jobs, current_page: 1, total_pages: 1, filters: {})
       @jobs = jobs
       @current_page = current_page
@@ -16,7 +19,7 @@ module SolidQueueMonitor
     def generate_filter_form
       <<-HTML
         <div class="filter-form-container">
-          <form method="get" action="" class="filter-form">
+          <form method="get" action="#{failed_jobs_path}" class="filter-form">
             <div class="filter-group">
               <label for="class_name">Job Class:</label>
               <input type="text" name="class_name" id="class_name" value="#{@filters[:class_name]}" placeholder="Filter by class name">
@@ -33,38 +36,271 @@ module SolidQueueMonitor
             </div>
           </form>
         </div>
+        
+        <div class="bulk-actions-bar">
+          <button type="button" class="action-button retry-button" id="retry-selected-top" disabled>Retry Selected</button>
+          <button type="button" class="action-button discard-button" id="discard-selected-top" disabled>Discard Selected</button>
+        </div>
       HTML
     end
 
     def generate_table
       <<-HTML
-        <div class="table-container">
-          <table>
-            <thead>
-              <tr>
-                <th>Job</th>
-                <th>Error</th>
-                <th>Failed At</th>
-                <th>Arguments</th>
-              </tr>
-            </thead>
-            <tbody>
-              #{@jobs.map { |execution| generate_row(execution) }.join}
-            </tbody>
-          </table>
-        </div>
+        <form method="post" id="failed-jobs-form">
+          <div class="table-container">
+            <table>
+              <thead>
+                <tr>
+                  <th><input type="checkbox" id="select-all" class="select-all-checkbox"></th>
+                  <th>Job</th>
+                  <th>Queue</th>
+                  <th>Error</th>
+                  <th>Actions</th>
+                </tr>
+              </thead>
+              <tbody>
+                #{@jobs.map { |failed_execution| generate_row(failed_execution) }.join}
+              </tbody>
+            </table>
+          </div>
+        </form>
+        
+        <script>
+          document.addEventListener('DOMContentLoaded', function() {
+            // Handle select all checkboxes
+            const selectAllHeader = document.getElementById('select-all');
+            const checkboxes = document.querySelectorAll('.job-checkbox');
+            const retrySelectedBtn = document.getElementById('retry-selected-top');
+            const discardSelectedBtn = document.getElementById('discard-selected-top');
+            const form = document.getElementById('failed-jobs-form');
+            
+            function updateButtonState() {
+              const checkedBoxes = document.querySelectorAll('.job-checkbox:checked');
+              retrySelectedBtn.disabled = checkedBoxes.length === 0;
+              discardSelectedBtn.disabled = checkedBoxes.length === 0;
+            }
+            
+            function toggleAll(checked) {
+              checkboxes.forEach(checkbox => {
+                checkbox.checked = checked;
+              });
+              selectAllHeader.checked = checked;
+              updateButtonState();
+            }
+            
+            selectAllHeader.addEventListener('change', function() {
+              toggleAll(this.checked);
+            });
+            
+            checkboxes.forEach(checkbox => {
+              checkbox.addEventListener('change', function() {
+                updateButtonState();
+                
+                // Update select all checkboxes if needed
+                const allChecked = document.querySelectorAll('.job-checkbox:checked').length === checkboxes.length;
+                selectAllHeader.checked = allChecked;
+              });
+            });
+            
+            // Handle bulk actions
+            retrySelectedBtn.addEventListener('click', function() {
+              const selectedIds = Array.from(document.querySelectorAll('.job-checkbox:checked')).map(cb => cb.value);
+              if (selectedIds.length === 0) return;
+              
+              if (confirm('Are you sure you want to retry the selected jobs?')) {
+                form.action = '#{retry_failed_jobs_path}';
+                
+                // Add a special flag to indicate this should redirect properly
+                const redirectInput = document.createElement('input');
+                redirectInput.type = 'hidden';
+                redirectInput.name = 'redirect_cleanly';
+                redirectInput.value = 'true';
+                form.appendChild(redirectInput);
+                
+                // Add selected IDs as hidden inputs
+                selectedIds.forEach(id => {
+                  const input = document.createElement('input');
+                  input.type = 'hidden';
+                  input.name = 'job_ids[]';
+                  input.value = id;
+                  form.appendChild(input);
+                });
+                
+                // Submit the form and then replace the URL location immediately after
+                form.submit();
+                
+                // Delay the redirect to give the form time to submit
+                setTimeout(function() {
+                  // Reset to the clean URL without query parameters
+                  window.history.replaceState({}, '', window.location.pathname);
+                }, 100);
+              }
+            });
+            
+            discardSelectedBtn.addEventListener('click', function() {
+              const selectedIds = Array.from(document.querySelectorAll('.job-checkbox:checked')).map(cb => cb.value);
+              if (selectedIds.length === 0) return;
+              
+              if (confirm('Are you sure you want to discard the selected jobs?')) {
+                form.action = '#{discard_failed_jobs_path}';
+                
+                // Add a special flag to indicate this should redirect properly
+                const redirectInput = document.createElement('input');
+                redirectInput.type = 'hidden';
+                redirectInput.name = 'redirect_cleanly';
+                redirectInput.value = 'true';
+                form.appendChild(redirectInput);
+                
+                // Add selected IDs as hidden inputs
+                selectedIds.forEach(id => {
+                  const input = document.createElement('input');
+                  input.type = 'hidden';
+                  input.name = 'job_ids[]';
+                  input.value = id;
+                  form.appendChild(input);
+                });
+                
+                // Submit the form and then replace the URL location immediately after
+                form.submit();
+                
+                // Delay the redirect to give the form time to submit
+                setTimeout(function() {
+                  // Reset to the clean URL without query parameters
+                  window.history.replaceState({}, '', window.location.pathname);
+                }, 100);
+              }
+            });
+            
+            // Initialize button state
+            updateButtonState();
+            
+            // Global function for retry action
+            window.submitRetryForm = function(id) {
+              const form = document.createElement('form');
+              form.method = 'post';
+              form.action = '#{retry_failed_job_path(id: "PLACEHOLDER")}';
+              form.action = form.action.replace('PLACEHOLDER', id);
+              form.style.display = 'none';
+              
+              // Add a special flag to indicate this should redirect properly
+              const redirectInput = document.createElement('input');
+              redirectInput.type = 'hidden';
+              redirectInput.name = 'redirect_cleanly';
+              redirectInput.value = 'true';
+              form.appendChild(redirectInput);
+              
+              document.body.appendChild(form);
+              
+              // Submit the form and then replace the URL location immediately after
+              form.submit();
+              
+              // Delay the redirect to give the form time to submit
+              setTimeout(function() {
+                // Reset to the clean URL without query parameters
+                window.history.replaceState({}, '', window.location.pathname);
+              }, 100);
+            };
+            
+            // Global function for discard action
+            window.submitDiscardForm = function(id) {
+              if (confirm('Are you sure you want to discard this job?')) {
+                const form = document.createElement('form');
+                form.method = 'post';
+                form.action = '#{discard_failed_job_path(id: "PLACEHOLDER")}';
+                form.action = form.action.replace('PLACEHOLDER', id);
+                form.style.display = 'none';
+                
+                // Add a special flag to indicate this should redirect properly
+                const redirectInput = document.createElement('input');
+                redirectInput.type = 'hidden';
+                redirectInput.name = 'redirect_cleanly';
+                redirectInput.value = 'true';
+                form.appendChild(redirectInput);
+                
+                document.body.appendChild(form);
+                
+                // Submit the form and then replace the URL location immediately after
+                form.submit();
+                
+                // Delay the redirect to give the form time to submit
+                setTimeout(function() {
+                  // Reset to the clean URL without query parameters
+                  window.history.replaceState({}, '', window.location.pathname);
+                }, 100);
+              }
+            };
+          });
+        </script>
       HTML
     end
 
-    def generate_row(execution)
+    def generate_row(failed_execution)
+      job = failed_execution.job
+      error = parse_error(failed_execution.error)
+      
       <<-HTML
         <tr>
-          <td>#{execution.job.class_name}</td>
-          <td class="error-message">#{execution.error['message']}</td>
-          <td>#{format_datetime(execution.created_at)}</td>
-          <td>#{format_arguments(execution.job.arguments)}</td>
+          <td><input type="checkbox" class="job-checkbox" value="#{failed_execution.id}"></td>
+          <td>
+            <div class="job-class">#{job.class_name}</div>
+            <div class="job-meta">
+              <span class="job-timestamp">Queued at: #{format_datetime(job.created_at)}</span>
+            </div>
+          </td>
+          <td>
+            <div class="job-queue">#{job.queue_name}</div>
+          </td>
+          <td>
+            <div class="error-message">#{error[:message]}</div>
+            <div class="job-meta">
+              <span class="job-timestamp">Failed at: #{format_datetime(failed_execution.created_at)}</span>
+            </div>
+            <details>
+              <summary>Backtrace</summary>
+              <pre class="error-backtrace">#{error[:backtrace]}</pre>
+            </details>
+          </td>
+          <td class="actions-cell">
+            <div class="job-actions">
+              <a href="javascript:void(0)" 
+                 onclick="submitRetryForm(#{failed_execution.id})" 
+                 class="action-button retry-button">Retry</a>
+              
+              <a href="javascript:void(0)" 
+                 onclick="submitDiscardForm(#{failed_execution.id})" 
+                 class="action-button discard-button">Discard</a>
+            </div>
+          </td>
         </tr>
       HTML
     end
+
+    def parse_error(error)
+      return { message: 'Unknown error', backtrace: '' } unless error
+      
+      if error.is_a?(String)
+        { message: error, backtrace: '' }
+      elsif error.is_a?(Hash)
+        message = error['message'] || error[:message] || 'Unknown error'
+        backtrace = error['backtrace'] || error[:backtrace] || []
+        backtrace = backtrace.join("\n") if backtrace.is_a?(Array)
+        { message: message, backtrace: backtrace }
+      else
+        { message: 'Unknown error format', backtrace: error.to_s }
+      end
+    end
+
+    def get_queue_name(failed_execution, job)
+      # Try to get queue_name from failed_execution if the method exists
+      if failed_execution.respond_to?(:queue_name) && !failed_execution.queue_name.nil?
+        failed_execution.queue_name
+      else
+        # Fall back to job's queue_name
+        job.queue_name
+      end
+    rescue NoMethodError
+      # If there's an error accessing queue_name, fall back to job's queue_name
+      job.queue_name
+    end
   end
 end

data/app/presenters/solid_queue_monitor/in_progress_jobs_presenter.rb

@@ -0,0 +1,71 @@
+module SolidQueueMonitor
+  class InProgressJobsPresenter < BasePresenter
+    include SolidQueueMonitor::Engine.routes.url_helpers
+
+    def initialize(jobs, current_page: 1, total_pages: 1, filters: {})
+      @jobs = jobs
+      @current_page = current_page
+      @total_pages = total_pages
+      @filters = filters
+    end
+
+    def render
+      section_wrapper('In Progress Jobs', generate_filter_form + generate_table + generate_pagination(@current_page, @total_pages))
+    end
+
+    private
+
+    def generate_filter_form
+      <<-HTML
+        <div class="filter-form-container">
+          <form method="get" action="#{in_progress_jobs_path}" class="filter-form">
+            <div class="filter-group">
+              <label for="class_name">Job Class:</label>
+              <input type="text" name="class_name" id="class_name" value="#{@filters[:class_name]}" placeholder="Filter by class name">
+            </div>
+
+            <div class="filter-actions">
+              <button type="submit" class="filter-button">Apply Filters</button>
+              <a href="#{in_progress_jobs_path}" class="reset-button">Reset</a>
+            </div>
+          </form>
+        </div>
+      HTML
+    end
+
+    def generate_table
+      <<-HTML
+        <div class="table-container">
+          <table>
+            <thead>
+              <tr>
+                <th>Job</th>
+                <th>Started At</th>
+                <th>Process ID</th>
+              </tr>
+            </thead>
+            <tbody>
+              #{@jobs.map { |execution| generate_row(execution) }.join}
+            </tbody>
+          </table>
+        </div>
+      HTML
+    end
+
+    def generate_row(execution)
+      job = execution.job
+      <<-HTML
+        <tr>
+          <td>
+            <div class="job-class">#{job.class_name}</div>
+            <div class="job-meta">
+              <span class="job-timestamp">Queued at: #{format_datetime(job.created_at)}</span>
+            </div>
+          </td>
+          <td>#{format_datetime(execution.created_at)}</td>
+          <td>#{execution.process_id}</td>
+        </tr>
+      HTML
+    end
+  end
+end 

data/app/presenters/solid_queue_monitor/jobs_presenter.rb

@@ -70,6 +70,7 @@ module SolidQueueMonitor
                 <th>Queue</th>
                 <th>Status</th>
                 <th>Created At</th>
+                <th>Actions</th>
               </tr>
             </thead>
             <tbody>
@@ -82,15 +83,48 @@ module SolidQueueMonitor
 
     def generate_row(job)
       status = job_status(job)
-      <<-HTML
+
+      # Build the row HTML
+      row_html = <<-HTML
         <tr>
           <td>#{job.id}</td>
           <td>#{job.class_name}</td>
           <td>#{job.queue_name}</td>
           <td><span class='status-badge status-#{status}'>#{status}</span></td>
           <td>#{format_datetime(job.created_at)}</td>
-        </tr>
       HTML
+
+      # Add actions column only for failed jobs
+      if status == 'failed'
+        # Find the failed execution record for this job
+        failed_execution = SolidQueue::FailedExecution.find_by(job_id: job.id)
+
+        if failed_execution
+          row_html += <<-HTML
+            <td class="actions-cell">
+              <div class="job-actions">
+                <form method="post" action="#{retry_failed_job_path(id: failed_execution.id)}" class="inline-form">
+                  <input type="hidden" name="redirect_to" value="#{root_path}">
+                  <button type="submit" class="action-button retry-button">Retry</button>
+                </form>
+
+                <form method="post" action="#{discard_failed_job_path(id: failed_execution.id)}" class="inline-form"
+                      onsubmit="return confirm('Are you sure you want to discard this job?');">
+                  <input type="hidden" name="redirect_to" value="#{root_path}">
+                  <button type="submit" class="action-button discard-button">Discard</button>
+                </form>
+              </div>
+            </td>
+          HTML
+        else
+          row_html += "<td></td>"
+        end
+      else
+        row_html += "<td></td>"
+      end
+
+      row_html += "</tr>"
+      row_html
     end
 
     def job_status(job)

data/app/presenters/solid_queue_monitor/scheduled_jobs_presenter.rb

@@ -37,21 +37,24 @@ module SolidQueueMonitor
             </div>
           </form>
         </div>
+        
+        <div class="bulk-actions-bar">
+          <button type="button" class="action-button execute-button" id="execute-selected-top" disabled>Execute Selected</button>
+        </div>
       HTML
     end
 
     def generate_table_with_actions
       <<-HTML
-      <form action="#{execute_jobs_path}" method="POST">
+      <form id="scheduled-jobs-form" action="#{execute_jobs_path}" method="POST">
         #{generate_table}
-        <div class="table-actions">
-          <button type="submit" class="execute-btn" id="bulk-execute" disabled>Execute Selected</button>
-        </div>
       </form>
       <script>
         document.addEventListener('DOMContentLoaded', function() {
           const selectAllCheckbox = document.querySelector('th input[type="checkbox"]');
           const jobCheckboxes = document.getElementsByName('job_ids[]');
+          const executeButton = document.getElementById('execute-selected-top');
+          const form = document.getElementById('scheduled-jobs-form');
           
           selectAllCheckbox.addEventListener('change', function() {
             jobCheckboxes.forEach(checkbox => checkbox.checked = this.checked);
@@ -64,13 +67,33 @@ module SolidQueueMonitor
               updateExecuteButton();
             });
           });
+          
+          // Add event listener for the execute button
+          executeButton.addEventListener('click', function() {
+            const selectedIds = Array.from(document.querySelectorAll('input[name="job_ids[]"]:checked')).map(cb => cb.value);
+            if (selectedIds.length === 0) return;
+            
+            // Add selected IDs as hidden inputs
+            selectedIds.forEach(id => {
+              const input = document.createElement('input');
+              input.type = 'hidden';
+              input.name = 'job_ids[]';
+              input.value = id;
+              form.appendChild(input);
+            });
+            
+            form.submit();
+          });
+          
+          function updateExecuteButton() {
+            const checkboxes = document.getElementsByName('job_ids[]');
+            const checked = Array.from(checkboxes).some(cb => cb.checked);
+            executeButton.disabled = !checked;
+          }
+          
+          // Initialize button state
+          updateExecuteButton();
         });
-
-        function updateExecuteButton() {
-          const checkboxes = document.getElementsByName('job_ids[]');
-          const checked = Array.from(checkboxes).some(cb => cb.checked);
-          document.getElementById('bulk-execute').disabled = !checked;
-        }
       </script>
       HTML
     end

data/app/presenters/solid_queue_monitor/stats_presenter.rb

@@ -10,12 +10,12 @@ module SolidQueueMonitor
           <h3>Queue Statistics</h3>
           <div class="stats">
             #{generate_stat_card('Total Jobs', @stats[:total_jobs])}
-            #{generate_stat_card('Unique Queues', @stats[:unique_queues])}
             #{generate_stat_card('Ready', @stats[:ready])}
+            #{generate_stat_card('In Progress', @stats[:in_progress])}
             #{generate_stat_card('Scheduled', @stats[:scheduled])}
+            #{generate_stat_card('Recurring', @stats[:recurring])}
             #{generate_stat_card('Failed', @stats[:failed])}
             #{generate_stat_card('Completed', @stats[:completed])}
-            #{generate_stat_card('Recurring', @stats[:recurring])}
           </div>
         </div>
       HTML