solid_queue_monitor 0.2.0 → 0.3.0

data/app/presenters/solid_queue_monitor/base_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidQueueMonitor
   class BasePresenter
     include ActionView::Helpers::DateHelper
@@ -9,7 +11,7 @@ module SolidQueueMonitor
       { only_path: true }
     end
 
-    def section_wrapper(title, content)
+    def section_wrapper(_title, content)
       <<-HTML
         <div class="section-wrapper">
           <div class="section">
@@ -21,36 +23,36 @@ module SolidQueueMonitor
 
     def generate_pagination(current_page, total_pages)
       return '' if total_pages <= 1
-      
+
       html = '<div class="pagination">'
-      
+
       # Previous page link
-      if current_page > 1
-        html += "<a href=\"?page=#{current_page - 1}#{query_params}\" class=\"pagination-link pagination-nav\">Previous</a>"
-      else
-        html += '<span class="pagination-link pagination-nav disabled">Previous</span>'
-      end
-      
+      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|
-        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
+        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
-      if current_page < total_pages
-        html += "<a href=\"?page=#{current_page + 1}#{query_params}\" class=\"pagination-link pagination-nav\">Next</a>"
-      else
-        html += '<span class="pagination-link pagination-nav disabled">Next</span>'
-      end
-      
+      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
@@ -72,30 +74,31 @@ module SolidQueueMonitor
 
     def format_datetime(datetime)
       return '-' unless datetime
+
       datetime.strftime('%Y-%m-%d %H:%M:%S')
     end
 
     def format_arguments(arguments)
-      return '-' unless arguments.present?
-      
+      return '-' if arguments.blank?
+
       # 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)
-      return '-' unless hash.present?
-      
+      return '-' if hash.blank?
+
       formatted = hash.map do |key, value|
         "<strong>#{key}:</strong> #{value.to_s.truncate(50)}"
       end.join(', ')
-      
+
       "<code>#{formatted}</code>"
     end
 
@@ -106,7 +109,7 @@ module SolidQueueMonitor
         controller.request.path
       else
         # Fallback to a default path if we can't get the current path
-        "/solid_queue"
+        '/solid_queue'
       end
     end
 
@@ -116,7 +119,7 @@ module SolidQueueMonitor
       if path_parts.length >= 3
         "/#{path_parts[1]}/#{path_parts[2]}"
       else
-        "/solid_queue"
+        '/solid_queue'
       end
     end
 
@@ -127,19 +130,17 @@ module SolidQueueMonitor
       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
+      # 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,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidQueueMonitor
   class FailedJobsPresenter < BasePresenter
     include Rails.application.routes.url_helpers
@@ -11,7 +13,8 @@ module SolidQueueMonitor
     end
 
     def render
-      section_wrapper('Failed Jobs', generate_filter_form + generate_table + generate_pagination(@current_page, @total_pages))
+      section_wrapper('Failed Jobs',
+                      generate_filter_form + generate_table + generate_pagination(@current_page, @total_pages))
     end
 
     private
@@ -30,13 +33,18 @@ module SolidQueueMonitor
               <input type="text" name="queue_name" id="queue_name" value="#{@filters[:queue_name]}" placeholder="Filter by queue">
             </div>
 
+            <div class="filter-group">
+              <label for="arguments">Arguments:</label>
+              <input type="text" name="arguments" id="arguments" value="#{@filters[:arguments]}" placeholder="Filter by arguments">
+            </div>
+
             <div class="filter-actions">
               <button type="submit" class="filter-button">Apply Filters</button>
               <a href="#{failed_jobs_path}" class="reset-button">Reset</a>
             </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>
@@ -55,6 +63,7 @@ module SolidQueueMonitor
                   <th>Job</th>
                   <th>Queue</th>
                   <th>Error</th>
+                  <th>Arguments</th>
                   <th>Actions</th>
                 </tr>
               </thead>
@@ -64,7 +73,7 @@ module SolidQueueMonitor
             </table>
           </div>
         </form>
