good_job 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68dae79a3d669ccfd101719015e70aee8b54230c339012351ad677862732dc70
-  data.tar.gz: d1242d0a898eff92aa4492d174de9cc73b0e610c5b1f56e358a304a864e39493
+  metadata.gz: f7a4560e3e97c78d26ea5045bbd6de6d378191a52873be4f213d886f80bdf29c
+  data.tar.gz: 98cc8a6958a69898966efe296339bfc22130c75d6700ad80934e60948f864861
 SHA512:
-  metadata.gz: 4bac343036b068fa03559d168346c37e41b110e4e9e902af8c58209880afdf75e44301ea845aca208ba583245fd4f2aa486d80b0905492e830501851b5190bd8
-  data.tar.gz: 576f825db2e84ae3ae3e19ccdf3e3a7becd2db81fb1960ebd26f18aa0779224ec4e79b0a976cd256cc0e19303e3b53d88b41f10be6a405ce284a731dd99654b4
+  metadata.gz: 1e1479d596427c82a6ed2b683aa0e8e171e20ab52b3591b49e757efd54b9ad5651c6a10643a42e3838c1042c2d17d96070d30888ceabff19b809185009c93e88
+  data.tar.gz: '0784732d866e3954803d23758a320d68adcd6ad9da30413419c514ffa5ea68a40dd3652eabd3847b24563814b2a37a48e1b55f2d8358a940daacbc6353fe8171'

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [v4.4.2](https://github.com/bensheldon/good_job/tree/v4.4.2) (2024-10-18)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.4.1...v4.4.2)
+
+**Merged pull requests:**
+
+- Bump rails from 7.1.4 to 7.1.4.1 [\#1524](https://github.com/bensheldon/good_job/pull/1524) ([Earlopain](https://github.com/Earlopain))
+- Drop compatibility code for `ForkTracker` [\#1519](https://github.com/bensheldon/good_job/pull/1519) ([Earlopain](https://github.com/Earlopain))
+- Add vertical legend to performance dashboard [\#1517](https://github.com/bensheldon/good_job/pull/1517) ([Wittiest](https://github.com/Wittiest))
+- Bump the bundler-dependencies group across 1 directory with 10 updates [\#1515](https://github.com/bensheldon/good_job/pull/1515) ([dependabot[bot]](https://github.com/apps/dependabot))
+- Manually bump tapioca / regenerate rbi [\#1514](https://github.com/bensheldon/good_job/pull/1514) ([Earlopain](https://github.com/Earlopain))
+- Remove rack from the gemfile [\#1512](https://github.com/bensheldon/good_job/pull/1512) ([Earlopain](https://github.com/Earlopain))
+- Add regression test for searchable numeric arguments [\#1510](https://github.com/bensheldon/good_job/pull/1510) ([bensheldon](https://github.com/bensheldon))
+- Better parallelize CI jobs [\#1507](https://github.com/bensheldon/good_job/pull/1507) ([Earlopain](https://github.com/Earlopain))
+- Bump webrick from 1.8.1 to 1.8.2 [\#1503](https://github.com/bensheldon/good_job/pull/1503) ([dependabot[bot]](https://github.com/apps/dependabot))
+
 ## [v4.4.1](https://github.com/bensheldon/good_job/tree/v4.4.1) (2024-10-10)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v4.4.0...v4.4.1)

data/README.md

@@ -1715,14 +1715,14 @@ Environment variables that may help with debugging:
 - `LOUD=1`: display all stdout/stderr output from all sources. This is helpful because GoodJob wraps some tests with `quiet { }` for cleaner test output, but it can hinder debugging.
 - `SHOW_BROWSER=1`: Run system tests headfully with Chrome/Chromedriver. Use `binding.irb` in the system tests to pause.
 
-Appraisal can be used to run a test matrix of multiple versions of Rails:
+The gemfiles in `gemfiles/` can be used to run tests against different rails versions:
 
 ```bash
-# Install Appraisal matrix of gemfiles
-bin/appraisal
+# Install dependencies
+BUNDLE_GEMFILE=gemfiles/rails_6.1.gemfile bundle install
 
-# Run tests against matrix
-bin/appraisal bin/rspec
+# Run the tests
+BUNDLE_GEMFILE=gemfiles/rails_6.1.gemfile bin/rspec
 ```
 
 ### Release

data/app/charts/good_job/performance_index_chart.rb

@@ -56,6 +56,9 @@ module GoodJob
               display: true,
               text: I18n.t("good_job.performance.index.chart_title"),
             },
+            legend: {
+              vertical: true,
+            },
           },
           scales: {
             y: {

data/app/frontend/good_job/modules/charts.js

@@ -1,3 +1,5 @@
+import htmlLegendPlugin from "html_legend_plugin";
+
 function renderCharts(animate) {
   const charts = document.querySelectorAll('.chart');
 
@@ -5,6 +7,16 @@ function renderCharts(animate) {
     const chartEl = charts[i];
     const chartData = JSON.parse(chartEl.dataset.json);
     chartData.options ||= {};
+
+    if (chartData.options.plugins?.legend?.vertical) {
+      chartData.plugins = [htmlLegendPlugin];
+      chartData.options.plugins = {
+        ...chartData.options.plugins,
+        legend: {
+          display: false,
+        }
+      }
+    }
     chartData.options.animation = animate;
     chartData.options.responsive = true;
     chartData.options.maintainAspectRatio = false;

data/app/frontend/good_job/modules/html_legend_plugin.js

@@ -0,0 +1,56 @@
+const generateListItem = (item) => {
+  const li = document.createElement('li');
+  li.className = 'd-flex align-items-center text-nowrap mb-2';
+
+  const boxSpan = document.createElement('span');
+  boxSpan.className = 'legend-item-color-box';
+  boxSpan.style.background = item.fillStyle;
+  boxSpan.style.borderColor = item.strokeStyle;
+  boxSpan.style.borderWidth = item.lineWidth + 'px';
+
+  const textContainer = document.createElement('p');
+  textContainer.className = 'item-text m-0 small';
+  textContainer.style.color = item.fontColor;
+  textContainer.style.textDecoration = item.hidden ? 'line-through' : '';
+
+  const text = document.createTextNode(item.text);
+  textContainer.appendChild(text);
+
+  li.appendChild(boxSpan);
+  li.appendChild(textContainer);
+
+  return li;
+}
+
+const htmlLegendPlugin = {
+  id: 'htmlLegend',
+  afterUpdate(chart, _args, _options) {
+    const {type} = chart.config;
+    const ul = document.getElementById('chart-legend-ul');
+
+    // Remove old legend items
+    while (ul.firstChild) {
+      ul.firstChild.remove();
+    }
+
+    // Reuse the built-in legendItems generator
+    const items = chart.options.plugins.legend.labels.generateLabels(chart);
+
+    items.forEach(item => {
+      const li = generateListItem(item);
+      ul.appendChild(li);
+
+      li.onclick = () => {
+        if (type === 'pie' || type === 'doughnut') {
+          // Pie and doughnut charts only have a single dataset and visibility is per item
+          chart.toggleDataVisibility(item.index);
+        } else {
+          chart.setDatasetVisibility(item.datasetIndex, !chart.isDatasetVisible(item.datasetIndex));
+        }
+        chart.update();
+      };
+    });
+  }
+};
+
+export { htmlLegendPlugin as default };

data/app/frontend/good_job/style.css

@@ -24,6 +24,19 @@
   height: 200px;
 }
 
+.legend-item-color-box {
+  display: inline-block;
+  flex-shrink: 0;
+  height: 20px;
+  width: 20px;
+  border-style: solid;
+  margin-right: 3px;
+}
+
+#chart-legend-container {
+  height: 200px;
+}
+
 /* Break out of a container */
 .break-out {
   width:100vw;

data/app/views/good_job/jobs/index.html.erb

@@ -1,5 +1,5 @@
 <%= render 'good_job/shared/filter', title: t("good_job.shared.navbar.jobs"), filter: @filter %>
-<%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
+<%= render 'good_job/shared/chart_container', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
 
 <div data-live-poll-region="jobs-table">
   <%= render 'good_job/jobs/table', jobs: @filter.records, filter: @filter %>

data/app/views/good_job/performance/index.html.erb

@@ -2,7 +2,7 @@
   <h2 class="pt-3 pb-2"><%= t ".title" %></h2>
 </div>
 
-<%= render 'good_job/shared/chart', chart_data: GoodJob::PerformanceIndexChart.new.data %>
+<%= render 'good_job/shared/chart_container', chart_data: GoodJob::PerformanceIndexChart.new.data %>
 
 <div class="my-3 card">
   <div class="list-group list-group-flush text-nowrap" role="table">

data/app/views/good_job/performance/show.html.erb

@@ -2,4 +2,4 @@
   <h2 class="pt-3 pb-2"><%= t ".title" %> - <%= @job_class %></h2>
 </div>
 
-<%= render 'good_job/shared/chart', chart_data: GoodJob::PerformanceShowChart.new(@job_class).data %>
+<%= render 'good_job/shared/chart_container', chart_data: GoodJob::PerformanceShowChart.new(@job_class).data %>

data/app/views/good_job/shared/_chart.erb

@@ -1,5 +1,5 @@
-<div class="py-4" data-live-poll-region="chart">
-  <div class="chart-wrapper container-fluid">
+<div class="" data-live-poll-region="chart">
+  <div class="chart-wrapper">
     <canvas class="chart" data-json="<%= chart_data.to_json %>"></canvas>
   </div>
 </div>

data/app/views/good_job/shared/_chart_container.erb

@@ -0,0 +1,21 @@
+<% vertical_legend = chart_data.dig(:options, :plugins, :legend, :vertical) %>
+
+<div class="container-fluid">
+  <div class="row d-flex">
+    <% if vertical_legend %>
+      <div class="row d-flex">
+        <div class="col-md-10">
+          <%= render 'good_job/shared/chart', chart_data: chart_data %>
+        </div>
+        <div class="col-md-2 d-flex flex-column">
+          <div id="chart-legend-container" class="flex-fill overflow-auto">
+            <ul id="chart-legend-ul" class="list-unstyled p-0 mx-0 py-2">
+            </ul>
+          </div>
+        </div>
+      </div>
+    <% else %>
+      <%= render 'good_job/shared/chart', chart_data: chart_data %>
+    <% end %>
+  </div>
+</div>

data/lib/good_job/capsule_tracker.rb

@@ -32,15 +32,7 @@ module GoodJob # :nodoc:
       @record = nil
       @refresh_task = nil
 
-      # AS::ForkTracker is only present on Rails v6.1+.
-      # Fall back to PID checking if ForkTracker is not available
-      if defined?(ActiveSupport::ForkTracker)
-        ActiveSupport::ForkTracker.after_fork { reset }
-        @forktracker = true
-      else
-        @ruby_pid = ::Process.pid
-        @forktracker = false
-      end
+      ActiveSupport::ForkTracker.after_fork { reset }
 
       self.class.instances << self
     end
@@ -53,7 +45,6 @@ module GoodJob # :nodoc:
       synchronize do
         next if @locks.zero?
 
-        reset_on_fork
         if @record
           @record.refresh_if_stale
         else
@@ -204,14 +195,6 @@ module GoodJob # :nodoc:
       synchronize { ns_reset }
     end
 
-    def reset_on_fork
-      return if Concurrent.on_jruby?
-      return if @forktracker || ::Process.pid == @ruby_pid
-
-      @ruby_pid = ::Process.pid
-      ns_reset
-    end
-
     def ns_reset
       @record_id = SecureRandom.uuid
       @record = nil

data/lib/good_job/version.rb

@@ -2,7 +2,7 @@
 
 module GoodJob
   # GoodJob gem version.
-  VERSION = '4.4.1'
+  VERSION = '4.4.2'
 
   # GoodJob version as Gem::Version object
   GEM_VERSION = Gem::Version.new(VERSION)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -269,6 +269,7 @@ files:
 - app/frontend/good_job/modules/charts.js
 - app/frontend/good_job/modules/checkbox_toggle.js
 - app/frontend/good_job/modules/document_ready.js
+- app/frontend/good_job/modules/html_legend_plugin.js
 - app/frontend/good_job/modules/live_poll.js
 - app/frontend/good_job/modules/popovers.js
 - app/frontend/good_job/modules/theme_controller.js
@@ -315,6 +316,7 @@ files:
 - app/views/good_job/processes/index.html.erb
 - app/views/good_job/shared/_alert.erb
 - app/views/good_job/shared/_chart.erb
+- app/views/good_job/shared/_chart_container.erb
 - app/views/good_job/shared/_filter.erb
 - app/views/good_job/shared/_footer.erb
 - app/views/good_job/shared/_navbar.erb