que-view 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 062e48206fe33c45a7f007d831b31a5c4566d6eb4af6891cfad6949108f45b56
-  data.tar.gz: c3c2fd233567554fc46e7296a9895d7e8c7b650789fcb1fb7f49d2d023cc3670
+  metadata.gz: 400d426a326e2b110d222bf0967aebf7e840792eac85ec042e168d7bbc799076
+  data.tar.gz: 95cb96f2f354fd8de4396303c708e021e5d59747b6561fee1e784893715ee067
 SHA512:
-  metadata.gz: 3a4b0f0e2bac21033c9e3db5a8ea193b599679e88abb064f7a07b71608893e861e192196d2b688f70c8f9cf5c092d48b40925bfa190d1760172965ac8c319149
-  data.tar.gz: 3db157d3fb95fa530c43607ac9c7924b9ca84cbc305f134ae08635048d77c0213e71401770e4e8c30bbffbfc414c4f233d17bd5896ce2b661b12d464f1914c93
+  metadata.gz: 868c9ee5340519e84c3568d37e022ed183dd3b6a076dbf6b1af13bc7a7e84c3a8666db1e233d07c67b4ecc6c3597928aea29241faf7341140917350fd66be171
+  data.tar.gz: 0ad50bd97f46a30c0106e8613089b22c064c731954abfd2276afdf3c5105bbffb819386c4a9940c007277295ed0eb3ee737e675a94c8213749249d7df2183ed2

data/README.md

@@ -45,7 +45,7 @@ end
 Add this line to config/routes.rb
 
 ```ruby
-mount Que::Web::Engine => '/que_web'
+mount Que::View::Engine => '/que_view'
 ```
 
 Add this line to assets/config/manifest.js

data/app/controllers/que/view/queue_metrics_controller.rb

@@ -19,7 +19,7 @@ module Que
         @queue_latencies =
           ::Que::View
             .fetch_queue_latencies(@queue_metrics.keys)
-            .transform_values { |value| current_time - value.to_time.to_i }
+            .transform_values { |value| value ? (current_time - value.to_time.to_i) : 0 }
       end
     end
   end

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

@@ -51,7 +51,7 @@
         <td><%= job[:queue] %></td>
         <td><%= job[:run_at].strftime("%Y-%m-%d %H:%M:%S") %></td>
         <td>
-          <% job.dig(:args, 0, :arguments).each do |argument| %>
+          <% Array(job.dig(:args, 0, :arguments)).each do |argument| %>
             <p><%= argument %></p>
           <% end %>
         </td>

data/lib/que/view/dsl.rb

@@ -94,7 +94,7 @@ module Que
         <<-SQL.squish
           SELECT count(*) AS total,
                  count(locks.job_id) AS running,
-                 coalesce(sum((error_count > 0 AND locks.job_id IS NULL)::int), 0) AS failing,
+                 coalesce(sum((error_count > 0 AND locks.job_id IS NULL AND expired_at IS NULL)::int), 0) AS failing,
                  coalesce(sum((error_count = 0 AND locks.job_id IS NULL)::int), 0) AS scheduled,
                  coalesce(sum((finished_at IS NOT NULL)::int), 0) AS finished,
                  coalesce(sum((expired_at IS NOT NULL)::int), 0) AS expired
@@ -120,7 +120,7 @@ module Que
             CASE
             WHEN expired_at IS NOT NULL THEN 'expired'
             WHEN finished_at IS NOT NULL THEN 'finished'
-            WHEN locks.job_id IS NULL AND error_count > 0 THEN 'failing'
+            WHEN locks.job_id IS NULL AND error_count > 0 AND expired_at IS NULL THEN 'failing'
             WHEN locks.job_id IS NULL AND error_count = 0 THEN 'scheduled'
             ELSE 'running'
             END status
@@ -134,7 +134,7 @@ module Que
             CASE
             WHEN expired_at IS NOT NULL THEN 'expired'
             WHEN finished_at IS NOT NULL THEN 'finished'
-            WHEN locks.job_id IS NULL AND error_count > 0 THEN 'failing'
+            WHEN locks.job_id IS NULL AND error_count > 0 AND expired_at IS NULL THEN 'failing'
             WHEN locks.job_id IS NULL AND error_count = 0 THEN 'scheduled'
             ELSE 'running'
             END
@@ -174,6 +174,7 @@ module Que
         where_condition = <<-SQL.squish
           WHERE locks.job_id IS NULL
             AND error_count > 0
+            AND expired_at IS NULL
             #{search_condition(params)}
         SQL
         fetch_jobs_sql(per_page, offset, where_condition)

data/lib/que/view/version.rb

@@ -2,6 +2,6 @@
 
 module Que
   module View
-    VERSION = '0.3.3'
+    VERSION = '0.3.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que-view
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: que