rush_job 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6a851e49e6f1885c14bb796537b7e508beab734f7997884a3a4ff586821c115
-  data.tar.gz: ad8614b76e4f5e1c88b3d34e9327f2780328bb3b8539e813cd2c3da0eedf0444
+  metadata.gz: 9f24031055b7af192d199277995a02156d089d208ef07037c75d5ebcafabaaf1
+  data.tar.gz: 697f98385692da3bcbe8ff8b5971b222fcf93a1c3df34ef9e4544e86dc51fd6f
 SHA512:
-  metadata.gz: e6462e003fe4e0726deebffde8c579da9b631539c18bc535365dee4d865a084d1dba2e71f7e728421ed909d26c6dfaa5c5e2208cc392f45d776c9e65b0144dd2
-  data.tar.gz: 96963d1457393cf3d63829d6232527f531a453d88be6d7d74c90451aeee8998b80a0a198d2cbb2ed4388f5750476824eaab5c3a722ba3e91f56dbbf6913d6d74
+  metadata.gz: b9a83f701a00989f02da32d816bae209b90576eff5ab2ca3e2c0930f0a876294faf29dc88267847a65f82d6aa159e1ddce3e56839d5cf1f2df1c532d05e39fd8
+  data.tar.gz: '0810045ea1fee244ad1a5ec8bb2d71728546d4d760e0e344bca5d93292c7c1d775fdbff34f1094cc202290b50ef15655c8ce5ce5189782868367fe0bba2ce079'

data/README.md

@@ -14,7 +14,7 @@ Navigate to the `/rush_job` route in your application to see the Delayed Jobs. L
 Add this line to your Ruby on Rails application's Gemfile:
 
 ```ruby
-gem 'rush_job', '~> 0.3.2'
+gem 'rush_job', '~> 0.4.0'
 ```
 
 And then execute:

data/app/assets/javascript/rush_job/application.js

@@ -1 +1,12 @@
-import "bootstrap"
+import 'bootstrap'
+import Rails from '@rails/ujs'
+Rails.start();
+
+import { Application } from '@hotwired/stimulus'
+
+import RushJobPollingController from './controllers/rush_job_polling_controller'
+import RushJobReloadJobsTableController from './controllers/rush_job_reload_jobs_table_controller'
+
+window.Stimulus = Application.start()
+Stimulus.register('rush-job-polling', RushJobPollingController)
+Stimulus.register('rush-job-reload-jobs-table', RushJobReloadJobsTableController)

data/app/assets/javascript/rush_job/controllers/rush_job_polling_controller.js

@@ -0,0 +1,49 @@
+import  { RushJobTableUpdateController } from './rush_job_table_update_controller.js'
+
+let intervalID
+
+export default class extends RushJobTableUpdateController {
+  static targets = [ 'pollingTime', 'pollingTimeLabel', 'pollingSlide' ]
+
+  connect() {
+    this.pollingChange()
+    this.stopPolling()
+  }
+
+  pollingChange() {
+    const pollingLabelRegex = /\d+/;
+    let pollingLabelUpdate = this.pollingTimeLabelTarget.innerHTML.replace(pollingLabelRegex, this.pollingTime())
+    this.pollingTimeLabelTarget.innerHTML = pollingLabelUpdate
+  }
+
+  pollingToggle() {
+    let pollingSlide = this.pollingSlideTarget
+
+    if (pollingSlide.checked === true) {
+      this.startPolling()
+    } else {
+      this.stopPolling()
+    }
+  }
+
+  startPolling() {
+    this.updateJobs()
+
+    intervalID = setTimeout(() => {
+      this.startPolling()
+    }, this.pollingTime() * 1000)
+  }
+
+  stopPolling() {
+    if (intervalID) {
+      clearInterval(intervalID)
+    }
+  }
+
+  pollingTime() {
+    const pollingTimes = [3, 5, 8, 13, 21, 34, 55]
+    let pollingTime = this.pollingTimeTarget.value || 3
+
+    return pollingTimes[pollingTime]
+  }
+}

data/app/assets/javascript/rush_job/controllers/rush_job_reload_jobs_table_controller.js

@@ -0,0 +1,7 @@
+import  { RushJobTableUpdateController } from './rush_job_table_update_controller.js'
+
+export default class extends RushJobTableUpdateController {
+  reloadJobs() {
+    this.updateJobs()
+  }
+}

data/app/assets/javascript/rush_job/controllers/rush_job_table_update_controller.js

@@ -0,0 +1,19 @@
+import { Controller } from '@hotwired/stimulus'
+import Rails from '@rails/ujs'
+
+export class RushJobTableUpdateController extends Controller {
+  updateJobs() {
+    this.blurTable()
+
+    Rails.ajax({
+      url: document.location.href,
+      type: 'GET',
+      dataType: 'script'
+    })
+  }
+
+  blurTable() {
+    let jobs_container = document.getElementById('rush-job-jobs-container')
+    jobs_container.classList.add('table-refresh')
+  }
+}

data/app/assets/stylesheets/rush_job/pages/_index.scss

