sidekiq 7.3.8 → 8.0.0.beta1

data/sidekiq.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.files = %w[sidekiq.gemspec README.md Changes.md LICENSE.txt] + `git ls-files | grep -E '^(bin|lib|web)'`.split("\n")
   gem.name = "sidekiq"
   gem.version = Sidekiq::VERSION
-  gem.required_ruby_version = ">= 2.7.0"
+  gem.required_ruby_version = ">= 3.2.0"
 
   gem.metadata = {
     "homepage_uri" => "https://sidekiq.org",
@@ -23,9 +23,10 @@ Gem::Specification.new do |gem|
     "rubygems_mfa_required" => "true"
   }
 
-  gem.add_dependency "redis-client", ">= 0.22.2"
-  gem.add_dependency "connection_pool", ">= 2.3.0"
-  gem.add_dependency "rack", ">= 2.2.4"
+  gem.add_dependency "redis-client", ">= 0.23.2"
+  gem.add_dependency "connection_pool", ">= 2.5.0"
+  gem.add_dependency "rack", ">= 3.1.0"
+  gem.add_dependency "json", ">= 2.9.0"
   gem.add_dependency "logger"
   gem.add_dependency "base64"
 end

data/web/assets/javascripts/application.js

@@ -31,7 +31,7 @@ function addListeners() {
     node.addEventListener("click", addDataToggleListeners)
   })
 
-  addShiftClickListeners()
+  addShiftClickListeners();
   updateFuzzyTimes();
   updateNumbers();
   updateProgressBars();
@@ -69,11 +69,7 @@ function addDataToggleListeners(event) {
   var source = event.target || event.srcElement;
   var targName = source.getAttribute("data-toggle");
   var full = document.getElementById(targName);
-  if (full.style.display == "block") {
-    full.style.display = 'none';
-  } else {
-    full.style.display = 'block';
-  }
+  full.classList.toggle("is-open");
 }
 
 function addShiftClickListeners() {
@@ -130,11 +126,11 @@ function setLivePollFromUrl() {
 
 function updateLivePollButton() {
   if (localStorage.sidekiqLivePoll == "enabled") {
-    document.querySelectorAll('.live-poll-stop').forEach(box => { box.style.display = "inline-block" })
-    document.querySelectorAll('.live-poll-start').forEach(box => { box.style.display = "none" })
+    document.querySelectorAll('.live-poll-stop').forEach(box => { box.classList.add("active") })
+    document.querySelectorAll('.live-poll-start').forEach(box => { box.classList.remove("active") })
   } else {
-    document.querySelectorAll('.live-poll-start').forEach(box => { box.style.display = "inline-block" })
-    document.querySelectorAll('.live-poll-stop').forEach(box => { box.style.display = "none" })
+    document.querySelectorAll('.live-poll-start').forEach(box => { box.classList.add("active") })
+    document.querySelectorAll('.live-poll-stop').forEach(box => { box.classList.remove("active") })
   }
 }
 
@@ -169,9 +165,6 @@ function replacePage(text) {
   var page = doc.querySelector('#page')
   document.querySelector("#page").replaceWith(page)
 
-  var header_status = doc.querySelector('.status')
-  document.querySelector('.status').replaceWith(header_status)
-
   addListeners();
 }
 

data/web/assets/javascripts/base-charts.js

@@ -1,27 +1,33 @@
 if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
-  Chart.defaults.borderColor = "#333";
-  Chart.defaults.color = "#aaa";
+  Chart.defaults.borderColor = "oklch(22% 0.01 256)";
+  Chart.defaults.color = "oklch(65% 0.01 256)";
 }
 
 class Colors {
   constructor() {
     this.assignments = {};
-    this.success = "#006f68";
-    this.failure = "#af0014";
-    this.fallback = "#999";
-    this.primary = "#537bc4";
+    if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+      this.light = "65%";
+      this.chroma = "0.15";
+    } else {
+      this.light = "48%";
+      this.chroma = "0.2";
+    }
+    this.success = "oklch(" + this.light + " " + this.chroma + " 179)";
+    this.failure = "oklch(" + this.light + " " + this.chroma + " 29)";
+    this.fallback = "oklch(" + this.light + " 0.02 269)";
+    this.primary = "oklch(" + this.light + " " + this.chroma + " 269)";
     this.available = [
-      // Colors taken from https://www.chartjs.org/docs/latest/samples/utils.html
-      "#537bc4",
-      "#4dc9f6",
-      "#f67019",
-      "#f53794",
-      "#acc236",
-      "#166a8f",
-      "#00a950",
-      "#58595b",
-      "#8549ba",
-      "#991b1b",
+      "oklch(" + this.light + " " + this.chroma + " 256)",
+      "oklch(" + this.light + " " + this.chroma + " 196)",
+      "oklch(" + this.light + " " + this.chroma + " 46)",
+      "oklch(" + this.light + " " + this.chroma + " 316)",
+      "oklch(" + this.light + " " + this.chroma + " 106)",
+      "oklch(" + this.light + " " + this.chroma + " 226)",
+      "oklch(" + this.light + " " + this.chroma + " 136)",
+      "oklch(" + this.light + " 0.02 269)",
+      "oklch(" + this.light + " " + this.chroma + " 286)",
+      "oklch(" + this.light + " " + this.chroma + " 16)",
     ];
   }
 
@@ -90,12 +96,18 @@ class BaseChart {
     };
 
     if (this.options.marks) {
+      if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+        this.Borderlight = "30%";
+      } else {
+        this.Borderlight = "65%";
+      }
+
       this.options.marks.forEach(([bucket, label], i) => {
         chartOptions.plugins.annotation.annotations[`deploy-${i}`] = {
           type: "line",
           xMin: bucket,
           xMax: bucket,
-          borderColor: "rgba(220, 38, 38, 0.4)",
+          borderColor: "oklch(" + this.Borderlight + " 0.01 256)",
           borderWidth: 2,
         };
       });

data/web/assets/javascripts/dashboard-charts.js

@@ -83,6 +83,8 @@ class RealtimeChart extends DashboardChart {
     this.chart.data.datasets[1].data.push(failed);
     this.chart.update();
 
+    updateScreenReaderDashboardValues(processed, failed);
+
     updateStatsSummary(this.stats.sidekiq);
     updateRedisStats(this.stats.redis);
     updateFooterUTCTime(this.stats.server_utc_time);

data/web/assets/javascripts/dashboard.js

@@ -36,6 +36,12 @@ var ready = (callback) => {
   else document.addEventListener("DOMContentLoaded", callback);
 }
 
+var updateScreenReaderDashboardValues = function(processed, failed) {
+  let lastDashboardUpdateSpan = document.getElementById("sr-last-dashboard-update");
+  var updateText = document.getElementById("sr-last-dashboard-update-template").innerText;
+  lastDashboardUpdateSpan.innerText = updateText.replace("PROCESSED_COUNT", processed).replace("FAILED_COUNT", failed);
+}
+
 ready(() => {
   var sldr = document.getElementById('sldr');
   if (typeof localStorage.sidekiqTimeInterval !== 'undefined') {

data/web/assets/javascripts/metrics.js

@@ -39,7 +39,7 @@ class JobMetricsOverviewChart extends BaseChart {
   updateSwatch(kls, checked) {
     const el = this.swatches[kls];
     el.checked = checked;
-    el.style.color = this.colors.assignments[kls] || "";
+    el.style.accentColor = this.colors.assignments[kls] || "";
   }
 
   toggleKls(kls, visible) {