RubyGems - good_job - Versions diffs - 2.12.1 → 2.13.1 - Mend

good_job 2.12.1 → 2.13.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +47 -0
data/engine/app/assets/modules/application.js +12 -0
data/engine/app/assets/modules/charts.js +29 -0
data/engine/app/assets/modules/document_ready.js +7 -0
data/engine/app/assets/modules/poller.js +93 -0
data/engine/app/assets/modules/toasts.js +8 -0
data/engine/app/assets/scripts.js +1 -131
data/engine/app/assets/style.css +9 -3
data/engine/app/assets/vendor/es_module_shims.js +1 -0
data/engine/app/controllers/good_job/assets_controller.rb +17 -0
data/engine/app/controllers/good_job/executions_controller.rb +1 -5
data/engine/app/controllers/good_job/jobs_controller.rb +1 -1
data/engine/app/views/good_job/cron_entries/show.html.erb +4 -2
data/engine/app/views/good_job/executions/_table.erb +2 -2
data/engine/app/views/good_job/jobs/_table.erb +2 -2
data/engine/app/views/good_job/jobs/index.html.erb +2 -10
data/engine/app/views/good_job/shared/_alert.erb +20 -13
data/engine/app/views/good_job/shared/_chart.erb +4 -2
data/engine/app/views/good_job/shared/_filter.erb +58 -50
data/engine/app/views/good_job/shared/_footer.erb +2 -4
data/engine/app/views/good_job/shared/_navbar.erb +5 -8
data/engine/app/views/layouts/good_job/application.html.erb +17 -12
data/engine/config/locales/en.yml +2 -3
data/engine/config/locales/es.yml +1 -2
data/engine/config/locales/nl.yml +52 -0
data/engine/config/locales/ru.yml +76 -0
data/engine/config/routes.rb +5 -3
data/lib/good_job/adapter.rb +2 -2
data/lib/good_job/version.rb +1 -1
metadata +10 -5
data/engine/app/filters/good_job/executions_filter.rb +0 -41
data/engine/app/views/good_job/executions/index.html.erb +0 -19
data/engine/config/locales/ru.yaml +0 -53

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53c32b60d9ee966dd7dcb05f5add8f3ab7bcd666a224019d91b0e07e54a366b4
-  data.tar.gz: 7abcb16ceb51272d9fc6297491c55500b97a2839c6158c24d9779841b179c721
+  metadata.gz: 6d8b2b2738eb9ae693690016074fd4624a5c5cc78abd5d87d416202e5671281e
+  data.tar.gz: dbb67bc97bdeca64de1a6bb9b7c1fd16bf51a5fa048bf1d87ca637860d6e80eb
 SHA512:
-  metadata.gz: a65fc3d71709b9c4ee611f79e3678b9ef910d8480757037fd25f83f9d783eff40134b0b15fad873d31fb60c576872a93fd64bc2c7f0f2ba9b4ce0d751984925c
-  data.tar.gz: eea513879d7cdbb872938469a62672d886156a92f63a61c88e8a62c816a218bc325be1b705d1e1f7f7a43626ba2910bd108ea14303b6a15b59674a85eddf1f58
+  metadata.gz: 4bb91a8ab93b89c82084f58198d6dcdbcab5e44e3b42cdf6eb2f94fdd895bf126d146cfd6e314ea69830ed0013dd66796c727c2a2b48e0a7456089252b987faa
+  data.tar.gz: 6b86d012b1deb3c71f5cfd4bb69ac680eee1b18cb35849d24adc0ad8ef2b4689c217b39984b4bf7af3075395bf3464d0c1fd1198e7f67c083b1ddcbd32950bb5

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,52 @@
 # Changelog
