sidekiq 7.3.9 → 8.0.0.beta1

data/web/views/_job_info.erb

@@ -1,105 +1,107 @@
-<div class="header-container">
-  <h3><%= t('Job') %></h3>
-</div>
+<section>
+  <header>
+    <h1><%= t('Job') %></h1>
+  </header>
 
-<div class="table_container">
-  <table class="table table-bordered table-striped table-hover">
-    <tbody>
-      <tr>
-        <th><%= t('Queue') %></th>
-        <td>
-          <a href="<%= root_path %>queues/<%= job.queue %>"><%= job.queue %></a>
-        </td>
-      </tr>
-      <tr>
-        <th><%= t('Job') %></th>
-        <td>
-          <%= job.display_class %>
-          <%= display_tags(job) %>
-        </td>
-      </tr>
-      <tr>
-        <th><%= t('Arguments') %></th>
-        <td>
-          <code class="code-wrap">
-            <!-- We don't want to truncate any job arguments when viewing a single job's status page -->
-            <div class="args-extended"><%= display_args(job.display_args, nil) %></div>
-          </code>
-        </td>
-      </tr>
-      <tr>
-        <th>JID</th>
-        <td>
-          <code><%= job.jid %></code>
-        </td>
-      </tr>
-      <% if job.bid %>
-      <tr>
-        <th>BID</th>
-        <td>
-          <a href="<%= root_path %>batches/<%= job.bid %>"><%= job.bid %></a>
-        </td>
-      </tr>
-      <% end %>
-      <tr>
-        <th><%= t('CreatedAt') %></th>
-        <td><%= relative_time(job.created_at) %></td>
-      </tr>
-      <tr>
-        <th><%= t('Enqueued') %></th>
-        <td><%= (enqueued_at = job.enqueued_at) ? relative_time(enqueued_at) : t('NotYetEnqueued') %></td>
-      </tr>
-      <% unless retry_extra_items(job).empty? %>
+  <div class="table_container">
+    <table>
+      <tbody>
         <tr>
-          <th><%= t('Extras') %></th>
+          <th><%= t('Queue') %></th>
           <td>
-            <code>
-              <%= retry_extra_items(job).inspect %>
+            <a href="<%= root_path %>queues/<%= job.queue %>"><%= job.queue %></a>
+          </td>
+        </tr>
+        <tr>
+          <th><%= t('Job') %></th>
+          <td>
+            <%= job.display_class %>
+            <%= display_tags(job) %>
+          </td>
+        </tr>
+        <tr>
+          <th><%= t('Arguments') %></th>
+          <td>
+            <code class="code-wrap">
+              <!-- We don't want to truncate any job arguments when viewing a single job's status page -->
+              <div class="args-extended"><%= display_args(job.display_args, nil) %></div>
             </code>
           </td>
         </tr>
-      <% end %>
-      <% if type == :retry %>
-        <% if job['retry_count'] && job['retry_count'] > 0 %>
+        <tr>
+          <th>JID</th>
+          <td>
+            <code><%= job.jid %></code>
+          </td>
+        </tr>
+        <% if job.bid %>
+        <tr>
+          <th>BID</th>
+          <td>
+            <a href="<%= root_path %>batches/<%= job.bid %>"><%= job.bid %></a>
+          </td>
+        </tr>
+        <% end %>
+        <tr>
+          <th><%= t('CreatedAt') %></th>
+          <td><%= relative_time(job.created_at) %></td>
+        </tr>
+        <tr>
+          <th><%= t('Enqueued') %></th>
+          <td><%= (enqueued_at = job.enqueued_at) ? relative_time(enqueued_at) : t('NotYetEnqueued') %></td>
+        </tr>
+        <% unless retry_extra_items(job).empty? %>
           <tr>
-            <th><%= t('RetryCount') %></th>
-            <td><%= job['retry_count'] %></td>
+            <th><%= t('Extras') %></th>
+            <td>
+              <code>
+                <%= retry_extra_items(job).inspect %>
+              </code>
+            </td>
           </tr>
+        <% end %>
+        <% if type == :retry %>
+          <% if job['retry_count'] && job['retry_count'] > 0 %>
+            <tr>
+              <th><%= t('RetryCount') %></th>
+              <td><%= job['retry_count'] %></td>
+            </tr>
+            <tr>
+              <th><%= t('LastRetry') %></th>
+              <td><%= relative_time(Time.at(job['retried_at'])) %></td>
+            </tr>
+          <% else %>
+            <tr>
+              <th><%= t('OriginallyFailed') %></th>
+              <td><%= relative_time(Time.at(job['failed_at'])) %></td>
+            </tr>
+          <% end %>
           <tr>
