sidekiq 7.3.9 → 8.0.0.beta2

data/web/views/busy.erb

@@ -1,148 +1,150 @@
-<div class="header-container">
-  <h1><%= t('Status') %></h1>
-</div>
+<section>
+  <header>
+    <h1><%= t('Status') %></h1>
+  </header>
 
-<div class="stats-wrapper">
-  <div class="stats-container">
-    <div class="stat">
+  <div class="cards-container">
+    <article>
       <h3><%= s = processes.size; number_with_delimiter(s) %></h3>
       <p><%= t('Processes') %></p>
-    </div>
-    <div class="stat">
+    </article>
+    <article>
       <h3><%= x = processes.total_concurrency; number_with_delimiter(x) %></h3>
       <p><%= t('Threads') %></p>
-    </div>
-    <div class="stat">
+    </article>
+    <article>
       <h3><%= ws = workset.size; number_with_delimiter(ws) %></h3>
       <p><%= t('Busy') %></p>
-    </div>
-    <div class="stat">
+    </article>
+    <article>
       <h3><%= x == 0 ? 0 : ((ws / x.to_f) * 100).round(0) %>%</h3>
       <p><%= t('Utilization') %></p>
-    </div>
-    <div class="stat">
+    </article>
+    <article>
       <h3><%= format_memory(processes.total_rss) %></h3>
       <p><%= t('RSS') %></p>
-    </div>
+    </article>
   </div>
-</div>
+</section>
 
-<div class="header-container">
-  <h1><%= t('Processes') %></h1>
-  <div>
-    <form method="POST" class="warning-messages">
+<section>
+  <header>
+    <h2><%= t('Processes') %></h2>
+    <form method="POST" class="filter warning-messages">
       <%= csrf_tag %>
       <div class="btn-group pull-right flip">
         <input class="btn btn-warn" type="submit" name="quiet" value="<%= t('QuietAll') %>" data-confirm="<%= t('AreYouSure') %>"/>
         <input class="btn btn-danger" type="submit" name="stop" value="<%= t('StopAll') %>" data-confirm="<%= t('AreYouSure') %>"/>
       </div>
     </form>
-  </div>
-</div>
+  </header>
 
-<div class="table_container">
-  <table class="processes table table-hover table-bordered table-striped">
-    <thead>
-      <th><%= t('Name') %></th>
-      <th><%= t('Started') %></th>
-      <th class="col-sm-1"><%= t('RSS') %><a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Memory#rss"><span class="info-circle" title="Click to learn more about RSS">?</span></a></th>
-      <th class="col-sm-1"><%= t('Threads') %></th>
-      <th class="col-sm-1"><%= t('Busy') %></th>
-      <th>&nbsp;</th>
-    </thead>
-    <% lead = processes.leader %>
-    <% sorted_processes.each do |process| %>
-      <tr>
-        <td class="box">
-          <%= "#{process['hostname']}:#{process['pid']}" %>
-          <span class="label label-success"><%= process.tag %></span>
-          <% process.labels.each do |label| %>
-            <span class="label label-info"><%= label %></span>
-          <% end %>
-          <% if process.embedded? %>
-            <span class="label label-default">embedded</span>
-          <% end %>
-          <% if process.stopping? %>
-            <span class="label label-danger">quiet</span>
-          <% end %>
-          <% if process.identity == lead %>
-            <span class="label label-warning">leader</span>
-          <% end %>
-          <br>
-          <b><%= "#{t('Queues')}: " %></b>
-          <% if process.weights %>
-            <%= busy_weights(process.weights) %>
-          <% else %>
-            <%= process.queues.sort.join(", ") %>
-          <% end %>
-          <% if process.version != Sidekiq::VERSION %>
+  <div class="table_container">
+    <table>
+      <thead>
+        <th><%= t('Name') %></th>
+        <th><%= t('Started') %></th>
+        <th class="col-sm-1"><%= t('RSS') %><a target="blank" href="https://github.com/sidekiq/sidekiq/wiki/Memory#rss"><span class="info-circle" title="Click to learn more about RSS">?</span></a></th>
+        <th class="col-sm-1"><%= t('Threads') %></th>
+        <th class="col-sm-1"><%= t('Busy') %></th>
+        <th>&nbsp;</th>
+      </thead>
+      <% lead = processes.leader %>
+      <% sorted_processes.each do |process| %>
+        <tr>
+          <td class="box">
+            <%= "#{process['hostname']}:#{process['pid']}" %>
+            <span class="label label-success"><%= process.tag %></span>
+            <% process.labels.each do |label| %>
+              <span class="label label-info"><%= label %></span>
+            <% end %>
+            <% if process.embedded? %>
+              <span class="label label-default">embedded</span>
+            <% end %>
+            <% if process.stopping? %>
+              <span class="label label-danger">quiet</span>
+            <% end %>
+            <% if process.identity == lead %>
+              <span class="label label-warning">leader</span>
+            <% end %>
             <br>