+## [v2.13.1](https://github.com/bensheldon/good_job/tree/v2.13.1) (2022-04-22)
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.13.0...v2.13.1)
+**Fixed bugs:**
+- `ActionMailer::MailDeliveryJob` executing twice [\#329](https://github.com/bensheldon/good_job/issues/329)
+- Email job breaks dashboard [\#313](https://github.com/bensheldon/good_job/issues/313)
+**Closed issues:**
+- Possible encryption feature? [\#561](https://github.com/bensheldon/good_job/issues/561)
+- Inconsistencies in configuration settings [\#380](https://github.com/bensheldon/good_job/issues/380)
+- Lockable should accept an explicit keys on class methods too [\#341](https://github.com/bensheldon/good_job/issues/341)
+- Run Scheduler\#cache\_warm on global thread pool instead of Scheduler's thread pool [\#286](https://github.com/bensheldon/good_job/issues/286)
+**Merged pull requests:**
+- Dashboard: Use toasts to show notices and alerts [\#577](https://github.com/bensheldon/good_job/pull/577) ([bkeepers](https://github.com/bkeepers))
+- Remove executions from the dashboard [\#576](https://github.com/bensheldon/good_job/pull/576) ([bkeepers](https://github.com/bkeepers))
+- Use javascript importmaps for Dashboard [\#574](https://github.com/bensheldon/good_job/pull/574) ([bensheldon](https://github.com/bensheldon))
+## [v2.13.0](https://github.com/bensheldon/good_job/tree/v2.13.0) (2022-04-19)
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.12.2...v2.13.0)
+**Implemented enhancements:**
+- Dashboard UI updates: sticky navbar, statuses as tabs [\#572](https://github.com/bensheldon/good_job/pull/572) ([bkeepers](https://github.com/bkeepers))
+**Closed issues:**
+- Internationalize/I18n the Dashboard Engine [\#408](https://github.com/bensheldon/good_job/issues/408)
+**Merged pull requests:**
+- Fix Russian translation linting [\#573](https://github.com/bensheldon/good_job/pull/573) ([bensheldon](https://github.com/bensheldon))
+## [v2.12.2](https://github.com/bensheldon/good_job/tree/v2.12.2) (2022-04-18)
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v2.12.1...v2.12.2)
+**Merged pull requests:**
+- Dashboard: added NL translations [\#568](https://github.com/bensheldon/good_job/pull/568) ([eelcoj](https://github.com/eelcoj))
+- Un-deprecate Adapter's `execution_mode` argument [\#567](https://github.com/bensheldon/good_job/pull/567) ([bensheldon](https://github.com/bensheldon))
 ## [v2.12.1](https://github.com/bensheldon/good_job/tree/v2.12.1) (2022-04-18)
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v2.12.0...v2.12.1)

data/engine/app/assets/modules/application.js ADDED Viewed

@@ -0,0 +1,12 @@
+/*jshint esversion: 6, strict: false */
+import documentReady from "document_ready";
+import showToasts from "toasts";
+import renderCharts from "charts";
+import Poller from "poller";
+documentReady(function() {
+  renderCharts();
+  showToasts();
+  Poller.start();
+});

data/engine/app/assets/modules/charts.js ADDED Viewed

@@ -0,0 +1,29 @@
+function 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
+          }
+        }
+      }
+    });
+  }
+}
+export { renderCharts as default };

data/engine/app/assets/modules/document_ready.js ADDED Viewed

@@ -0,0 +1,7 @@
+export default function documentReady(callback) {
+  if (document.readyState !== "loading") {
+    callback();
+  } else {
+    document.addEventListener("DOMContentLoaded", callback);
+  }
+}

data/engine/app/assets/modules/poller.js ADDED Viewed

@@ -0,0 +1,93 @@
+/*jshint esversion: 6, strict: false */
+import renderCharts from "charts";
+// NOTE: this file is a bit disorganized. Please do not use it as a template for how to organize a JS module.
+const DEFAULT_POLL_INTERVAL_SECONDS = 30;
+const MINIMUM_POLL_INTERVAL = 1000;
+function getStorage(key) {
+  const value = localStorage.getItem('good_job-' + key);
+  if (value === 'true') {
+    return true;
+  } else if (value === 'false') {
+    return false;
+  } else {
+    return value;
+  }
+}
+function setStorage(key, value) {
+  localStorage.setItem('good_job-' + key, value);
+}
+function updatePageContent(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);
+    }
+  }
+  renderCharts(false);
+}
+function refreshPage() {
+  fetch(window.location.href)
+    .then(resp => resp.text())
+    .then(updatePageContent);
+}
+const Poller = {
+  start: () => {
+    Poller.updateSettings();
+    Poller.pollUpdates();
+    const checkbox = document.querySelector('input[name="toggle-poll"]');
+    checkbox.addEventListener('change', Poller.togglePoll)
+  },
+  togglePoll: (event) => {
+    Poller.pollEnabled = event.currentTarget.checked;
+    setStorage('pollEnabled', Poller.pollEnabled);
+  },
+  updateSettings: () => {
+    const queryString = window.location.search;
+    const urlParams = new URLSearchParams(queryString);
+    if (urlParams.has('poll')) {
+      const parsedInterval = (parseInt(urlParams.get('poll')) || DEFAULT_POLL_INTERVAL_SECONDS) * 1000;
+      Poller.pollInterval = Math.max(parsedInterval, MINIMUM_POLL_INTERVAL);
+      setStorage('pollInterval', Poller.pollInterval);
+      Poller.pollEnabled = true;
+    } else {
+      Poller.pollInterval = getStorage('pollInterval') || (DEFAULT_POLL_INTERVAL_SECONDS * 1000);
+      Poller.pollEnabled = getStorage('pollEnabled') || false;
+    }
+    document.getElementById('toggle-poll').checked = Poller.pollEnabled;
+  },
+  pollUpdates: () => {
+    setTimeout(() => {
+      if (Poller.pollEnabled === true) {
+        refreshPage();
+        Poller.pollUpdates();
+      } else {
+        Poller.pollUpdates();
+      }
+    }, Poller.pollInterval);
+  },
+};
+export { Poller as default };

data/engine/app/assets/modules/toasts.js ADDED Viewed