-            <th><%= t('LastRetry') %></th>
-            <td><%= relative_time(Time.at(job['retried_at'])) %></td>
+            <th><%= t('NextRetry') %></th>
+            <td><%= relative_time(job.at) %></td>
           </tr>
-        <% else %>
+        <% end %>
+        <% if type == :scheduled %>
           <tr>
-            <th><%= t('OriginallyFailed') %></th>
-            <td><%= relative_time(Time.at(job['failed_at'])) %></td>
+            <th><%= t('Scheduled') %></th>
+            <td><%= relative_time(job.at) %></td>
           </tr>
         <% end %>
-        <tr>
-          <th><%= t('NextRetry') %></th>
-          <td><%= relative_time(job.at) %></td>
-        </tr>
-      <% end %>
-      <% if type == :scheduled %>
-        <tr>
-          <th><%= t('Scheduled') %></th>
-          <td><%= relative_time(job.at) %></td>
-        </tr>
-      <% end %>
-      <% if type == :dead %>
-        <tr>
-          <th><%= t('LastRetry') %></th>
-          <td><%= relative_time(job.at) if job['retry_count'] %></td>
-        </tr>
-      <% end %>
-      <% Sidekiq::Web.custom_job_info_rows.each do |helper| %>
-        <% helper.add_pair(job) do |name, value| %>
+        <% if type == :dead %>
           <tr>
-            <th><%= name %></th>
-            <td><%= value %></td>
+            <th><%= t('LastRetry') %></th>
+            <td><%= relative_time(job.at) if job['retry_count'] %></td>
           </tr>
         <% end %>
-      <% end %>
-    </tbody>
-  </table>
-</div>
+        <% config.custom_job_info_rows&.each do |helper| %>
+          <% helper.add_pair(job) do |name, value| %>
+            <tr>
+              <th><%= name %></th>
+              <td><%= value %></td>
+            </tr>
+          <% end %>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</section>

data/web/views/_metrics_period_select.erb

@@ -1,4 +1,4 @@
-<div>
+<div class="filter">
   <select class="form-control" data-metric-period="<%= path %>">
     <% periods.each_key do |code| %>
 

data/web/views/_nav.erb

@@ -1,52 +1,45 @@
-<div class="navbar navbar-default navbar-fixed-top">
-  <div class="container-fluid">
+<header>
+  <div class="container">
     <div class="navbar-header" data-navbar="static">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="navbar-menu" data-target="#navbar-menu">
+      <button type="button" class="btn navbar-toggle" data-toggle="navbar-menu" data-target="#navbar-menu">
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <div class="navbar-toggle collapsed navbar-livereload">
+      <div class="navbar-livereload">
         <%= erb :_poll_link %>
-        <% if Sidekiq::Web.app_url %>
-          <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>"><%= t('BackToApp') %></a>
+        <% if config.app_url %>
+          <a class="btn btn-inverse" href="<%= config.app_url %>"><%= t('BackToApp') %></a>
         <% end %>
       </div>
       <a class="navbar-brand" href="<%= root_path %>">
         <%= Sidekiq::NAME %>
-        <%= erb :_status %>
       </a>
     </div>
 
-    <div class="collapse navbar-collapse" id="navbar-menu">
-      <ul class="nav navbar-nav" data-navbar="static">
-        <% Sidekiq::Web.default_tabs.each do |title, url| %>
+    <div class="navbar-collapse" id="navbar-menu">
+      <ul class="nav" data-navbar="static">
+        <% config.tabs.each do |title, url| %>
           <% if url == '' %>
             <li class="<%= current_path == url ? 'active' : '' %>">
-            <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+              <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
             </li>
           <% else %>
             <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
-            <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+              <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
             </li>
           <% end %>
         <% end %>
 
-        <% Sidekiq::Web.custom_tabs.each do |title, url| %>
-          <li class="<%= current_path.start_with?(url) ? 'active' : '' %>" data-navbar="custom-tab">
-            <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
-          </li>
-        <% end %>
-
         <li class="navbar-livereload">
           <div class="poll-wrapper">
             <%= erb :_poll_link %>
-            <% if Sidekiq::Web.app_url %>
-              <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>"><%= t('BackToApp') %></a>
+            <% if config.app_url %>
+              <a class="btn btn-inverse" href="<%= config.app_url %>"><%= t('BackToApp') %></a>
             <% end %>
           </div>
         </li>
       </ul>
     </div>
   </div>
-</div>
+</header>

data/web/views/_paging.erb

@@ -1,25 +1,27 @@
-<div>
+
 <% if @total_size > @count %>
