rush_job 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3041b6c30d0c536801cacb8b1ad90508d07b13cd164f30a4b9e077502eebe95
-  data.tar.gz: 2d5385d373b5fed963fc13771014b179af4dd04965184f6787c764cb80bddfe0
+  metadata.gz: 9f1f2016e98628b8ca8df65ab968afd510ae17cec5c27f1c32bb310d9e566cc7
+  data.tar.gz: 58461cac54f6376f5505ef433b100c17acb4059b267611b63b2284fec3868535
 SHA512:
-  metadata.gz: 98184de98f079ba5293f1fe248b1e851e7f1fc45b0deb8a8d6e79733505ace0d484ac90be13401a943a078e37c61523cbe0a69ee569d2fc8e624b1f43069d75c
-  data.tar.gz: 8159d4e7f1f61d2a6c8f706176dcd026753602ff7df78a62a41f88a4c326ddac50e880c27812b97d93f1be6f6d8787b8f81d449f4da0fa723c930be00be71acd
+  metadata.gz: b6bebec349e0ec4975275946490aff4908914c1cdc6420b05e5e8b8bb7977119fee0d8199cf8b69577646d591bb9bf124f13f40d43786f73762d87282da765b2
+  data.tar.gz: 0c9175a6c11f22a8b93f422bfa5d4346c10f5daed5d8e18a5d512146aa138cc126f2eb48f2f6f535ad68f5e3fe368c9a43c4ad6442df579027c4326e7318a497

data/README.md