-            <b><%= "#{t('Version')}: " %></b>
-            <% if process.version %>
-              <%= process.version %>
+            <b><%= "#{t('Queues')}: " %></b>
+            <% if process.weights %>
+              <%= busy_weights(process.weights) %>
             <% else %>
-              <%= t('Unknown') %>
+              <%= process.queues.sort.join(", ") %>
             <% end %>
-          <% end %>
-        </td>
-        <td><%= relative_time(Time.at(process['started_at'])) %></td>
-        <td class="num"><%= format_memory(process['rss'].to_i) %></td>
-        <td class="num"><%= number_with_delimiter(process['concurrency']) %></td>
-        <td class="num"><%= number_with_delimiter(process['busy']) %></td>
-        <td>
-          <% unless process.embedded? %>
-            <form method="POST">
-              <%= csrf_tag %>
-              <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
-
-              <div class="btn-group pull-right flip">
-                <% unless process.stopping? %><button class="btn btn-xs btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
-                <button class="btn btn-xs btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
-              </div>
-            </form>
-          <% end %>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-</div>
+            <% if process.version != Sidekiq::VERSION %>
+              <br>
+              <b><%= "#{t('Version')}: " %></b>
+              <% if process.version %>
+                <%= process.version %>
+              <% else %>
+                <%= t('Unknown') %>
+              <% end %>
+            <% end %>
+          </td>
+          <td><%= relative_time(Time.at(process['started_at'])) %></td>
+          <td class="num"><%= format_memory(process['rss'].to_i) %></td>
+          <td class="num"><%= number_with_delimiter(process['concurrency']) %></td>
+          <td class="num"><%= number_with_delimiter(process['busy']) %></td>
+          <td>
+            <% unless process.embedded? %>
+              <form method="POST">
+                <%= csrf_tag %>
+                <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
 
-<div class="header-container">
-  <h1><%= t('Jobs') %></h1>
-  <% if @workset.size > 0 && @total_size > @count %>
-    <%= erb :_paging, locals: { url: "#{root_path}busy" } %>
-  <% end %>
-</div>
+                <div class="btn-group">
+                  <% unless process.stopping? %><button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button><% end %>
+                  <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
+                </div>
+              </form>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+</section>
 
-<div class="table_container">
-  <table class="workers table table-hover table-bordered table-striped">
-    <thead>
-      <th><%= t('Process') %></th>
-      <th><%= t('TID') %></th>
-      <th><%= t('JID') %></th>
-      <th><%= t('Queue') %></th>
-      <th><%= t('Job') %></th>
-      <th><%= t('Arguments') %></th>
-      <th><%= t('Started') %></th>
-    </thead>
-    <% @workset.each do |process, thread, work| %>
-      <% job = work.job %>
-      <tr>
-        <td><%= process %></td>
-        <td><%= thread %></td>
-        <td><%= job.jid %></td>
-        <td>
-          <a href="<%= root_path %>queues/<%= work.queue %>"><%= work.queue %></a>
-        </td>
-        <td>
-          <%= job.display_class %>
-          <%= display_tags(job, nil) %>
-        </td>
-        <td>
-          <div class="args"><%= display_args(job.display_args) %></div>
-        </td>
-        <td><%= relative_time(work.run_at) %></td>
-      </tr>
+<section>
+  <header>
+    <h2><%= t('Jobs') %></h2>
+    <% if @workset.size > 0 && @total_size > @count %>
+      <%= erb :_paging, locals: { url: "#{root_path}busy" } %>
     <% end %>
-  </table>
-</div>
+  </header>
+
+  <div class="table_container">
+    <table>
+      <thead>
+        <th><%= t('Process') %></th>
+        <th><%= t('TID') %></th>
+        <th><%= t('JID') %></th>
+        <th><%= t('Queue') %></th>
+        <th><%= t('Job') %></th>
+        <th><%= t('Arguments') %></th>
+        <th><%= t('Started') %></th>
+      </thead>
+      <% @workset.each do |process, thread, work| %>
+        <% job = work.job %>
+        <tr>
+          <td><%= process %></td>
+          <td><%= thread %></td>
+          <td><%= job.jid %></td>
+          <td>
+            <a href="<%= root_path %>queues/<%= work.queue %>"><%= work.queue %></a>
+          </td>
+          <td>
+            <%= job.display_class %>
+            <%= display_tags(job, nil) %>
+          </td>
+          <td>
+            <code><div class="args"><%= display_args(job.display_args) %></div></code>
+          </td>
+          <td><%= relative_time(work.run_at) %></td>
+        </tr>
+      <% end %>
+    </table>
+  </div>
+</section>

data/web/views/dashboard.erb

@@ -1,51 +1,51 @@
 <script type="text/javascript" src="<%= root_path %>javascripts/dashboard.js" nonce="<%= csp_nonce %>"></script>
-<div class= "dashboard clearfix">
-  <h3 >
-    <%= t('Dashboard') %>
-    <span id="beacon" class="beacon">
-      <span class="ring"></span>
-      <span class="dot"></span>
-    </span>
-  </h3>
-  <div class="interval-slider ltr">
-    <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
-    <span id="sldr-text" class="current-interval">5 s</span>
-    <br/>
-    <input id="sldr" aria-label="<%= t("PollingIntervalMilliseconds") %>" type="range" min="2000" max="20000" step="1000" value="5000"/>
-  </div>
-</div>
 
-<div class="row chart">
-  <span id="sr-last-dashboard-update-template" hidden="hidden"><%= t("LastDashboardUpdateTemplateLiteral") %></span>
-  <span id="sr-last-dashboard-update" class="sr-only" role="status"></span>
+<section>
+  <header>
+    <h1>
+      <%= t('Dashboard') %>
+      <span id="beacon" class="beacon"></span>
+    </h1>
+    <div class="filter interval-slider">
+      <span class="interval-slider-label"><%= t('PollingInterval') %>:</span>
+      <span id="sldr-text" class="current-interval">5 s</span>
+      <br/>
+      <input id="sldr" aria-label="<%= t("PollingIntervalMilliseconds") %>" role="slider" type="range" min="2000" max="20000" step="1000" value="5000"/>
+    </div>
+  </header>
 
-  <canvas id="realtime-chart">
-    <%= to_json({
-      processedLabel: t('Processed'),
-      failedLabel: t('Failed'),
-      labels: Array.new(50, ""),
-      processed: Array.new(50),
-      failed: Array.new(50),
-      updateUrl: "#{root_path}stats",
-    }) %>
-  </canvas>
+  <div class="chart">
+    <span id="sr-last-dashboard-update-template" hidden="hidden"><%= t("LastDashboardUpdateTemplateLiteral") %></span>
+    <span id="sr-last-dashboard-update" class="sr-only" role="status"></span>
 
-  <!-- start with a space in the legend so the height doesn't change when we add content dynamically -->
-  <div id="realtime-legend">&nbsp;</div>
-</div>
+    <canvas id="realtime-chart">
+      <%= to_json({
+        processedLabel: t('Processed'),
+        failedLabel: t('Failed'),
+        labels: Array.new(50, ""),
+        processed: Array.new(50),
+        failed: Array.new(50),
+        updateUrl: "#{root_path}stats",
+      }) %>
+    </canvas>
 
