rush_job_mongoid 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9515ce4b1fd90a74b0959c805981a82449cf3f28f00fe328a5e12753464e6355
-  data.tar.gz: 2e27a3e9ff1076261c2b10eedf9d590f44c065527899bf45cc5c7e6b6f773c6b
+  metadata.gz: 4299628853a978d30ae8aebe0d641ecd811d3b663bbf3fc1217f32767fdb9537
+  data.tar.gz: 001601df04520cb90687811262bb9b6ebe44492ad21824b04c1c81d7ea755af3
 SHA512:
-  metadata.gz: 950e7a850279f648e49458dd338d91734c86a08047a7df1a2ffae2de5ee10468872e4b48d35b63f3019b80bda70e032816fe45a1d800ff44f71bdba1de31a21a
-  data.tar.gz: 3d4e87bd1e40fecc96cbef57558d3424b3051e1a806e0906825137449bf9015d7067592b7c467d43d7d809a98e7bf9ec1f61b4668e338010d404aac1211495cf
+  metadata.gz: 70b2bfd96db812000a29158167cc91a124abd3ea9b6d27ae4e1af5135ea1450d60b7d41ab483f49f8903b83e360a3a6f51dae3ca22ea33137acc8309b4724e6a
+  data.tar.gz: 78ba438b4b0076facf55a418fd779852e3b11383fb4835d680941f0bc44b5e2d28b63e20eaf3c25f1a820d28d2465bce725680f1163f790e79e12f67cc56743c

data/README.md

@@ -30,7 +30,7 @@ Queues on the dashboard are eager loaded. If there are lots of queues this can a
 Add this line to your Ruby on Rails application's Gemfile:
 
 ```ruby
-gem 'rush_job_mongoid', '~> 1.3.0'
+gem 'rush_job_mongoid', '~> 1.5'
 ```
 
 And then execute:

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

@@ -1,8 +1,8 @@
 import { Application } from '@hotwired/stimulus';
-import RushJobMongoidConfirmController from './controllers/rush_job_mongoid_confirm_controller';
-import RushJobMongoidFiltersController from './controllers/rush_job_mongoid_filters_controller';
-import RushJobMongoidPollingController from './controllers/rush_job_mongoid_polling_controller';
-import RushJobMongoidReloadJobsTableController from './controllers/rush_job_mongoid_reload_jobs_table_controller';
+import RushJobMongoidConfirmController from 'rush_job_mongoid/controllers/rush_job_mongoid_confirm_controller';
+import RushJobMongoidFiltersController from 'rush_job_mongoid/controllers/rush_job_mongoid_filters_controller';
+import RushJobMongoidPollingController from 'rush_job_mongoid/controllers/rush_job_mongoid_polling_controller';
+import RushJobMongoidReloadJobsTableController from 'rush_job_mongoid/controllers/rush_job_mongoid_reload_jobs_table_controller';
 import 'bootstrap';
 import '@hotwired/turbo-rails';
 

data/app/assets/javascript/rush_job_mongoid/controllers/rush_job_mongoid_polling_controller.js

@@ -1,9 +1,9 @@
-import { RushJobMongoidTableUpdateController } from './rush_job_mongoid_table_update_controller';
+import { RushJobMongoidTableUpdateController } from 'rush_job_mongoid/controllers/rush_job_mongoid_table_update_controller';
 
 let intervalID;
 
 export default class RushJobMongoidPollingController extends RushJobMongoidTableUpdateController {
-  static targets = ['pollingTime', 'pollingTimeLabel', 'pollingSlide'];
+  static targets = ['pollingTime', 'pollingTimeLabel', 'pollingSlide', 'progressBar', 'progressBarProgress'];
 
   connect() {
     this.pollingChange();
@@ -22,17 +22,36 @@ export default class RushJobMongoidPollingController extends RushJobMongoidTable
 
     if (pollingSlide.checked === true) {
       this.startPolling();
+      this.progressBarTarget.style = 'height: 7px;';
     } else {
       this.stopPolling();
+      this.progressBarTarget.style = 'display: none;';
     }
   }
 
   startPolling() {
+    this.stopPolling();
     this.updateJobs();
 
-    intervalID = setTimeout(() => {
-      this.startPolling();
-    }, this.pollingTime() * 1000);
+    let progressInterval = 100;
+    let progressPrecent = 1;
+    let progressIntervalTime = this.pollingTime() * 10;
+
+    if (progressIntervalTime < 130) {
+      progressPrecent = 10;
+      progressIntervalTime = progressIntervalTime * 10;
+    }
+
+    intervalID = setInterval(() => {
+      this.progressBarProgressTarget.style = `width: ${progressInterval}%;`;
+      this.progressBarTarget.setAttribute('aria-valuenow', progressInterval);
+
+      progressInterval -= progressPrecent;
+
+      if (progressInterval < 0) {
+        this.startPolling();
+      }
+    }, progressIntervalTime);
   }
 
   stopPolling() {

data/app/assets/javascript/rush_job_mongoid/controllers/rush_job_mongoid_reload_jobs_table_controller.js

@@ -1,4 +1,4 @@
-import { RushJobMongoidTableUpdateController } from './rush_job_mongoid_table_update_controller';
+import { RushJobMongoidTableUpdateController } from 'rush_job_mongoid/controllers/rush_job_mongoid_table_update_controller';
 
 export default class extends RushJobMongoidTableUpdateController {
   reloadJobs() {

data/app/assets/javascript/rush_job_mongoid/controllers/rush_job_mongoid_table_update_controller.js

@@ -1,15 +1,24 @@
 import { Controller } from '@hotwired/stimulus';
 
 export class RushJobMongoidTableUpdateController extends Controller {
-  updateJobs() {
+  async updateJobs() {
     const headers = { 'Accept': 'text/vnd.turbo-stream.html' };
 
     this.blurTable();
     this.clearFlash();
 
-    fetch(document.location.href, { headers: headers })
-      .then(response => response.text())
-      .then(html => Turbo.renderStreamMessage(html));
+    try {
+      const response = await fetch(document.location.href, { headers: headers });
+
+      if (!response.ok) {
+        throw new Error(`Failed to fetch job data. Status: ${response.status}`);
+      }
+
+      const response_text = await response.text();
+      Turbo.renderStreamMessage(response_text);
+    } catch (error) {
+      console.error(error.message);
+    }
   }
 
   blurTable() {

data/app/views/layouts/rush_job_mongoid/application.html.erb

@@ -2,6 +2,7 @@
 <html>
 <head>
   <title>Rush job mongoid</title>
+  <meta name="viewport" content="width=device-width,initial-scale=1">
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
 

data/app/views/rush_job_mongoid/shared/_polling.html.erb

@@ -13,6 +13,19 @@
              max="6"
              data-rush-job-mongoid-polling-target="pollingTime"
              data-action="input->rush-job-mongoid-polling#pollingChange">
+    <div id="rush-job-mongoid-polling-progress"
+          class="progress mb-2"
+          role="progressbar"
+          aria-label="polling progress"
+          aria-valuenow="100"
+          aria-valuemin="0"
+          aria-valuemax="100"
+          style="display: none;"
+          data-rush-job-mongoid-polling-target="progressBar">
+      <div class="progress-bar"
+            style="width: 100%;"
+            data-rush-job-mongoid-polling-target="progressBarProgress"></div>
+      </div>
     </div>
     <div class="col-3">
       <div class="form-check form-switch">

data/config/importmap.rb

@@ -1,4 +1,9 @@
 pin 'rush_job_mongoid/application', preload: true
+pin 'rush_job_mongoid/controllers/rush_job_mongoid_confirm_controller', preload: true
+pin 'rush_job_mongoid/controllers/rush_job_mongoid_filters_controller', preload: true
+pin 'rush_job_mongoid/controllers/rush_job_mongoid_polling_controller', preload: true
+pin 'rush_job_mongoid/controllers/rush_job_mongoid_reload_jobs_table_controller', preload: true
+pin 'rush_job_mongoid/controllers/rush_job_mongoid_table_update_controller', 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 '@hotwired/stimulus', to: 'https://ga.jspm.io/npm:@hotwired/stimulus@3.2.2/dist/stimulus.js'

data/lib/rush_job_mongoid/version.rb

@@ -1,3 +1,3 @@
 module RushJobMongoid
-  VERSION = '1.3.0'.freeze
+  VERSION = '1.5.0'.freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rush_job_mongoid
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - JavaKoala
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-23 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -72,14 +71,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +127,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +169,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '6.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.4'
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-capybara
   requirement: !ruby/object:Gem::Requirement
@@ -226,28 +225,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.27'
+        version: '2.28'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.27'
+        version: '2.28'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.26'
+        version: '4.27'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.26'
+        version: '4.27'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -343,7 +342,6 @@ metadata:
   source_code_uri: https://github.com/JavaKoala/rush_job_mongoid
   changelog_uri: https://github.com/JavaKoala/rush_job_mongoid
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -358,8 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: User interface for delayed_job with MongoDB
 test_files: []