-        
+
         <script>
           document.addEventListener('DOMContentLoaded', function() {
             // Handle select all checkboxes
@@ -73,13 +82,13 @@ module SolidQueueMonitor
             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;
@@ -87,36 +96,36 @@ module SolidQueueMonitor
               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');
@@ -125,10 +134,10 @@ module SolidQueueMonitor
                   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
@@ -136,21 +145,21 @@ module SolidQueueMonitor
                 }, 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');
@@ -159,10 +168,10 @@ module SolidQueueMonitor
                   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
@@ -170,58 +179,58 @@ module SolidQueueMonitor
                 }, 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 = '#{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 = '#{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
@@ -237,7 +246,7 @@ module SolidQueueMonitor
     def generate_row(failed_execution)
       job = failed_execution.job
       error = parse_error(failed_execution.error)
-      
+
       <<-HTML
         <tr>
           <td><input type="checkbox" class="job-checkbox" value="#{failed_execution.id}"></td>
@@ -260,14 +269,15 @@ module SolidQueueMonitor
               <pre class="error-backtrace">#{error[:backtrace]}</pre>
             </details>
           </td>
+          <td>#{format_arguments(job.arguments)}</td>
           <td class="actions-cell">
             <div class="job-actions">
-              <a href="javascript:void(0)" 
-                 onclick="submitRetryForm(#{failed_execution.id})" 
+              <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})" 
+        #{'      '}
+              <a href="javascript:void(0)"#{' '}
+                 onclick="submitDiscardForm(#{failed_execution.id})"#{' '}
                  class="action-button discard-button">Discard</a>
             </div>
           </td>
@@ -277,7 +287,7 @@ module SolidQueueMonitor
 
     def parse_error(error)
       return { message: 'Unknown error', backtrace: '' } unless error
-      
+
       if error.is_a?(String)
         { message: error, backtrace: '' }
       elsif error.is_a?(Hash)
@@ -303,4 +313,4 @@ module SolidQueueMonitor
       job.queue_name
     end
   end
-end
+end

data/app/presenters/solid_queue_monitor/in_progress_jobs_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidQueueMonitor
   class InProgressJobsPresenter < BasePresenter
     include SolidQueueMonitor::Engine.routes.url_helpers
@@ -10,7 +12,8 @@ module SolidQueueMonitor
     end
 
     def render
-      section_wrapper('In Progress Jobs', generate_filter_form + generate_table + generate_pagination(@current_page, @total_pages))
+      section_wrapper('In Progress Jobs',
+                      generate_filter_form + generate_table + generate_pagination(@current_page, @total_pages))
     end
 
     private
@@ -24,6 +27,11 @@ module SolidQueueMonitor
               <input type="text" name="class_name" id="class_name" value="#{@filters[:class_name]}" placeholder="Filter by class name">
             </div>
 
+            <div class="filter-group">
+              <label for="arguments">Arguments:</label>
+              <input type="text" name="arguments" id="arguments" value="#{@filters[:arguments]}" placeholder="Filter by arguments">
+            </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>
@@ -40,6 +48,8 @@ module SolidQueueMonitor
             <thead>
               <tr>
                 <th>Job</th>
+                <th>Queue</th>
+                <th>Arguments</th>
                 <th>Started At</th>
                 <th>Process ID</th>
               </tr>
@@ -62,10 +72,11 @@ module SolidQueueMonitor
               <span class="job-timestamp">Queued at: #{format_datetime(job.created_at)}</span>
             </div>
           </td>
+          <td>#{format_arguments(job.arguments)}</td>
           <td>#{format_datetime(execution.created_at)}</td>
           <td>#{execution.process_id}</td>
         </tr>
       HTML
     end
   end
-end 
+end

data/app/presenters/solid_queue_monitor/jobs_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidQueueMonitor
   class JobsPresenter < BasePresenter
     include Rails.application.routes.url_helpers
@@ -39,6 +41,11 @@ module SolidQueueMonitor
               <input type="text" name="queue_name" id="queue_name" value="#{@filters[:queue_name]}" placeholder="Filter by queue">
             </div>
 
+            <div class="filter-group">
+              <label for="arguments">Arguments:</label>
+              <input type="text" name="arguments" id="arguments" value="#{@filters[:arguments]}" placeholder="Filter by arguments">
+            </div>
+
             <div class="filter-group">
               <label for="status">Status:</label>
               <select name="status" id="status">
@@ -68,6 +75,7 @@ module SolidQueueMonitor
                 <th>ID</th>
                 <th>Job</th>
                 <th>Queue</th>
