que-view 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 892e7e3d60cac8ff0d076575cb10454e88a2210f537d446bf8af5942f8ba945c
-  data.tar.gz: 92b8d7b993e6d9e6d7c572a144b63a8b00025e4ee9e28096f177f77bc41203f0
+  metadata.gz: ca1165b499081e6a124caf37e168c75bd7e74d79c6cd7d4e6445925b9c32589e
+  data.tar.gz: e844c8f96e9eb7021124bb8e420302629805637fa0af9caef16d1b5aad5b03a1
 SHA512:
-  metadata.gz: 6a67ca26a2c007d69be9bd7a036a726cc129bb083c9dd86671edd5aaa70882130158b2f8d7573574785b7523b3b2c2c06cad25bfb850e8d5d52dda694192e9eb
-  data.tar.gz: 7b9e498a11c818b8f8cb6d67ba1d816d5d3a4387147fb7ae33ca31dfb400fc51d00e974e1ccacb7683aff92da0090bd170909729809cc0255255d82d0f73d120
+  metadata.gz: f0256e1fce181ec2ff9864bbe1e9b90deff9191cd0421415ebf077445683bd23b1f9a2418bfb5f582c4a679c2c0509fe478b644e4f561fbf6f1936be27c5abae
+  data.tar.gz: ca009f6f1c8b8af5bfb9963daef9c32eaead6120b0558eb37542dd5a49845ffe9faeebf97ae6594e5023f171346858c9ed869cc214db56a3ac74979e63456521

data/app/helpers/que/view/application_helper.rb

@@ -15,6 +15,34 @@ module Que
 
         job[:last_error_message].lines.first || ''
       end
+
+      def humanized_job_args(job)
+        case job[:job_class]
+        when 'ActiveJob::QueueAdapters::QueAdapter::JobWrapper' then active_job_args(job)
+        else que_args(job)
+        end.join('<br />').html_safe
+      end
+
+      def humanized_enqueued_at(job)
+        case job[:job_class]
+        when 'ActiveJob::QueueAdapters::QueAdapter::JobWrapper'
+          job.dig(:args, 0, :enqueued_at).to_time.strftime('%Y-%m-%d %H:%M:%S')
+        end
+      end
+
+      private
+
+      def active_job_args(job)
+        job.dig(:args, 0, :arguments)&.map do |arg|
+          next arg.except(:_aj_ruby2_keywords, :_aj_symbol_keys) if arg.is_a?(Hash)
+
+          arg
+        end || []
+      end
+
+      def que_args(job)
+        job[:args].push(job[:kwargs])
+      end
     end
   end
 end

data/app/views/que/view/jobs/index.html.erb

@@ -50,11 +50,7 @@
         <td><%= humanized_job_class(job) %></td>
         <td><%= job[:queue] %></td>
         <td><%= job[:run_at].strftime("%Y-%m-%d %H:%M:%S") %></td>
-        <td>
-          <% Array(job.dig(:args, 0, :arguments)).each do |argument| %>
-            <p><%= argument %></p>
-          <% end %>
-        </td>
+        <td><%= humanized_job_args(job) %></td>
         <% if params[:status] == 'failing' %>
           <td><%= job[:error_count] %></td>
           <td><%= format_error(job) %></td>

data/app/views/que/view/jobs/show.html.erb

@@ -20,7 +20,7 @@
       </tr>
       <tr>
         <th>Enqueued at</th>
-        <td><%= @job.dig(:args, 0, :enqueued_at).to_time.strftime('%Y-%m-%d %H:%M:%S') %></td>
+        <td><%= humanized_enqueued_at(@job) %></td>
       </tr>
       <tr>
         <th>Run at</th>
@@ -33,9 +33,7 @@
       <tr>
         <th>Args</th>
         <td>
-          <% Array(@job.dig(:args, 0, :arguments)).each do |argument| %>
-            <p><%= argument %></p>
-          <% end %>
+          <%= humanized_job_args(@job) %>
         </td>
       </tr>
       <tr>

data/lib/que/view/dsl.rb

@@ -163,10 +163,17 @@ module Que
 
       def fetch_job_names_sql(queue_name)
         <<-SQL.squish
-          SELECT COUNT(*) AS count_all, args #>> '{0, job_class}' AS job_name
+          SELECT COUNT(*) AS count_all,
+            CASE
+              WHEN job_class = 'ActiveJob::QueueAdapters::QueAdapter::JobWrapper' THEN args #>> '{0, job_class}'
+              ELSE job_class
+            END AS job_name
           FROM que_jobs
           #{queue_name.present? ? "WHERE queue = '#{queue_name}'" : ""}
-          GROUP BY args #>> '{0, job_class}'
+          GROUP BY CASE
+            WHEN job_class = 'ActiveJob::QueueAdapters::QueAdapter::JobWrapper' THEN args #>> '{0, job_class}'
+            ELSE job_class
+          END
         SQL
       end
 
@@ -208,7 +215,17 @@ module Que
       def search_condition(params)
         result = ''
         result += "AND queue = '#{params[:queue_name]}'" if params[:queue_name].present?
-        result += "AND args #>> '{0, job_class}' = ('#{params[:job_name]}')" if params[:job_name].present?
+        if params[:job_name].present?
+          result += <<~SQL
+            AND (
+              job_class = '#{params[:job_name]}'
+              OR (
+                job_class = 'ActiveJob::QueueAdapters::QueAdapter::JobWrapper'
+                AND args #>> '{0, job_class}' = '#{params[:job_name]}'
+              )
+            )
+          SQL
+        end
         result
       end
 

data/lib/que/view/version.rb

@@ -2,6 +2,6 @@
 
 module Que
   module View
-    VERSION = '0.4.0'
+    VERSION = '0.4.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-view
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que