@@ -17,7 +17,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.5.2'
+gem 'rush_job', '~> 0.6.1'
 ```
 
 And then execute:

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

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

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

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

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

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

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

data/app/controllers/rush_job/dashboard_controller.rb

@@ -15,6 +15,19 @@ module RushJob
                                             page_param: :queue_page)
     end
 
+    def destroy
+      RushJob.clear_queue(queue_params[:queue], queue_params[:priority])
+
+      flash[:success] = t(:cleared_queue, queue: queue_params[:queue])
+      redirect_to root_path, status: :see_other
+    end
+
+    private
+
+    def queue_params
+      params.permit(:queue, :priority)
+    end
+
     def redirect_to_first_page
       redirect_to root_path, notice: t(:invalid_page_notice)
     end

data/app/controllers/rush_job/rush_jobs_controller.rb

@@ -7,11 +7,6 @@ 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/controllers/rush_job/settings_controller.rb

@@ -0,0 +1,18 @@
+module RushJob
+  class SettingsController < ApplicationController
+    def update
+      change_setting if Settings::RUSH_JOB_SETTINGS[params[:setting]&.to_sym]
+
+      redirect_to root_path
+    end
+
+    private
+
+    def change_setting
+      setting_param = params[:setting]
+      setting_cookie = "rush_job_#{setting_param}"
+
+      cookies.permanent[setting_cookie.to_sym] = Settings.change_setting(setting_param, cookies[setting_cookie.to_sym])
+    end
+  end
+end

data/app/helpers/rush_job/application_helper.rb

@@ -1,11 +1,5 @@
 module RushJob
   module ApplicationHelper
-    def current_theme
-      cookies[:rush_job_theme] == 'dark' ? 'dark' : 'light'
-    end
-
-    def invert_theme
-      cookies[:rush_job_theme] == 'dark' ? 'light' : 'dark'
-    end
+    include SettingsHelper
   end
 end

data/app/helpers/rush_job/settings_helper.rb

@@ -0,0 +1,15 @@
+module RushJob
+  module SettingsHelper
+    def current_theme
+      cookies[:rush_job_theme] == 'dark' ? 'dark' : 'light'
+    end
+
+    def invert_theme
+      cookies[:rush_job_theme] == 'dark' ? 'light' : 'dark'
+    end
+
+    def editing_enabled?
+      cookies[:rush_job_editing] == 'enabled'
+    end
+  end
+end

data/app/models/rush_job/rush_job.rb

@@ -4,6 +4,11 @@ module RushJob
 
     scope :locked_jobs, -> { where.not(locked_at: nil).order(locked_at: :desc) }
     scope :queue_groups, -> { group(:queue, :priority).order(:priority).count }
+    scope :queue_group, ->(queue, priority) { where(queue:).and(where(priority:)) }
+
+    def self.clear_queue(queue, priority)
+      queue_group(queue, priority).delete_all
+    end
 
     def job_class
       job_data[:job_class]

data/app/services/rush_job/settings.rb

@@ -0,0 +1,18 @@
+module RushJob
+  class Settings
+    RUSH_JOB_SETTINGS = {
+      theme: %w[light dark],
+      editing: %w[disabled enabled]
+    }.freeze
+
+    def self.change_setting(setting, value)
+      return unless RUSH_JOB_SETTINGS[setting.to_sym]
+
+      if RUSH_JOB_SETTINGS[setting.to_sym][1] == value
+        RUSH_JOB_SETTINGS[setting.to_sym][0]
+      else
+        RUSH_JOB_SETTINGS[setting.to_sym][1]
+      end
+    end
+  end
+end

data/app/views/layouts/rush_job/_flash_messages.html.erb

@@ -0,0 +1,5 @@
+<% flash.each do |type, msg| %>
+  <div class="alert alert-<%= invert_theme %>" role="alert">
+    <%= msg %>
+  </div>
+<% end %>

data/app/views/layouts/rush_job/_navbar.html.erb

@@ -22,8 +22,24 @@
           <li class="nav-item">
             <%= link_to t(:jobs), rush_jobs_path, class: "nav-link#{' active' if current_page?(rush_jobs_path)}" %>
           </li>
-          <li class="nav-item">
-            <%= link_to t("#{invert_theme}_mode"), theme_path, class: "nav-link", method: :patch %>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle"
+               data-bs-toggle="dropdown"
+               href="#" role="button"
+               aria-haspopup="true"
+               aria-expanded="false">
+               Options
+            </a>
+            <div class="dropdown-menu"
+                 data-bs-popper="static">
+              <%= button_to t("#{invert_theme}_mode"), settings_path, class: "nav-link", method: :patch, params: { setting: 'theme' } %>
+              <%= button_to t("#{editing_enabled? ? 'disable_editing' : 'enable_editing'}"),
+                            settings_path,
+                            class: "nav-link",
+                            method: :patch,
+                            params: { setting: 'editing' },
+                            data: { confirm: t("#{editing_enabled? ? 'disable_editing_confirmation' : 'enable_editing_confirmation'}") } %>
+            </div>
           </li>
         </ul>
       </div>

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

@@ -12,11 +12,9 @@
 </head>
 <body class="background-color-<%= current_theme %>">
   <%= render 'layouts/rush_job/navbar' %>
-  <% flash.each do |type, msg| %>
-    <div class="alert alert-<%= invert_theme %>" role="alert">
-      <%= msg %>
-    </div>
-  <% end %>
+  <div id="rush-job-flash-messages">
+    <%= render 'layouts/rush_job/flash_messages' %>
+  </div>
 
 <%= yield %>
 

data/app/views/rush_job/dashboard/_dashboard_tables.html.erb

@@ -53,6 +53,9 @@
             <th><%= t :name %></th>
             <th><%= t :priority %></th>
             <th><%= t :count %></th>
+            <% if editing_enabled? %>
+              <th><%= t :clear %></th>
+            <% end %>
           </tr>
         </thead>
         <tbody class="table-group-divider">
@@ -61,6 +64,14 @@
               <td><%= queue[0] %></td>
               <td><%= queue[1] %></td>
               <td><%= @queue_groups[queue] %></td>
+              <% if editing_enabled? %>
+                <td><%= button_to t(:clear),
+                                  dashboard_path,
+                                  class: "btn btn-danger btn-sm",
+                                  method: :delete,
+                                  params: { queue: queue[0], priority: queue[1] },
+                                  data: { confirm: t(:clear_queue_confirmation, queue: queue[0]) } %></td>
+              <% end %>
             </tr>
           <% end %>
         </tbody>

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

@@ -1 +1,2 @@
+document.getElementById('rush-job-flash-messages').innerHTML = "<%= j (render partial: 'layouts/rush_job/flash_messages') %>"
 document.getElementById('rush-job-jobs').innerHTML = "<%= j (render partial: 'dashboard_tables') %>"

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

@@ -1 +1,2 @@
+document.getElementById('rush-job-flash-messages').innerHTML = "<%= j (render partial: 'layouts/rush_job/flash_messages') %>"
 document.getElementById('rush-job-jobs').innerHTML = "<%= j (render partial: 'jobs_table') %>"

data/config/locales/en.yml

@@ -1,10 +1,17 @@
 en:
   arguments: "Arguments"
   attempts: "Attempts"
+  clear: "Clear"
+  clear_queue_confirmation: "Are you sure you want to clear queue %{queue}?"
+  cleared_queue: "Cleared queue %{queue}"
   count: "Count"
   dark_mode: "Dark Mode"
   dashboard: "Dashboard"
   delayed_title: "Delayed Jobs"
+  disable_editing: "Disable Editing"
+  disable_editing_confirmation: "Are you sure?"
+  enable_editing: "Enable Editing"
+  enable_editing_confirmation: "Are you sure? Verify workers are stopped before editing."
   enable_polling: "Enable polling"
   failed_at: "Failed at"
   id: "Id"

data/config/routes.rb

@@ -1,5 +1,6 @@
 RushJob::Engine.routes.draw do
   root 'dashboard#index'
+  delete '/dashboard', to: 'dashboard#destroy'
   get '/rush_jobs', to: 'rush_jobs#index'
-  patch '/theme', to: 'themes#update'
+  patch '/settings', to: 'settings#update'
 end

data/lib/rush_job/version.rb

@@ -1,3 +1,3 @@
 module RushJob
-  VERSION = '0.5.2'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rush_job
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - JavaKoala
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-10 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -304,13 +304,16 @@ files:
 - app/controllers/rush_job/application_controller.rb
 - app/controllers/rush_job/dashboard_controller.rb
 - app/controllers/rush_job/rush_jobs_controller.rb
-- app/controllers/rush_job/themes_controller.rb
+- app/controllers/rush_job/settings_controller.rb
 - app/helpers/rush_job/application_helper.rb
 - app/helpers/rush_job/dashboard_helper.rb
 - app/helpers/rush_job/rush_jobs_helper.rb
+- app/helpers/rush_job/settings_helper.rb
 - app/helpers/rush_job/sort_helper.rb
 - app/models/rush_job/application_record.rb
 - app/models/rush_job/rush_job.rb
+- app/services/rush_job/settings.rb
+- app/views/layouts/rush_job/_flash_messages.html.erb
 - app/views/layouts/rush_job/_navbar.html.erb
 - app/views/layouts/rush_job/application.html.erb
 - app/views/rush_job/dashboard/_dashboard_tables.html.erb
@@ -351,7 +354,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: User interface for delayed_job

data/app/controllers/rush_job/themes_controller.rb

@@ -1,13 +0,0 @@
-module RushJob
-  class ThemesController < ApplicationController
-    def update
-      cookies.permanent[:rush_job_theme] = if cookies[:rush_job_theme] == 'dark'
-                                             'light'
-                                           else
-                                             'dark'
-                                           end
-
-      redirect_to root_path
-    end
-  end
-end