@@ -11,6 +11,29 @@
   margin-top: 0.5rem;
 }
 
+.polling-container {
+  margin-left: 5%;
+  margin-right: 5%;
+}
+
+.polling-range-form-label-dark {
+  color: rgb(0, 0, 0);
+  margin-bottom: 0.5rem;
+}
+
+.polling-range-form-label-light {
+  color: rgb(255, 255, 255);
+  margin-bottom: 0.5rem;
+}
+
+.form-check-label-dark {
+  color: rgb(0, 0, 0);
+}
+
+.form-check-label-light {
+  color: rgb(255, 255, 255);
+}
+
 .jobs-container {
   margin-left: 5%;
   margin-right: 5%;
@@ -32,4 +55,8 @@
 
 .page-item:last-child .page-link {
   color: rgb(68, 110, 155);
-}
+}
+
+.table-refresh {
+  opacity: 0.3;
+}

data/app/controllers/rush_job/rush_jobs_controller.rb

@@ -7,6 +7,11 @@ module RushJob
 
     def index
       @pagy, @rush_jobs = pagy(RushJob.order("#{sort_column} #{sort_direction}"))
+
+      respond_to do |format|
+        format.html
+        format.js
+      end
     end
 
     private

data/app/views/rush_job/rush_jobs/_jobs_table.html.erb

@@ -0,0 +1,49 @@
+<div
+  id="rush-job-jobs-container"
+  class="jobs-container"
+  role="main"
+>
+  <div class="table-responsive">
+    <table class="table
+                  table-bordered
+                  table-striped
+                  table-<%= current_theme %>">
+      <thead>
+        <tr>
+          <th><%= sortable 'id' %><%= sort_arrow 'id' %></th>
+          <th><%= sortable 'priority' %><%= sort_arrow 'priority' %></th>
+          <th><%= sortable 'attempts' %><%= sort_arrow 'attempts' %></th>
+          <th><%= t :job_class %></th>
+          <th><%= t :arguments %></th>
+          <th><%= sortable 'last_error' %><%= sort_arrow 'last_error' %></th>
+          <th><%= sortable 'run_at' %><%= sort_arrow 'run_at' %></th>
+          <th><%= sortable 'locked_at' %><%= sort_arrow 'locked_at' %></th>
+          <th><%= sortable 'failed_at' %><%= sort_arrow 'failed_at' %></th>
+          <th><%= sortable 'locked_by' %><%= sort_arrow'locked_by' %></th>
+          <th><%= sortable 'queue' %><%= sort_arrow 'queue' %></th>
+        </tr>
+      </thead>
+      <tbody class="table-group-divider">
+        <% @rush_jobs.each do |job| %>
+          <tr>
+            <td><%= job.id %></td>
+            <td><%= job.priority %></td>
+            <td><%= job.attempts %></td>
+            <td><%= job.job_class %></td>
+            <td><%= job.job_arguments %></td>
+            <td><%= job.last_error %></td>
+            <td><%= job.run_at %></td>
+            <td><%= job.locked_at %></td>
+            <td><%= job.failed_at %></td>
+            <td><%= job.locked_by %></td>
+            <td><%= job.queue %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<div class="footer-container">
+  <%== pagy_bootstrap_nav(@pagy) if @pagy.pages > 1 %>
+</div>

data/app/views/rush_job/rush_jobs/index.html.erb

@@ -6,13 +6,8 @@
           <%= t :delayed_title %>
         </h2>
       </div>
-      <div class="col-3">
-        <button
-          type="button"
-          class="btn btn-primary"
-          onclick="location.reload();">
-          <%= t :reload %>
-        </button>
+      <div class="col-3" data-controller="rush-job-reload-jobs-table">
+        <button class="btn btn-primary" data-action="click->rush-job-reload-jobs-table#reloadJobs"><%= t :reload %></button>
       </div>
       <div class="col-3">
         <%= form_with url: theme_path, method: 'patch' do |form| %>
@@ -23,48 +18,42 @@
   </div>
 </div>
 