@@ -0,0 +1,8 @@
+export default function showToasts() {
+  const toasts = document.querySelectorAll('.toast');
+  for (let i = 0; i < toasts.length; i++) {
+    var toast = new bootstrap.Toast(toasts[i])
+    toast.show()
+  }
+}

data/engine/app/assets/scripts.js CHANGED Viewed

@@ -1,133 +1,3 @@
 /*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.pollInterval = Math.max(parsedInterval, GOOD_JOB_MINIMUM_POLL_INTERVAL);
-      GoodJob.setStorage('pollInterval', GoodJob.pollInterval);
-      GoodJob.pollEnabled = true;
-    } else {
-      GoodJob.pollInterval = GoodJob.getStorage('pollInterval') || (GOOD_JOB_DEFAULT_POLL_INTERVAL_SECONDS * 1000);
-      GoodJob.pollEnabled = GoodJob.getStorage('pollEnabled') || false;
-    }
-    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);
+import "application"; // ./modules/application.js

data/engine/app/assets/style.css CHANGED Viewed

@@ -24,7 +24,13 @@
   height: 200px;
 }
-body {
-  /* Make room for the sticky footer */
-  margin-bottom: 100px;
+/* Break out of a container */
+.break-out {
+  width:100vw;
+  position:relative;
+  left:calc(-1 * (100vw - 100%)/2);
+}
+.toast-container {
+  z-index: 1;
 }

data/engine/app/assets/vendor/es_module_shims.js ADDED Viewed

@@ -0,0 +1 @@

data/engine/app/controllers/good_job/assets_controller.rb CHANGED Viewed

@@ -3,10 +3,21 @@ module GoodJob
   class AssetsController < ActionController::Base # rubocop:disable Rails/ApplicationController
     skip_before_action :verify_authenticity_token, raise: false
+    def self.js_modules
+      @_js_modules ||= GoodJob::Engine.root.join("app", "assets", "modules").children.select(&:file?).each_with_object({}) do |file, modules|
+        key = File.basename(file.basename.to_s, ".js").to_sym
+        modules[key] = file
+      end
+    end
     before_action do
       expires_in 1.year, public: true
     end
+    def es_module_shims_js
+      render file: GoodJob::Engine.root.join("app", "assets", "vendor", "es_module_shims.js")
+    end
     def bootstrap_css
       render file: GoodJob::Engine.root.join("app", "assets", "vendor", "bootstrap", "bootstrap.min.css")
     end
@@ -30,5 +41,11 @@ module GoodJob
     def style_css
       render file: GoodJob::Engine.root.join("app", "assets", "style.css")
     end
+    def modules_js
+      module_name = params[:module].to_sym
+      module_file = self.class.js_modules.fetch(module_name) { raise ActionController::RoutingError, 'Not Found' }
+      render file: module_file
+    end
   end
 end

data/engine/app/controllers/good_job/executions_controller.rb CHANGED Viewed

@@ -1,14 +1,10 @@
 # frozen_string_literal: true
 module GoodJob
   class ExecutionsController < GoodJob::ApplicationController
-    def index
-      @filter = ExecutionsFilter.new(params)
-    end
     def destroy
       deleted_count = GoodJob::Execution.where(id: params[:id]).delete_all
       message = deleted_count.positive? ? { notice: "Job execution deleted" } : { alert: "Job execution not deleted" }
-      redirect_back fallback_location: root_path, **message
+      redirect_back fallback_location: jobs_path, **message
     end
   end
 end

data/engine/app/controllers/good_job/jobs_controller.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module GoodJob
     def show
       @executions = GoodJob::Execution.active_job_id(params[:id])
                                       .order(Arel.sql("COALESCE(scheduled_at, created_at) DESC"))
-      redirect_to root_path, alert: "Executions for Active Job #{params[:id]} not found" if @executions.empty?
+      redirect_to jobs_path, alert: "Executions for Active Job #{params[:id]} not found" if @executions.empty?
     end
     def discard

data/engine/app/views/good_job/cron_entries/show.html.erb CHANGED Viewed

@@ -1,4 +1,6 @@
-<h1 class="mb-3">Cron Entry Key: <code><%= @cron_entry.id %></code></h1>
+<% title = capture do %>
+  Cron Entry Key: <code><%= @cron_entry.id %></code>
+<% end %>
-<%= render 'good_job/shared/filter', filter: @jobs_filter %>
+<%= render 'good_job/shared/filter', title: title, filter: @jobs_filter %>
 <%= render 'good_job/jobs/table', jobs: @jobs_filter.records %>

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

@@ -1,6 +1,6 @@
-<div class="card my-3" data-gj-poll-replace id="executions-table">
+<div class="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">
+    <table class="table table-hover table-sm mb-0" id="executions_index_table">
       <thead>
         <tr>
           <th>ActiveJob ID</th>

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

@@ -1,6 +1,6 @@
-<div class="card my-3" data-gj-poll-replace id="jobs-table">
+<div class="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">
+    <table class="table table-hover table-sm mb-0">
       <thead>
         <tr>
           <th>ActiveJob ID</th>

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

@@ -1,13 +1,5 @@
-<div class="my-3 flex">
-  <h2>All Jobs</h2>
-</div>
-<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>
-<%= render 'good_job/shared/filter', filter: @filter %>
+<%= render 'good_job/shared/filter', title: "Jobs", filter: @filter %>
+<%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
 <%= render 'good_job/jobs/table', jobs: @filter.records %>
 <% if @filter.records.present? %>

data/engine/app/views/good_job/shared/_alert.erb CHANGED Viewed

@@ -1,13 +1,20 @@
-<% if notice %>
-  <div class="alert alert-success alert-dismissible fade show d-flex align-items-center offset-md-3 col-6" role="alert">
-    <%= render "good_job/shared/icons/check", class: "flex-shrink-0 me-2" %>
-    <div><%= notice %></div>
-    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-  </div>
-<% elsif alert %>
-  <div class="alert alert-warning alert-dismissible fade show d-flex align-items-center offset-md-3 col-6" role="alert">
-    <%= render "good_job/shared/icons/exclamation", class: "flex-shrink-0 me-2" %>
-    <div><%= alert %></div>
-    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-  </div>
-<% end %>
+<div class="toast-container position-fixed p-3 start-50 translate-middle-x">
+  <% if notice %>
+    <div class="toast" role="alert" aria-live="assertive" aria-atomic="true">
+      <div class="toast-body d-flex align-items-center gap-2">
+        <%= render "good_job/shared/icons/check", class: "flex-shrink-0 text-success" %>
+        <div class="flex-fill"><%= notice %></div>
+        <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
+      </div>
+    </div>
+  <% end %>
+  <% if alert %>
+    <div class="toast" role="alert" aria-live="assertive" aria-atomic="true">
+      <div class="toast-body d-flex align-items-center gap-2">
+        <%= render "good_job/shared/icons/exclamation", class: "flex-shrink-0 text-danger" %>
+        <div class="flex-fill"><%= alert %></div>
+        <button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close"></button>
+      </div>
+    </div>
+  <% end %>
+</div>

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

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

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

@@ -1,59 +1,67 @@
-<%= 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>
-      <select name="job_class" id="job_class_filter" class="form-select">
-        <option value="" <%= "selected='selected'" if params[:job_class].blank? %>>All jobs</option>
-        <% filter.job_classes.each do |name, count| %>
-          <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:job_class] == name %>><%= name %> (<%= count %>)</option>
-        <% end %>
-      </select>
-    </div>
+<div data-gj-poll-replace id="filter">
+  <div class="bg-light break-out">
+    <h2 class="container-fluid pt-3 pb-2"><%= title %></h2>
-    <div class="me-2">
-      <label for="job_state_filter">State</label>
-      <select name="state" id="job_state_filter" class="form-select">
-        <option value="" <%= "selected='selected'" if params[:state].blank? %>>All states</option>
+    <ul class="nav nav-tabs bg-light px-3 mb-3">
+      <li class="nav-item">
+        <%= link_to "All", url_for(state: nil), class: "nav-link #{"active" unless params[:state]}" %>
+      </li>
-        <% filter.states.each do |name, count| %>
-          <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:state] == name %>><%= name %> (<%= count %>)</option>
-        <% end %>
-      </select>
-    </div>
+      <% filter.states.each do |name, count| %>
+        <li class="nav-item">
+          <%= link_to url_for({state: name}), class: "nav-link #{"active" if params[:state] == name}" do %>
+            <%= name.titleize %>
+            <span class="badge bg-primary rounded-pill <%= "bg-secondary" if count == 0 %>"><%= count %></span>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
-    <div class="me-2">
-      <label for="job_queue_filter">Queue</label>
-      <select name="queue_name" id="job_queue_filter" class="form-select">
-        <option value="" <%= "selected='selected'" if params[:queue_name].blank? %>>All queues</option>
+  <%= form_with(url: "", method: :get, local: true, id: "filter_form", class: "container-fluid") do |form| %>
+    <%= hidden_field_tag :poll, params[:poll] %>
+    <%= hidden_field_tag :state, params[:state] %>
+    <div class="d-flex flex-row w-100">
+      <div class="me-2">
+        <select name="job_class" id="job_class_filter" class="form-select form-select-sm">
+          <option value="" <%= "selected='selected'" if params[:job_class].blank? %>>All jobs</option>
-        <% filter.queues.each do |name, count| %>
-          <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:queue_name] == name %>><%= name %> (<%= count %>)</option>
-        <% end %>
-      </select>
-    </div>
+          <% filter.job_classes.each do |name, count| %>
+            <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:job_class] == name %>><%= name %> (<%= count %>)</option>
+          <% end %>
+        </select>
+      </div>
-    <div class="me-2 flex-fill d-flex flex-col align-items-end">
-      <label class="visually-hidden" for="query" aria-label="Search by class, job id, job params, and error text.">Search by class, job id, job params, and error text.</label>
-      <%= search_field_tag "query", params[:query], class: "form-control", placeholder: "Search by class, job id, job params, and error text." %>
-    </div>
+      <div class="me-2">
+        <select name="queue_name" id="job_queue_filter" class="form-select form-select-sm">
+          <option value="" <%= "selected='selected'" if params[:queue_name].blank? %>>All queues</option>
-    <div class="d-flex flex-col align-items-end">
-      <div>
-        <%= form.submit "Search", name: nil, class: "btn btn-primary" %>
-        <%= link_to "Clear all", filter.to_params(job_class: nil, state: nil, queue_name: nil, query: nil), class: "btn btn-secondary" %>
+          <% filter.queues.each do |name, count| %>
+            <option value="<%= name.to_param %>" <%= "selected='selected'" if params[:queue_name] == name %>><%= name %> (<%= count %>)</option>
+          <% end %>
+        </select>
+      </div>
+      <div class="me-2 flex-fill">
+        <%= search_field_tag "query", params[:query], class: "form-control form-control-sm", placeholder: "Search by class, job id, job params, and error text." %>
+      </div>
+      <div class="d-flex flex-col align-items-end">
+        <div>
+          <%= form.submit "Search", name: nil, class: "btn btn-primary btn-sm" %>
+          <%= link_to "Clear all", filter.to_params(job_class: nil, state: nil, queue_name: nil, query: nil), class: "btn btn-secondary btn-sm" %>
+        </div>
       </div>
     </div>