-  <ul class="pagination pull-right flip">
-    <li class="<%= 'disabled' if @current_page == 1 %>">
-      <a href="<%= url %>?page=1">&laquo;</a>
-    </li>
-    <% if @current_page > 1 %>
-      <li>
-        <a href="<%= url %>?<%= qparams(page: @current_page - 1) %>"><%= @current_page - 1 %></a>
+  <div>
+    <ul class="pagination pull-right">
+      <li class="<%= 'disabled' if @current_page == 1 %>">
+        <a href="<%= url %>?page=1">&laquo;</a>
       </li>
-    <% end %>
-    <li class="disabled">
-      <a href="<%= url %>?<%= qparams(page: @current_page) %>"><%= @current_page %></a>
-    </li>
-    <% if @total_size > @current_page * @count %>
-      <li>
-        <a href="<%= url %>?<%= qparams(page: @current_page + 1) %>"><%= @current_page + 1 %></a>
+      <% if @current_page > 1 %>
+        <li>
+          <a href="<%= url %>?<%= qparams(page: @current_page - 1) %>"><%= @current_page - 1 %></a>
+        </li>
+      <% end %>
+      <li class="disabled">
+        <a href="<%= url %>?<%= qparams(page: @current_page) %>"><%= @current_page %></a>
       </li>
-    <% end %>
-    <li class="<%= 'disabled' if @total_size <= @current_page * @count %>">
-      <a href="<%= url %>?<%= qparams(page: (@total_size.to_f / @count).ceil) %>">&raquo;</a>
-    </li>
-  </ul>
+      <% if @total_size > @current_page * @count %>
+        <li>
+          <a href="<%= url %>?<%= qparams(page: @current_page + 1) %>"><%= @current_page + 1 %></a>
+        </li>
+      <% end %>
+      <li class="<%= 'disabled' if @total_size <= @current_page * @count %>">
+        <a href="<%= url %>?<%= qparams(page: (@total_size.to_f / @count).ceil) %>">&raquo;</a>
+      </li>
+    </ul>
+  </div>
 <% end %>
-</div>
+

data/web/views/_poll_link.erb

@@ -1,4 +1,4 @@
 <% if pollable? %>
-    <a class="live-poll-start live-poll btn btn-primary"><%= t('LivePoll') %></a>
-    <a class="live-poll-stop live-poll btn btn-primary active"><%= t('StopPolling') %></a>
+    <a class="btn live-poll live-poll-start btn-primary"><%= t('LivePoll') %></a>
+    <a class="btn live-poll live-poll-stop btn-danger"><%= t('StopPolling') %></a>
 <% end %>

data/web/views/_summary.erb

@@ -1,40 +1,40 @@
-<ul class="list-unstyled summary row">
-  <li class="processed col-sm-1">
+<div class="cards-container">
+  <article>
     <span id="txtProcessed" class="count" data-nwp><%= stats.processed %></span>
     <span class="desc"><%= t('Processed') %></span>
-  </li>
-  <li class="failed col-sm-1">
+  </article>
+  <article>
     <span id="txtFailed" class="count" data-nwp><%= stats.failed %></span>
     <span class="desc"><%= t('Failed') %></span>
-  </li>
-  <li class="busy col-sm-1">
+  </article>
+  <article>
     <a href="<%= root_path %>busy">
       <span id="txtBusy" class="count" data-nwp><%= workset.size %></span>
       <span class="desc"><%= t('Busy') %></span>
     </a>
-  </li>
-  <li class="enqueued col-sm-1">
+  </article>
+  <article>
     <a href="<%= root_path %>queues">
       <span id="txtEnqueued" class="count" data-nwp><%= stats.enqueued %></span>
       <span class="desc"><%= t('Enqueued') %></span>
     </a>
-  </li>
-  <li class="retries col-sm-1">
+  </article>
+  <article>
     <a href="<%= root_path %>retries">
       <span id="txtRetries" class="count" data-nwp><%= stats.retry_size %></span>
       <span class="desc"><%= t('Retries') %></span>
     </a>
-  </li>
-  <li class="scheduled col-sm-1">
+  </article>
+  <article>
     <a href="<%= root_path %>scheduled">
       <span id="txtScheduled" class="count" data-nwp><%= stats.scheduled_size %></span>
       <span class="desc"><%= t('Scheduled') %></span>
     </a>
-  </li>
-  <li class="dead col-sm-1">
+  </article>
+  <article>
     <a href="<%= root_path %>morgue">
       <span id="txtDead" class="count" data-nwp><%= stats.dead_size %></span>
       <span class="desc"><%= t('Dead') %></span>
     </a>
-  </li>
-</ul>
+  </article>
+</div>