-<div class="jobs-container" role="main">
-  <div class="table-responsive">
-    <table class="table
-                  table-bordered
-                  table-striped
-                  table-<%= current_theme %>">
-      <thead>
-        <tr>
-          <th><%= sortable 'id' %><%= sort_arrow 'id' %></th>
-          <th><%= sortable 'priority' %><%= sort_arrow 'priority' %></th>
-          <th><%= sortable 'attempts' %><%= sort_arrow 'attempts' %></th>
-          <th><%= t :job_class %></th>
-          <th><%= t :arguments %></th>
-          <th><%= sortable 'last_error' %><%= sort_arrow 'last_error' %></th>
-          <th><%= sortable 'run_at' %><%= sort_arrow 'run_at' %></th>
-          <th><%= sortable 'locked_at' %><%= sort_arrow 'locked_at' %></th>
-          <th><%= sortable 'failed_at' %><%= sort_arrow 'failed_at' %></th>
-          <th><%= sortable 'locked_by' %><%= sort_arrow'locked_by' %></th>
-          <th><%= sortable 'queue' %><%= sort_arrow 'queue' %></th>
-        </tr>
-      </thead>
-      <tbody class="table-group-divider">
-        <% @rush_jobs.each do |job| %>
-          <tr>
-            <td><%= job.id %></td>
-            <td><%= job.priority %></td>
-            <td><%= job.attempts %></td>
-            <td><%= job.job_class %></td>
-            <td><%= job.job_arguments %></td>
-            <td><%= job.last_error %></td>
-            <td><%= job.run_at %></td>
-            <td><%= job.locked_at %></td>
-            <td><%= job.failed_at %></td>
-            <td><%= job.locked_by %></td>
-            <td><%= job.queue %></td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
+<div class="polling-container" data-controller="rush-job-polling">
+  <div class="row align-items-center">
+    <div class="col-3">
+      <label
+        for="rush-job-polling-range"
+        class="polling-range-form-label-<%= invert_theme %>"
+        data-rush-job-polling-target="pollingTimeLabel"
+      >
+        <%= t :polling_time %> 13 <%= t :polling_time_unit %>
+      </label>
+      <input
+        id="rush-job-polling-range"
+        type="range"
+        class="form-range"
+        min="0"
+        max="6"
+        data-rush-job-polling-target="pollingTime"
+        data-action="input->rush-job-polling#pollingChange"
+      >
+    </div>
+    <div class="col-3">
+      <div class="form-check form-switch">
+        <input
+          id="rush-job-polling"
+          class="form-check-input"
+          type="checkbox"
+          role="switch"
+          data-rush-job-polling-target="pollingSlide"
+          data-action="input->rush-job-polling#pollingToggle"
+        >
+        <label class="form-check-label-<%= invert_theme %>" for="rush-job-polling"><%= t :enable_polling %></label>
+      </div>
+    </div>
   </div>
 </div>
 
-<div class="footer-container">
-  <%== pagy_bootstrap_nav(@pagy) if @pagy.pages > 1 %>
+<div id="rush-job-jobs-table">
+  <%= render 'jobs_table' %>
 </div>

data/app/views/rush_job/rush_jobs/index.js.erb

@@ -0,0 +1 @@
+document.getElementById('rush-job-jobs-table').innerHTML = "<%= j (render partial: 'jobs_table') %>"

data/config/importmap.rb

@@ -1,3 +1,5 @@
 pin 'rush_job/application', preload: true
 pin 'bootstrap', to: 'https://ga.jspm.io/npm:bootstrap@5.3.1/dist/js/bootstrap.esm.js'
 pin '@popperjs/core', to: 'https://ga.jspm.io/npm:@popperjs/core@2.11.8/lib/index.js'
+pin '@rails/ujs', to: 'https://ga.jspm.io/npm:@rails/ujs@7.0.6/lib/assets/compiled/rails-ujs.js'
+pin '@hotwired/stimulus', to: 'https://ga.jspm.io/npm:@hotwired/stimulus@3.2.2/dist/stimulus.js'

data/config/locales/en.yml

@@ -2,6 +2,7 @@ en:
   arguments: "Arguments"
   attempts: "Attempts"
   delayed_title: "Delayed jobs"
+  enable_polling: "Enable polling"
   failed_at: "Failed at"
   id: "Id"
   invalid_page_notice: "No jobs on that page, redirected to first page."
@@ -9,6 +10,8 @@ en:
   last_error: "Last error"
   locked_at: "Locked at"
   locked_by: "Locked by"
+  polling_time: "Polling time:"
+  polling_time_unit: "seconds"
   priority: "Priority"
   queue: "Queue"
   reload: "Reload"

data/lib/rush_job/version.rb

@@ -1,3 +1,3 @@
 module RushJob
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rush_job
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - JavaKoala
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-04 00:00:00.000000000 Z
+date: 2023-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -292,6 +292,9 @@ files:
 - app/assets/images/rush_job/arrow-up-dark.svg
 - app/assets/images/rush_job/arrow-up-light.svg
 - app/assets/javascript/rush_job/application.js
+- app/assets/javascript/rush_job/controllers/rush_job_polling_controller.js
+- app/assets/javascript/rush_job/controllers/rush_job_reload_jobs_table_controller.js
+- app/assets/javascript/rush_job/controllers/rush_job_table_update_controller.js
 - app/assets/stylesheets/rush_job/application.scss
 - app/assets/stylesheets/rush_job/pages/_index.scss
 - app/assets/stylesheets/rush_job/themes/_dark.scss
@@ -305,7 +308,9 @@ files:
 - app/models/rush_job/application_record.rb
 - app/models/rush_job/rush_job.rb
 - app/views/layouts/rush_job/application.html.erb
+- app/views/rush_job/rush_jobs/_jobs_table.html.erb
 - app/views/rush_job/rush_jobs/index.html.erb
+- app/views/rush_job/rush_jobs/index.js.erb
 - config/importmap.rb
 - config/locales/en.yml
 - config/routes.rb