-<div class="row header">
-   <div class="col-sm-4 pull-left flip">
-     <h3><%= t('History') %></h3>
-   </div>
- </div>
- <div class="row chart">
-   <div>
-    <a href="<%= root_path %>?days=7" class="history-graph <%= "active" if params[:days] == "7" %>"><%= t('OneWeek') %></a>
-    <a href="<%= root_path %>" class="history-graph <%= "active" if params[:days].nil? || params[:days] == "30" %>"><%= t('OneMonth') %></a>
-    <a href="<%= root_path %>?days=90" class="history-graph <%= "active" if params[:days] == "90" %>"><%= t('ThreeMonths') %></a>
-    <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
+    <!-- start with a space in the legend so the height doesn't change when we add content dynamically -->
+    <div id="realtime-legend">&nbsp;</div>
   </div>
+</section>
+
+<section>
+  <header>
+    <h2><%= t('History') %></h2>
+
+    <div class="filter">
+      <% d = url_params("days") %>
+      <a href="<%= root_path %>?days=7" class="history-graph <%= "active" if d == "7" %>"><%= t('OneWeek') %></a>
+      <a href="<%= root_path %>" class="history-graph <%= "active" if d.nil? || d == "30" %>"><%= t('OneMonth') %></a>
+      <a href="<%= root_path %>?days=90" class="history-graph <%= "active" if d == "90" %>"><%= t('ThreeMonths') %></a>
+      <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if d == "180" %>"><%= t('SixMonths') %></a>
+    </div>
+  </header>
 
   <canvas id="history-chart">
     <%= to_json({
@@ -55,54 +55,50 @@
       failed: @failed_history.to_a.reverse,
     }) %>
   </canvas>
-</div>
+</section>
 
-<br/>
-<div class="row header">
-  <div class="col-sm-4 pull-left flip">
-    <h3>Redis</h3>
-  </div>
-</div>
-<div class="stats-wrapper">
-  <div class="stats-container">
-    <% if @redis_info.fetch("redis_version", nil) %>
-      <div class="stat">
-        <h3 id="redis_version"><%= @redis_info.fetch("redis_version") %></h3>
-        <p><%= t('Version') %></p>
-      </div>
-    <% end %>
+<section>
+  <header>
+    <h2><%= store_name %></h2>
+  </header>
+  <div class="cards-container">
+    <article>
+      <h3 id="redis_version"><%= store_version %></h3>
+      <p><%= t('Version') %></p>
+    </article>
 
     <% if @redis_info.fetch("uptime_in_days", nil) %>
-      <div class="stat">
+      <article>
         <h3 id="uptime_in_days"><%= @redis_info.fetch("uptime_in_days") %></h3>
         <p><%= t('Uptime') %></p>
-      </div>
+      </article>
     <% end %>
 
     <% if @redis_info.fetch("connected_clients", nil) %>
-      <div class="stat">
+      <article>
         <h3 id="connected_clients"><%= @redis_info.fetch("connected_clients") %></h3>
         <p><%= t('Connections') %></p>
-      </div>
+      </article>
     <% end %>
 
     <% if @redis_info.fetch("used_memory_human", nil) %>
-      <div class="stat">
+      <article>
         <h3 id="used_memory_human"><%= @redis_info.fetch("used_memory_human") %></h3>
         <p><%= t('MemoryUsage') %></p>
-      </div>
+      </article>
     <% end %>
 
     <% if @redis_info.fetch("used_memory_peak_human", nil) %>
-      <div class="stat">
+      <article>
         <h3 id="used_memory_peak_human"><%= @redis_info.fetch("used_memory_peak_human") %></h3>
         <p><%= t('PeakMemoryUsage') %></p>
-      </div>
+      </article>
     <% end %>
   </div>
-</div>
+</section>
 
 <script type="text/javascript" src="<%= root_path %>javascripts/chart.min.js" nonce="<%= csp_nonce %>"></script>
 <script type="text/javascript" src="<%= root_path %>javascripts/chartjs-plugin-annotation.min.js" nonce="<%= csp_nonce %>"></script>
+<script type="text/javascript" src="<%= root_path %>javascripts/chartjs-adapter-date-fns.min.js" nonce="<%= csp_nonce %>"></script>
 <script type="text/javascript" src="<%= root_path %>javascripts/base-charts.js" nonce="<%= csp_nonce %>"></script>
 <script type="text/javascript" src="<%= root_path %>javascripts/dashboard-charts.js" nonce="<%= csp_nonce %>"></script>

data/web/views/dead.erb

@@ -1,34 +1,38 @@
 <%= erb :_job_info, locals: { job: @dead, type: :dead } %>
 
