From f243b96fd2639d46b392bcda5ed5430237763d95 Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Sun, 10 Nov 2013 10:40:21 -0800
Subject: [PATCH] Rework retries and scheduled index page to use API

---
 lib/sidekiq/web.rb      |  4 ++--
 web/views/retries.erb   | 16 ++++++++--------
 web/views/scheduled.erb | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb
index e69d34e7..2288b4e3 100644
--- a/lib/sidekiq/web.rb
+++ b/lib/sidekiq/web.rb
@@ -73,7 +73,7 @@ module Sidekiq
     get '/retries' do
       @count = (params[:count] || 25).to_i
       (@current_page, @total_size, @retries) = page("retry", params[:page], @count)
-      @retries = @retries.map {|msg, score| [Sidekiq.load_json(msg), score] }
+      @retries = @retries.map {|msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
       erb :retries
     end
 
@@ -125,7 +125,7 @@ module Sidekiq
     get '/scheduled' do
       @count = (params[:count] || 25).to_i
       (@current_page, @total_size, @scheduled) = page("schedule", params[:page], @count)
-      @scheduled = @scheduled.map {|msg, score| [Sidekiq.load_json(msg), score] }
+      @scheduled = @scheduled.map {|msg, score| Sidekiq::SortedEntry.new(nil, score, msg) }
       erb :scheduled
     end
 
diff --git a/web/views/retries.erb b/web/views/retries.erb
index e5f75e26..4370b2e3 100644
--- a/web/views/retries.erb
+++ b/web/views/retries.erb
@@ -25,24 +25,24 @@
           <th><%= t('Error') %></th>
         </tr>
       </thead>
-      <% @retries.each do |msg, score| %>
+      <% @retries.each do |entry| %>
         <tr>
           <td>
-            <input type='checkbox' name='key[]' value='<%= job_params(msg, score) %>' />
+            <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
           </td>
           <td>
-            <a href="<%= root_path %>retries/<%= job_params(msg, score) %>"><%= relative_time(Time.at(score)) %></a>
+            <a href="<%= root_path %>retries/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>
           </td>
-          <td><%= msg['retry_count'] %></td>
+          <td><%= entry['retry_count'] %></td>
           <td>
-            <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
+            <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
           </td>
-          <td><%= msg['class'] %></td>
+          <td><%= entry.klass %></td>
           <td>
-            <div class="args"><%= display_args(msg['args']) %></div>
+            <div class="args"><%= display_args(entry.args) %></div>
           </td>
           <td>
-            <div><%= h truncate("#{msg['error_class']}: #{msg['error_message']}", 200) %></div>
+            <div><%= h truncate("#{entry['error_class']}: #{entry['error_message']}", 200) %></div>
           </td>
         </tr>
       <% end %>
diff --git a/web/views/scheduled.erb b/web/views/scheduled.erb
index 2afb8222..2dd0680a 100644
--- a/web/views/scheduled.erb
+++ b/web/views/scheduled.erb
@@ -24,20 +24,20 @@
           <th><%= t('Arguments') %></th>
         </tr>
       </thead>
-      <% @scheduled.each do |msg, score| %>
+      <% @scheduled.each do |entry| %>
         <tr>
           <td>
-            <input type='checkbox' name='key[]' value='<%= job_params(msg, score) %>' />
+            <input type='checkbox' name='key[]' value='<%= job_params(entry.item, entry.score) %>' />
           </td>
           <td>
-             <a href="<%= root_path %>scheduled/<%= job_params(msg, score) %>"><%= relative_time(Time.at(score)) %></a>
+             <a href="<%= root_path %>scheduled/<%= job_params(entry.item, entry.score) %>"><%= relative_time(entry.at) %></a>
           </td>
           <td>
-            <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
+            <a href="<%= root_path %>queues/<%= entry.queue %>"><%= entry.queue %></a>
           </td>
-          <td><%= msg['class'] %></td>
+          <td><%= entry.klass %></td>
           <td>
-             <div class="args"><%= display_args(msg['args']) %></div>
+             <div class="args"><%= display_args(entry.args) %></div>
           </td>
         </tr>
       <% end %>