+                <th>Arguments</th>
                 <th>Status</th>
                 <th>Created At</th>
                 <th>Actions</th>
@@ -90,6 +98,7 @@ module SolidQueueMonitor
           <td>#{job.id}</td>
           <td>#{job.class_name}</td>
           <td>#{job.queue_name}</td>
+          <td>#{format_arguments(job.arguments)}</td>
           <td><span class='status-badge status-#{status}'>#{status}</span></td>
           <td>#{format_datetime(job.created_at)}</td>
       HTML
@@ -99,8 +108,8 @@ module SolidQueueMonitor
         # Find the failed execution record for this job
         failed_execution = SolidQueue::FailedExecution.find_by(job_id: job.id)
 
-        if failed_execution
-          row_html += <<-HTML
+        row_html += if failed_execution
+                      <<-HTML
             <td class="actions-cell">
               <div class="job-actions">
                 <form method="post" action="#{retry_failed_job_path(id: failed_execution.id)}" class="inline-form">
@@ -115,15 +124,15 @@ module SolidQueueMonitor
                 </form>
               </div>
             </td>
-          HTML
-        else
-          row_html += "<td></td>"
-        end
+                      HTML
+                    else
+                      '<td></td>'
+                    end
       else
-        row_html += "<td></td>"
+        row_html += '<td></td>'
       end
 
-      row_html += "</tr>"
+      row_html += '</tr>'
       row_html
     end
 
@@ -131,4 +140,4 @@ module SolidQueueMonitor
       SolidQueueMonitor::StatusCalculator.new(job).calculate
     end
   end
-end
+end

data/app/presenters/solid_queue_monitor/queues_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidQueueMonitor
   class QueuesPresenter < BasePresenter
     def initialize(records)
@@ -43,8 +45,6 @@ module SolidQueueMonitor
       HTML
     end
 
-    private
-
     def ready_jobs_count(queue_name)
       SolidQueue::ReadyExecution.where(queue_name: queue_name).count
     end
@@ -55,8 +55,8 @@ module SolidQueueMonitor
 
     def failed_jobs_count(queue_name)
       SolidQueue::FailedExecution.joins(:job)
-                                .where(solid_queue_jobs: { queue_name: queue_name })
-                                .count
+                                 .where(solid_queue_jobs: { queue_name: queue_name })
+                                 .count
     end
   end
-end
+end

data/app/presenters/solid_queue_monitor/ready_jobs_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidQueueMonitor
   class ReadyJobsPresenter < BasePresenter
     def initialize(jobs, current_page: 1, total_pages: 1, filters: {})
@@ -8,7 +10,8 @@ module SolidQueueMonitor
     end
 
     def render
-      section_wrapper('Ready Jobs', generate_filter_form + generate_table + generate_pagination(@current_page, @total_pages))
+      section_wrapper('Ready Jobs',
+                      generate_filter_form + generate_table + generate_pagination(@current_page, @total_pages))
     end
 
     private
@@ -27,6 +30,11 @@ module SolidQueueMonitor
               <input type="text" name="queue_name" id="queue_name" value="#{@filters[:queue_name]}" placeholder="Filter by queue">
             </div>
 
+            <div class="filter-group">
+              <label for="arguments">Arguments:</label>
+              <input type="text" name="arguments" id="arguments" value="#{@filters[:arguments]}" placeholder="Filter by arguments">
+            </div>
+
             <div class="filter-actions">
               <button type="submit" class="filter-button">Apply Filters</button>
               <a href="#{ready_jobs_path}" class="reset-button">Reset</a>
@@ -69,4 +77,4 @@ module SolidQueueMonitor
       HTML
     end
   end
-end
+end

data/app/presenters/solid_queue_monitor/recurring_jobs_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidQueueMonitor
   class RecurringJobsPresenter < BasePresenter
     include Rails.application.routes.url_helpers
@@ -11,7 +13,8 @@ module SolidQueueMonitor
     end
 
     def render
-      section_wrapper('Recurring Jobs', generate_filter_form + generate_table + generate_pagination(@current_page, @total_pages))
+      section_wrapper('Recurring Jobs',
+                      generate_filter_form + generate_table + generate_pagination(@current_page, @total_pages))
     end
 
     private
@@ -74,4 +77,4 @@ module SolidQueueMonitor
       HTML
     end
   end
-end
+end