-<h3><%= t('Error') %></h3>
-<div class="table_container">
-  <table class="error table table-bordered table-striped table-hover">
-    <tbody>
-      <tr>
-        <th><%= t('ErrorClass') %></th>
-        <td>
-          <code><%= @dead['error_class'] %></code>
-        </td>
-      </tr>
-      <tr>
-        <th><%= t('ErrorMessage') %></th>
-        <td><%= h(@dead['error_message']) %></td>
-      </tr>
-      <% if @dead.error_backtrace %>
+<section>
+  <header>
+    <h1><%= t('Error') %></h1>
+  </header>
+  <div class="table_container">
+    <table>
+      <tbody>
         <tr>
-          <th><%= t('ErrorBacktrace') %></th>
+          <th><%= t('ErrorClass') %></th>
           <td>
-            <code><%= @dead.error_backtrace.join("<br/>") %></code>
+            <code><%= @dead['error_class'] %></code>
           </td>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
+        <tr>
+          <th><%= t('ErrorMessage') %></th>
+          <td><%= h(@dead['error_message']) %></td>
+        </tr>
+        <% if @dead.error_backtrace %>
+          <tr>
+            <th><%= t('ErrorBacktrace') %></th>
+            <td>
+              <code><%= @dead.error_backtrace.join("<br/>") %></code>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 
-<form class="form-horizontal" action="<%= root_path %>morgue/<%= job_params(@dead, @dead.score) %>" method="post">
-  <%= csrf_tag %>
-  <a class="btn btn-default" href="<%= root_path %>morgue"><%= t('GoBack') %></a>
-  <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
-  <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
-</form>
+  <form action="<%= root_path %>morgue/<%= job_params(@dead, @dead.score) %>" method="post">
+    <%= csrf_tag %>
+    <a class="btn btn-default" href="<%= root_path %>morgue"><%= t('GoBack') %></a>
+    <input class="btn btn-primary" type="submit" name="retry" value="<%= t('RetryNow') %>" />
+    <input class="btn btn-danger" type="submit" name="delete" value="<%= t('Delete') %>" />
+  </form>
+</section>

data/web/views/filtering.erb

@@ -1,6 +1,6 @@
-<div>
-  <form method="get" class="form-inline" action='<%= root_path %><%= which %>'>
+<div class="filter">
+  <form role="search" method="get" class="form-inline" action='<%= root_path %><%= which %>'>
     <label for="substr"><%= t('Filter') %></label>
-    <input class="search form-control" type="search" name="substr" value="<%= h params[:substr] %>" placeholder="<%= t('AnyJobContent') %>"/>
+    <input class="form-control" type="search" name="substr" value="<%= h url_params("substr") %>" placeholder="<%= t('AnyJobContent') %>"/>
   </form>
 </div>

data/web/views/layout.erb

@@ -1,20 +1,11 @@
 <!doctype html>
-<html dir="<%= text_direction %>">
+<html dir="<%= text_direction %>" lang="<%= locale %>">
   <head>
     <title><%= environment_title_prefix %><%= Sidekiq::NAME %></title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
 
-    <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
-    <% if rtl? %>
-    <link href="<%= root_path %>stylesheets/bootstrap-rtl.min.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>"/>
-    <% end %>
-
-    <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
-    <link href="<%= root_path %>stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
-    <% if rtl? %>
-    <link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
-    <% end %>
+    <link href="<%= root_path %>stylesheets/style.css" media="screen" rel="stylesheet" type="text/css" nonce="<%= csp_nonce %>" />
 
     <link rel="apple-touch-icon" href="<%= root_path %>images/apple-touch-icon.png">
     <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
@@ -24,19 +15,12 @@
   </head>
   <body class="admin" data-locale="<%= locale %>">
     <%= erb :_nav %>
-    <div id="page">
+    <main id="page">
       <div class="container">
-        <div class="row">
-          <div class="col-sm-12 summary_bar">
-            <%= erb :_summary %>
-          </div>
-
-          <div class="col-sm-12">
-            <%= yield %>
-          </div>
-        </div>
+        <%= erb :_summary %>
+        <%= yield %>
       </div>
-    </div>
+    </main>
     <%= erb :_footer %>
   </body>
 </html>