good_job 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b22cbc6d37af9dd8db290a1dc8073d2cae14c63e5cf7180b06dce1a33fb9992
-  data.tar.gz: 8cd87b2d69afea84db87125bad625558783adea98fee138be852e6a51c43dc50
+  metadata.gz: 4722bcae4ba953937f1e78dd730c61898ec0aa25e4c8d5fedc6163e218de4381
+  data.tar.gz: fe659df13800eadf8f8d45a2d31b4b4dd466d0f9517addefdfd5169c351c7c76
 SHA512:
-  metadata.gz: 230b335c5b6a03397c3212cd2bc59d87b2c735073233d068cf2c3045933b2aace533b0699a6fa1ecd41d77890af5aa18e1685b2c85f4c97c868773a3211736b7
-  data.tar.gz: b3fb4cb11f129fa8576e36c4e7401cdab927cf309bda963c3b82480dbe92663847b46a8e641b123e5ad7b28c53aa361d5fb6968131e23e85b0302768cc38e5d0
+  metadata.gz: 3fff2b35292aebd982e6a11fac22d9a16b2468a19bf4e50c354a3f6806831fbcb2ab07d5cbe74c4ccd6bbeeb178abeeee700da0dbfdb0281f79b173b22a2ce9a
+  data.tar.gz: ea88184a6b3b3be56604b90af426c4c491f735dc5951854710bfeda55a1c4b930b76190845cb90b512d4e9e2f9a1f3b746478f232d10529c8a6971e448ab1419

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v2.11.0](https://github.com/bensheldon/good_job/tree/v2.11.0) (2022-02-27)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.10.0...v2.11.0)
+
+**Closed issues:**
+
+- How do I ensure that a the same job can't run twice? \(unique job / avoid duplicates\) [\#531](https://github.com/bensheldon/good_job/issues/531)
+- Bulk reschedule and discard jobs via dashboard [\#527](https://github.com/bensheldon/good_job/issues/527)
+- "Live Poll" dashboard [\#526](https://github.com/bensheldon/good_job/issues/526)
+
+**Merged pull requests:**
+
+- Add support for live polling the dashboard [\#528](https://github.com/bensheldon/good_job/pull/528) ([danielwestendorf](https://github.com/danielwestendorf))
+
 ## [v2.10.0](https://github.com/bensheldon/good_job/tree/v2.10.0) (2022-02-18)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.9.6...v2.10.0)

data/README.md

@@ -369,6 +369,10 @@ GoodJob includes a Dashboard as a mountable `Rails::Engine`.
     end
     ```
 
+#### Live Polling
+
+The Dashboard can be set to automatically refresh by checking "Live Poll" in the Dashboard header, or by setting `?poll=10` with the interval in seconds (default 30 seconds).
+
 ### ActiveJob concurrency
 
 GoodJob can extend ActiveJob to provide limits on concurrently running jobs, either at time of _enqueue_ or at _perform_. Limiting concurrency can help prevent duplicate, double or unecessary jobs from being enqueued, or race conditions when performing, for example when interacting with 3rd-party APIs.

data/engine/app/assets/scripts.js

@@ -1 +1,133 @@
-GoodJob = {};
+/*jshint esversion: 6, strict: false */
+const GOOD_JOB_DEFAULT_POLL_INTERVAL_SECONDS = 30;
+const GOOD_JOB_MINIMUM_POLL_INTERVAL = 1000;
+
+const GoodJob = {
+  // Register functions to execute when the DOM is ready
+  ready: (callback) => {
+    if (document.readyState !== "loading") {
+      callback();
+    } else {
+      document.addEventListener("DOMContentLoaded", callback);
+    }
+  },
+
+  init: () => {
+    GoodJob.updateSettings();
+    GoodJob.addListeners();
+    GoodJob.pollUpdates();
+    GoodJob.renderCharts(true);
+  },
+
+  addListeners: () => {
+    const gjActionEls = document.querySelectorAll('[data-gj-action]');
+
+    for (let i = 0; i < gjActionEls.length; i++) {
+      const el = gjActionEls[i];
+      const [eventName, func] = el.dataset.gjAction.split('#');
+
+      el.addEventListener(eventName, GoodJob[func]);
+    }
+  },
+
+  updateSettings: () => {
+    const queryString = window.location.search;
+    const urlParams = new URLSearchParams(queryString);
+
+    // live poll interval and enablement
+    if (urlParams.has('poll')) {
+      const parsedInterval = (parseInt(urlParams.get('poll')) || GOOD_JOB_DEFAULT_POLL_INTERVAL_SECONDS) * 1000;
+
+      GoodJob.pollEnabled = true;
+      GoodJob.pollInterval = Math.max(parsedInterval, GOOD_JOB_MINIMUM_POLL_INTERVAL);
+      GoodJob.setStorage('pollInterval', GoodJob.pollInterval);
+    } else {
+      GoodJob.pollEnabled = GoodJob.getStorage('pollEnabled') || false;
+      GoodJob.pollInterval = GoodJob.getStorage('pollInterval') || GOOD_JOB_DEFAULT_POLL_INTERVAL_SECONDS;
+    }
+
+    document.getElementById('toggle-poll').checked = GoodJob.pollEnabled;
+  },
+
+  togglePoll: (ev) => {
+    GoodJob.pollEnabled = ev.currentTarget.checked;
+    GoodJob.setStorage('pollEnabled', GoodJob.pollEnabled);
+  },
+
+  pollUpdates: () => {
+    setTimeout(() => {
+      if (GoodJob.pollEnabled === true) {
+        fetch(window.location.href)
+          .then(resp => resp.text())
+          .then(GoodJob.updateContent)
+          .finally(GoodJob.pollUpdates);
+      } else {
+        GoodJob.pollUpdates();
+      }
+    }, GoodJob.pollInterval);
+  },
+
+  updateContent: (newContent) => {
+    const domParser = new DOMParser();
+    const parsedDOM = domParser.parseFromString(newContent, "text/html");
+
+    const newElements = parsedDOM.querySelectorAll('[data-gj-poll-replace]');
+
+    for (let i = 0; i < newElements.length; i++) {
+      const newEl = newElements[i];
+      const oldEl = document.getElementById(newEl.id);
+
+      if (oldEl) {
+        oldEl.replaceWith(newEl);
+      }
+    }
+
+    GoodJob.renderCharts(false);
+  },
+
+  renderCharts: (animate) => {
+    const charts = document.querySelectorAll('.chart');
+
+    for (let i = 0; i < charts.length; i++) {
+      const chartEl = charts[i];
+      const chartData = JSON.parse(chartEl.dataset.json);
+
+      const ctx = chartEl.getContext('2d');
+      const chart = new Chart(ctx, {
+        type: 'line',
+        data: {
+          labels: chartData.labels,
+          datasets: chartData.datasets
+        },
+        options: {
+          animation: animate,
+          responsive: true,
+          maintainAspectRatio: false,
+          scales: {
+            y: {
+              beginAtZero: true
+            }
+          }
+        }
+      });
+    }
+  },
+
+  getStorage: (key) => {
+    const value = localStorage.getItem('good_job-' + key);
+
+    if (value === 'true') {
+      return true;
+    } else if (value === 'false') {
+      return false;
+    } else {
+      return value;
+    }
+  },
+
+  setStorage: (key, value) => {
+    localStorage.setItem('good_job-' + key, value);
+  }
+};
+
+GoodJob.ready(GoodJob.init);

data/engine/app/views/good_job/executions/_table.erb

@@ -1,4 +1,4 @@
-<div class="card my-3">
+<div class="card my-3" data-gj-poll-replace id="executions-table">
   <div class="table-responsive">
     <table class="table card-table table-bordered table-hover table-sm mb-0" id="executions_index_table">
       <thead>

data/engine/app/views/good_job/executions/index.html.erb

@@ -1,4 +1,4 @@
-<div class="card my-3 p-6">
+<div class="card my-3 p-6" data-gj-poll-replace id="executions-chart">
   <%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
 </div>
 
@@ -7,7 +7,7 @@
 <%= render 'good_job/executions/table', executions: @filter.records %>
 
 <% if @filter.records.present? %>
-  <nav aria-label="Job pagination" class="mt-3">
+  <nav aria-label="Job pagination" class="mt-3" data-gj-poll-replace id="executions-pagination">
     <ul class="pagination">
       <li class="page-item">
         <%= link_to({ after_scheduled_at: (@filter.last.scheduled_at || @filter.last.created_at), after_id: @filter.last.id }, class: "page-link") do %>

data/engine/app/views/good_job/jobs/_table.erb

@@ -1,4 +1,4 @@
-<div class="card my-3">
+<div class="card my-3" data-gj-poll-replace id="jobs-table">
   <div class="table-responsive">
     <table class="table card-table table-bordered table-hover table-sm mb-0">
       <thead>

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

@@ -2,7 +2,7 @@
   <h2>All Jobs</h2>
 </div>
 
-<div class="card my-3 p-6">
+<div class="card my-3 p-6" data-gj-poll-replace id="jobs-chart">
   <%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
 </div>
 
@@ -11,7 +11,7 @@
 <%= render 'good_job/jobs/table', jobs: @filter.records %>
 
 <% if @filter.records.present? %>
-  <nav aria-label="Job pagination" class="mt-3">
+  <nav aria-label="Job pagination" class="mt-3" data-gj-poll-replace id="jobs-pagination">
     <ul class="pagination">
       <li class="page-item">
         <%= link_to(@filter.to_params(after_scheduled_at: (@filter.last.scheduled_at || @filter.last.created_at), after_id: @filter.last.id), class: "page-link") do %>

data/engine/app/views/good_job/processes/index.html.erb

@@ -2,43 +2,45 @@
   <h2>Processes</h2>
 </div>
 
-<% if !GoodJob::Process.migrated? %>
-  <div class="card my-3">
-    <div class="card-body">
-      <p class="card-text">
-        <em>Feature unavailable because of pending database migration.</em>
-      </p>
+<div data-gj-poll-replace id="processes">
+  <% if !GoodJob::Process.migrated? %>
+    <div class="card my-3">
+      <div class="card-body">
+        <p class="card-text">
+          <em>Feature unavailable because of pending database migration.</em>
+        </p>
+      </div>
     </div>
-  </div>
-<% elsif @processes.present? %>
-  <div class="card my-3">
-    <div class="table-responsive">
-      <table class="table card-table table-bordered table-hover table-sm mb-0">
-        <thead>
-        <tr>
-          <th>Process UUID</th>
-          <th>Created At</th></th>
-          <th>State</th>
-        </tr>
-        </thead>
-        <tbody>
-        <% @processes.each do |process| %>
-          <tr class="<%= dom_class(process) %>" id="<%= dom_id(process) %>">
-            <td><%= process.id %></td>
-            <td><%= relative_time(process.created_at) %></td>
-            <td><%= tag.pre JSON.pretty_generate(process.state) %></td>
+  <% elsif @processes.present? %>
+    <div class="card my-3">
+      <div class="table-responsive">
+        <table class="table card-table table-bordered table-hover table-sm mb-0">
+          <thead>
+          <tr>
+            <th>Process UUID</th>
+            <th>Created At</th></th>
+            <th>State</th>
           </tr>
-        <% end %>
-        </tbody>
-      </table>
+          </thead>
+          <tbody>
+          <% @processes.each do |process| %>
+            <tr class="<%= dom_class(process) %>" id="<%= dom_id(process) %>">
+              <td><%= process.id %></td>
+              <td><%= relative_time(process.created_at) %></td>
+              <td><%= tag.pre JSON.pretty_generate(process.state) %></td>
+            </tr>
+          <% end %>
+          </tbody>
+        </table>
+      </div>
     </div>
-  </div>
-<% else %>
-  <div class="card my-3">
-    <div class="card-body">
-      <p class="card-text">
-        <em>No GoodJob processes found.</em>
-      </p>
+  <% else %>
+    <div class="card my-3">
+      <div class="card-body">
+        <p class="card-text">
+          <em>No GoodJob processes found.</em>
+        </p>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
+</div>

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

@@ -1,25 +1,3 @@
 <div class="chart-wrapper">
-  <canvas id="chart"></canvas>
+  <canvas class="chart" data-json="<%= chart_data.to_json %>"></canvas>
 </div>
-
-<%= javascript_tag nonce: true do %>
-  const chartData = <%== chart_data.to_json %>;
-
-  const ctx = document.getElementById('chart').getContext('2d');
-  const chart = new Chart(ctx, {
-    type: 'line',
-    data: {
-      labels: chartData.labels,
-      datasets: chartData.datasets
-    },
-    options: {
-      responsive: true,
-      maintainAspectRatio: false,
-      scales: {
-        y: {
-          beginAtZero: true
-        }
-      }
-    }
-  });
-<% end %>

data/engine/app/views/good_job/shared/_filter.erb

@@ -1,4 +1,5 @@
 <%= form_with(url: "", method: :get, local: true, id: "filter_form") do |form| %>
+  <%= hidden_field_tag :poll, value: params[:poll] %>
   <div class="d-flex flex-row w-100">
     <div class="me-2">
       <label for="job_class_filter">Job class</label>
@@ -55,4 +56,4 @@
       });
     })
   })
-<% end %>
+<% end %>

data/engine/app/views/layouts/good_job/base.html.erb

@@ -45,7 +45,10 @@
             </div>
           </li>
         </ul>
-        <div class="text-muted" title="Now is <%= Time.current %>">Times are displayed in <%= Time.current.zone %> timezone</div>
+        <div>
+          <input type="checkbox" id="toggle-poll" name="toggle-poll" data-gj-action='change#togglePoll' <%= 'checked' if params[:poll].present? %>>
+          <label for="toggle-poll">Live Poll</label>
+        </div>
       </div>
     </div>
   </nav>
@@ -70,7 +73,24 @@
         <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
       </div>
     <% end %>
+
     <%= yield %>
   </div>
+
+  <footer class="footer mt-auto py-3 bg-light fixed-bottom" id="footer" data-gj-poll-replace>
+    <div class="container-fluid">
+      <div class="row">
+        <div class="col-6">
+          <span class="text-muted">
+            Last updated: <time id="page-updated-at" datetime="<%= Time.current.utc.iso8601 %>"><%= Time.current %></time>
+          </span>
+        </div>
+
+        <div class="col-6 text-end">
+          Remember, you're doing a Good Job too!
+        </div>
+      </div>
+    </div>
+  </footer>
 </body>
 </html>

data/lib/good_job/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '2.10.0'
+  VERSION = '2.11.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob