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

good_job 2.13.0 → 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 (25) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +22 -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 +4 -0
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/shared/_alert.erb +20 -13
data/engine/app/views/good_job/shared/_navbar.erb +1 -4
data/engine/app/views/layouts/good_job/application.html.erb +11 -8
data/engine/config/locales/en.yml +0 -1
data/engine/config/locales/es.yml +0 -1
data/engine/config/locales/nl.yml +0 -1
data/engine/config/locales/ru.yml +0 -1
data/engine/config/routes.rb +5 -3
data/lib/good_job/version.rb +1 -1
metadata +8 -4
data/engine/app/filters/good_job/executions_filter.rb +0 -41
data/engine/app/views/good_job/executions/index.html.erb +0 -15

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c154bb21bc4a390c8e7f488e3a110dace697b660585d67cf66fcc21a1ebbeeb
-  data.tar.gz: ba8d453f1eb4b9086534710a4bb7e5f29e2e497a1051e3be7aefa21b8c9a3164
+  metadata.gz: 6d8b2b2738eb9ae693690016074fd4624a5c5cc78abd5d87d416202e5671281e
+  data.tar.gz: dbb67bc97bdeca64de1a6bb9b7c1fd16bf51a5fa048bf1d87ca637860d6e80eb
 SHA512:
-  metadata.gz: f4344deb0fb76ad2ed78b1d0898aa7521fbab371c08ec6b59f2fd5dec4283723fc3cfe11d8af3acd891d7d6a44c586869c31e1f0106de6ca0ec09da1eee9e345
-  data.tar.gz: bfb185dc98b9cc33e4562b6b641f179a32d57dcedd92622ca2334e79566f4d6876d55771425a5760e9bb14f06bee6ddad37067f97df887659c12acb1f25d34fc
+  metadata.gz: 4bb91a8ab93b89c82084f58198d6dcdbcab5e44e3b42cdf6eb2f94fdd895bf126d146cfd6e314ea69830ed0013dd66796c727c2a2b48e0a7456089252b987faa
+  data.tar.gz: 6b86d012b1deb3c71f5cfd4bb69ac680eee1b18cb35849d24adc0ad8ef2b4689c217b39984b4bf7af3075395bf3464d0c1fd1198e7f67c083b1ddcbd32950bb5

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,27 @@
 # 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)

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

@@ -30,3 +30,7 @@
   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/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/_navbar.erb CHANGED Viewed

@@ -7,9 +7,6 @@
     <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 controller_name == 'executions')] %>
-        </li>
         <li class="nav-item">
           <%= link_to t(".jobs"), jobs_path, class: ["nav-link", ("active" if controller_name == 'jobs')] %>
         </li>
@@ -22,7 +19,7 @@
       </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,21 +7,24 @@
   <%= 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>
   <div class="d-flex flex-column min-vh-100">
     <%= render "good_job/shared/navbar" %>
-    <div class="container-fluid flex-grow-1">
+    <div class="container-fluid flex-grow-1 relative">
       <%= render "good_job/shared/alert" %>
       <%= yield %>

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

@@ -46,7 +46,6 @@ en:
         wording: Remember, you're doing a Good Job too!
       navbar:
         cron_schedules: Cron
-        executions: Executions
         jobs: Jobs
         live_poll: Live Poll
         name: "GoodJob 👍"

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

@@ -46,7 +46,6 @@ es:
         wording: "¡Recuerda, también tú estás haciendo un buen trabajo!"
       navbar:
         cron_schedules: Cron
-        executions: Ejecuciones
         jobs: Tareas
         live_poll: En vivo
         name: "GoodJob 👍"

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

@@ -46,7 +46,6 @@ nl:
         wording: 'Onthoud: jij levert ook goed werk!'
       navbar:
         cron_schedules: Cron
-        executions: Uitvoeringen
         jobs: Taken
         live_poll: Live Poll
         name: "GoodJob 👍"

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

@@ -70,7 +70,6 @@ ru:
         wording: Запомни, ты делаешь Good Job тоже!
       navbar:
         cron_schedules: Cron
-        executions: Исполнения
         jobs: Задачи
         live_poll: Живой Опрос
         name: "GoodJob 👍"

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/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module GoodJob
   # GoodJob gem version.
-  VERSION = '2.13.0'
+  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.13.0
+  version: 2.13.1
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-19 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

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,15 +0,0 @@
-<%= render 'good_job/shared/filter', title: "Executions", filter: @filter %>
-<%= render 'good_job/shared/chart', chart_data: GoodJob::ScheduledByQueueChart.new(@filter).data %>
-<%= 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 %>