-  </div>
-<% end %>
-<%= javascript_tag nonce: true do %>
-  document.addEventListener("DOMContentLoaded", () => {
-    document.querySelectorAll("#job_class_filter, #job_state_filter, #job_queue_filter").forEach((filter) => {
-      filter.addEventListener("change", () => {
-        document.querySelector("#filter_form").submit();
-      });
+  <% end %>
+  <%= javascript_tag nonce: true do %>
+    document.addEventListener("DOMContentLoaded", () => {
+      document.querySelectorAll("#job_class_filter, #job_queue_filter").forEach((filter) => {
+        filter.addEventListener("change", () => {
+          document.querySelector("#filter_form").submit();
+        });
+      })
     })
-  })
-<% end %>
+  <% end %>
+</div>

data/engine/app/views/good_job/shared/_footer.erb CHANGED Viewed

@@ -1,10 +1,8 @@
-<footer class="footer mt-auto py-3 bg-light fixed-bottom" id="footer" data-gj-poll-replace>
+<footer class="footer mt-auto py-3 bg-light border-top text-muted small" id="footer" data-gj-poll-replace>
   <div class="container-fluid">
     <div class="row">
       <div class="col-6">
-        <span class="text-muted">
-          <%= t(".last_update_html", time: Time.current.utc.iso8601) %>
-        </span>
+        <%= t(".last_update_html", time: Time.current.utc.iso8601) %>
       </div>
       <div class="col-6 text-end">

data/engine/app/views/good_job/shared/_navbar.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-lg navbar-light bg-light">
+<nav class="navbar navbar-expand-lg navbar-light border-bottom bg-white sticky-top shadow-sm">
   <div class="container-fluid">
     <%= link_to t(".name"), root_path, class: "navbar-brand mb-0 h1" %>
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
@@ -8,21 +8,18 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav me-auto">
         <li class="nav-item">
-          <%= link_to t(".executions"), root_path, class: ["nav-link", ("active" if current_page?(root_path))] %>
+          <%= link_to t(".jobs"), jobs_path, class: ["nav-link", ("active" if controller_name == 'jobs')] %>
         </li>
         <li class="nav-item">
-          <%= link_to t(".jobs"), jobs_path, class: ["nav-link", ("active" if current_page?(jobs_path))] %>
+          <%= link_to t(".cron_schedules"), cron_entries_path, class: ["nav-link", ("active" if controller_name == 'cron_entries')] %>
         </li>
         <li class="nav-item">
-          <%= link_to t(".cron_schedules"), cron_entries_path, class: ["nav-link", ("active" if current_page?(cron_entries_path))] %>
-        </li>
-        <li class="nav-item">
-          <%= link_to t(".processes"), processes_path, class: ["nav-link", ("active" if current_page?(processes_path))] %>
+          <%= link_to t(".processes"), processes_path, class: ["nav-link", ("active" if  controller_name == 'processes')] %>
         </li>
       </ul>
       <div class="nav-item pe-2">
         <div class="form-check">
-          <input type="checkbox" id="toggle-poll" name="toggle-poll" data-gj-action='change#togglePoll' <%= 'checked' if params[:poll].present? %>>
+          <input type="checkbox" id="toggle-poll" name="toggle-poll" <%= 'checked' if params[:poll].present? %>>
           <label for="toggle-poll"><%= t(".live_poll") %></label>
         </div>
       </div>

data/engine/app/views/layouts/good_job/application.html.erb CHANGED Viewed

@@ -7,25 +7,30 @@
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
-  <%# Assets must use *_url route helpers to avoid being overriden by config.asset_host %>
-  <%= stylesheet_link_tag bootstrap_url(format: :css, v: GoodJob::VERSION), skip_pipeline: true %>
-  <%= stylesheet_link_tag style_url(format: :css, v: GoodJob::VERSION) %>
+  <%# Do not use asset tag helpers to avoid paths being overriden by config.asset_host %>
+  <%= tag.link rel: "stylesheet", media: "screen", href: bootstrap_path(format: :css, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+  <%= tag.link rel: "stylesheet", media: "screen", href: style_path(format: :css, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-  <%= javascript_include_tag bootstrap_url(format: :js, v: GoodJob::VERSION), nonce: true %>
-  <%= javascript_include_tag chartjs_url(format: :js, v: GoodJob::VERSION), nonce: true %>
-  <%= javascript_include_tag scripts_url(format: :js, v: GoodJob::VERSION), nonce: true %>
+  <%= tag.script "", src: bootstrap_path(format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+  <%= tag.script "", src: chartjs_path(format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
+  <%= tag.script "", src: rails_ujs_path(format: :js, v: GoodJob::VERSION, locale: nil), nonce: content_security_policy_nonce %>
-  <%= javascript_include_tag rails_ujs_url(format: :js, v: GoodJob::VERSION), nonce: true %>
+  <%= tag.script "", src: es_module_shims_path(format: :js, v: GoodJob::VERSION, locale: nil), async: true, nonce: content_security_policy_nonce %>
+  <% importmaps = { imports: GoodJob::AssetsController.js_modules.keys.each_with_object({}) { |module_name, imports| imports[module_name] = modules_path(module_name, format: :js, locale: nil, v: GoodJob::VERSION) } } %>
+  <%= tag.script importmaps.to_json.html_safe, type: "importmap", nonce: content_security_policy_nonce %>
+  <%= tag.script "", src: scripts_path(format: :js, v: GoodJob::VERSION, locale: nil), type: "module", nonce: content_security_policy_nonce %>
 </head>
 <body>
-  <%= render "good_job/shared/navbar" %>
+  <div class="d-flex flex-column min-vh-100">
+    <%= render "good_job/shared/navbar" %>
-  <div class="container-fluid">
-    <%= render "good_job/shared/alert" %>
+    <div class="container-fluid flex-grow-1 relative">
+      <%= render "good_job/shared/alert" %>
-    <%= yield %>
-  </div>
+      <%= yield %>
+    </div>
     <%= render "good_job/shared/footer" %>
+  </div>
 </body>
 </html>

data/engine/config/locales/en.yml CHANGED Viewed

@@ -45,9 +45,8 @@ en:
         last_update_html: Last updated <time id="page-updated-at" datetime="%{time}">%{time}</time>
         wording: Remember, you're doing a Good Job too!
       navbar:
-        cron_schedules: Cron Schedules
-        executions: All Executions
-        jobs: All Jobs
+        cron_schedules: Cron
+        jobs: Jobs
         live_poll: Live Poll
         name: "GoodJob 👍"
         processes: Processes

data/engine/config/locales/es.yml CHANGED Viewed

@@ -45,8 +45,7 @@ es:
         last_update_html: Última actualización <time id="page-updated-at" datetime="%{time}">%{time}</time>
         wording: "¡Recuerda, también tú estás haciendo un buen trabajo!"
       navbar:
-        cron_schedules: Tareas Programadas
-        executions: Ejecuciones
+        cron_schedules: Cron
         jobs: Tareas
         live_poll: En vivo
         name: "GoodJob 👍"

data/engine/config/locales/nl.yml ADDED Viewed

@@ -0,0 +1,52 @@
+---
+nl:
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: ongeveer 1 uur
+        other: ongeveer %{count} uren
+      about_x_months:
+        one: ongeveer 1 maand
+        other: ongeveer %{count} maanden
+      about_x_years:
+        one: ongeveer 1 jaar
+        other: ongeveer %{count} jaren
+      almost_x_years:
+        one: bijna 1 jaar
+        other: bijna %{count} jaren
+      half_a_minute: halve minuut
+      less_than_x_minutes:
+        one: minder dan één minuut
+        other: minder dan %{count} minuten
+      less_than_x_seconds:
+        one: minder dan 1 seconde
+        other: minder dan %{count} seconden
+      over_x_years:
+        one: meer dan 1 jaar
+        other: meer dan %{count} jaren
+      x_days:
+        one: 1 dag
+        other: "%{count} dagen"
+      x_minutes:
+        one: 1 minuut
+        other: "%{count} minuten"
+      x_months:
+        one: 1 maand
+        other: "%{count} maanden"
+      x_seconds:
+        one: 1 seconde
+        other: "%{count} seconden"
+      x_years:
+        one: 1 jaar
+        other: "%{count} jaren"
+  good_job:
+    shared:
+      footer:
+        last_update_html: Laatst bijgewerkt <time id="page-updated-at" datetime="%{time}">%{time}</time>
+        wording: 'Onthoud: jij levert ook goed werk!'
+      navbar:
+        cron_schedules: Cron
+        jobs: Taken
+        live_poll: Live Poll
+        name: "GoodJob 👍"
+        processes: Processen

data/engine/config/locales/ru.yml ADDED Viewed

@@ -0,0 +1,76 @@
+---
+ru:
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        few: около %{count} часов
+        many: около %{count} часов
+        one: около 1 часа
+        other: около %{count} часа
+      about_x_months:
+        few: около %{count} месяцев
+        many: около %{count} месяцев
+        one: около 1 месяца
+        other: около %{count} месяца
+      about_x_years:
+        few: около %{count} лет
+        many: около %{count} лет
+        one: около 1 года
+        other: около %{count} лет
+      almost_x_years:
+        few: почти %{count} года
+        many: почти %{count} лет
+        one: почти 1 год
+        other: почти %{count} лет
+      half_a_minute: полминуты
+      less_than_x_minutes:
+        few: меньше %{count} минут
+        many: меньше %{count} минут
+        one: меньше 1 минуты
+        other: меньше %{count} минуты
+      less_than_x_seconds:
+        few: меньше %{count} секунд
+        many: меньше %{count} секунд
+        one: меньше 1 секунды
+        other: меньше %{count} секунды
+      over_x_years:
+        few: больше %{count} лет
+        many: больше %{count} лет
+        one: больше 1 года
+        other: больше %{count} лет
+      x_days:
+        few: "%{count} дня"
+        many: "%{count} дней"
+        one: 1 день
+        other: "%{count} дня"
+      x_minutes:
+        few: "%{count} минуты"
+        many: "%{count} минут"
+        one: 1 минуту
+        other: "%{count} минуты"
+      x_months:
+        few: "%{count} месяца"
+        many: "%{count} месяцев"
+        one: 1 месяц
+        other: "%{count} месяца"
+      x_seconds:
+        few: "%{count} секунды"
+        many: "%{count} секунд"
+        one: 1 секунду
+        other: "%{count} секунды"
+      x_years:
+        few: "%{count} года"
+        many: "%{count} лет"
+        one: 1 год
+        other: "%{count} года"
+  good_job:
+    shared:
+      footer:
+        last_update_html: Последнее обновление <time id="page-updated-at" datetime="%{time}">%{time}</time>
+        wording: Запомни, ты делаешь Good Job тоже!
+      navbar:
+        cron_schedules: Cron
+        jobs: Задачи
+        live_poll: Живой Опрос
+        name: "GoodJob 👍"
+        processes: Процессы

data/engine/config/routes.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 GoodJob::Engine.routes.draw do
-  root to: 'executions#index'
+  root to: redirect(path: 'jobs')
   resources :executions, only: %i[destroy]
@@ -20,7 +20,7 @@ GoodJob::Engine.routes.draw do
   resources :processes, only: %i[index]
-  scope controller: :assets do
+  scope :assets, controller: :assets do
     constraints(format: :css) do
       get :bootstrap, action: :bootstrap_css
       get :style, action: :style_css
@@ -28,8 +28,10 @@ GoodJob::Engine.routes.draw do
     constraints(format: :js) do
       get :bootstrap, action: :bootstrap_js
-      get :rails_ujs, action: :rails_ujs_js
       get :chartjs, action: :chartjs_js
+      get :rails_ujs, action: :rails_ujs_js
+      get :es_module_shims, action: :es_module_shims_js
+      get "modules/:module", action: :modules_js, as: :modules
       get :scripts, action: :scripts_js
     end
   end

data/lib/good_job/adapter.rb CHANGED Viewed

@@ -28,9 +28,9 @@ module GoodJob
     # @param poll_interval [Integer, nil] sets the number of seconds between polls for jobs when +execution_mode+ is set to +:async+. You can also set this with the environment variable +GOOD_JOB_POLL_INTERVAL+. Defaults to +1+.
     # @param start_async_on_initialize [Boolean] whether to start the async scheduler when the adapter is initialized.
     def initialize(execution_mode: nil, queues: nil, max_threads: nil, poll_interval: nil, start_async_on_initialize: nil)
-      if execution_mode || queues || max_threads || poll_interval || start_async_on_initialize
+      if queues || max_threads || poll_interval || start_async_on_initialize
         ActiveSupport::Deprecation.warn(
-          "The GoodJob::Adapter's initialization parameters have been deprecated and will be removed in GoodJob v3. These options should be configured through GoodJob global configuration instead."
+          "GoodJob::Adapter's execution-related arguments (queues, max_threads, poll_interval, start_async_on_initialize) have been deprecated and will be removed in GoodJob v3. These options should be configured through GoodJob global configuration instead."
         )
       end

data/lib/good_job/version.rb CHANGED Viewed

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

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.13.1
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -360,11 +360,17 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- engine/app/assets/modules/application.js
+- engine/app/assets/modules/charts.js
+- engine/app/assets/modules/document_ready.js
+- engine/app/assets/modules/poller.js
+- engine/app/assets/modules/toasts.js
 - engine/app/assets/scripts.js
 - engine/app/assets/style.css
 - engine/app/assets/vendor/bootstrap/bootstrap.bundle.min.js
 - engine/app/assets/vendor/bootstrap/bootstrap.min.css
 - engine/app/assets/vendor/chartjs/chart.min.js
+- engine/app/assets/vendor/es_module_shims.js
 - engine/app/assets/vendor/rails_ujs.js
 - engine/app/charts/good_job/scheduled_by_queue_chart.rb
 - engine/app/controllers/good_job/application_controller.rb
@@ -374,13 +380,11 @@ files:
 - engine/app/controllers/good_job/jobs_controller.rb
 - engine/app/controllers/good_job/processes_controller.rb
 - engine/app/filters/good_job/base_filter.rb
-- engine/app/filters/good_job/executions_filter.rb
 - engine/app/filters/good_job/jobs_filter.rb
 - engine/app/helpers/good_job/application_helper.rb
 - engine/app/views/good_job/cron_entries/index.html.erb
 - engine/app/views/good_job/cron_entries/show.html.erb
 - engine/app/views/good_job/executions/_table.erb
-- engine/app/views/good_job/executions/index.html.erb
 - engine/app/views/good_job/jobs/_table.erb
 - engine/app/views/good_job/jobs/index.html.erb
 - engine/app/views/good_job/jobs/show.html.erb
@@ -400,7 +404,8 @@ files:
 - engine/app/views/layouts/good_job/application.html.erb
 - engine/config/locales/en.yml
 - engine/config/locales/es.yml
-- engine/config/locales/ru.yaml
+- engine/config/locales/nl.yml
+- engine/config/locales/ru.yml
 - engine/config/routes.rb
 - engine/lib/good_job/engine.rb
 - exe/good_job

data/engine/app/filters/good_job/executions_filter.rb DELETED Viewed

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-module GoodJob
-  class ExecutionsFilter < BaseFilter
-    def states
-      @_states ||= {
-        'finished' => base_query.finished.count,
-        'unfinished' => base_query.unfinished.count,
-        'running' => base_query.running.count,
-        'errors' => base_query.where.not(error: nil).count,
-      }
-    end
-    def filtered_query
-      query = base_query
-      query = query.job_class(params[:job_class]) if params[:job_class].present?
-      query = query.where(queue_name: params[:queue_name]) if params[:queue_name].present?
-      query = query.search_text(params[:query]) if params[:query].present?
-      if params[:state]
-        case params[:state]
-        when 'finished'
-          query = query.finished
-        when 'unfinished'
-          query = query.unfinished
-        when 'running'
-          query = query.running
-        when 'errors'
-          query = query.where.not(error: nil)
-        end
-      end
-      query
-    end
-    private
-    def default_base_query
-      GoodJob::Execution.all
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-<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>
-<%= render 'good_job/shared/filter', filter: @filter %>
-<%= render 'good_job/executions/table', executions: @filter.records %>
-<% if @filter.records.present? %>
-  <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 %>
-          Older executions <span aria-hidden="true">&raquo;</span>
-        <% end %>
-      </li>
-    </ul>
-  </nav>
-<% end %>

data/engine/config/locales/ru.yaml DELETED Viewed

@@ -1,53 +0,0 @@
----
-ru:
-  datetime:
-    distance_in_words:
-      about_x_hours:
-        one: около 1 часа
-        other: около %{count} часов
-      about_x_months:
-        one: около 1 месяца
-        other: около %{count} месяцев
-      about_x_years:
-        one: около 1 года
-        other: около %{count} лет
-      almost_x_years:
-        one: почти 1 год
-        other: почти %{count} года
-      half_a_minute: пол минуты
-      less_than_x_minutes:
-        one: меньше 1 минуты
-        other: меньше %{count} минут
-      less_than_x_seconds:
-        one: меньше 1 секунды
-        other: меньше %{count} секунд
-      over_x_years:
-        one: больше 1 года
-        other: больше %{count} лет
-      x_days:
-        one: 1 день
-        other: "%{count} дней"
-      x_minutes:
-        one: 1 минута
-        other: "%{count} минут"
-      x_months:
-        one: 1 месяц
-        other: "%{count} месяца"
-      x_seconds:
-        one: 1 секунда
-        other: "%{count} секунд"
-      x_years:
-        one: 1 год
-        other: "%{count} года"
-  good_job:
-    shared:
-      footer:
-        last_update_html: Последнее обновление <time id="page-updated-at" datetime="%{time}">%{time}</time>
-        wording: Запомни, ты делаешь Good Job тоже!
-      navbar:
-        cron_schedules: Cron Расписания
-        executions: Все Исполнения
-        jobs: Все Задачи
-        live_poll: Живой Опрос
-        name: "GoodJob 👍"
-        processes: Процессы