rush_job 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2656877c04c7bf364e6b009dde59e1b4169ec229cb011c8b973587f07185026b
-  data.tar.gz: d91245e38016a4a0be1e35ee9c8085d6a75580d4bf858cd37c88383e119f33f9
+  metadata.gz: 82209f37f6a845c77cb6933c9c559a949df485c3142b8585c20955fa23eb9519
+  data.tar.gz: b4fda350f51463d8e05e0d7bc1db426420234b1f5d458406b59d36104d00d746
 SHA512:
-  metadata.gz: 3c5b8bf4ef1138187b56cd5081aa8ff64a2cf73b3d05222501f7330bbd7f2816c30df2b7e696fd03b4a0442bde77990fdf00c6a8d863e1485218d274806192a9
-  data.tar.gz: 174ced87e1345741f9ffc26e8c5819c67b7d943a5b28ddf9e28afc225c65c2bbf477b9eafae11aba923c9bc554a8652fc4a834bf8bfcf0843536f0d693647aa6
+  metadata.gz: d8a7d54426d59d39f397fd064685e7c7ab8586c2f717f023001e7f7db232fe66533363d9c5a9834b25d8f89903eb299b8973637e52615025d0655530f4b3df9c
+  data.tar.gz: 04a8b173f671ae3ff2b39ab10466b3f38584d6ae7c9ee2556281c024e3c3b613e611063eb8df878983a7247e76cd8d1d16ef4ce1decf07991708d8c38427c161

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.1'
+gem 'rush_job', '~> 0.6.0'
 ```
 
 And then execute:

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

@@ -17,13 +17,29 @@
       <div class="collapse navbar-collapse" id="rush-job-navbar-links">
         <ul class="navbar-nav me-auto">
           <li class="nav-item">
-            <%= link_to t(:dashboard), root_path, class: "nav-link" %>
+            <%= link_to t(:dashboard), root_path, class: "nav-link#{' active' if current_page?(root_path)}" %>
           </li>
           <li class="nav-item">
-            <%= link_to t(:jobs), rush_jobs_path, class: "nav-link" %>
+            <%= 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/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.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rush_job
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - JavaKoala
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-09 00:00:00.000000000 Z
+date: 2023-10-01 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