good_job 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba4287705b5c3537dca930a07b02597d5c58b807346f811221c7adf6bfdd12a1
-  data.tar.gz: 6032005f621e9c796850c18db098be248764b76ce822f2e5135e105d381d2770
+  metadata.gz: db147d840e981330790b1b3254d9aa40d0c9e6e9284612336e3815928c0efa38
+  data.tar.gz: 22d1b91b0edc67538ded7b8efd9dbdf36e4d1a06717c8e96ed09adb50188310a
 SHA512:
-  metadata.gz: 53ac0b6e5a4729cf96338cb67dc7e599656aff108e24d8e01f8545fb8439f2a708db61764fb1bb5a83853a2e63b0879729c0b89ec4b302d20916a91befd506ee
-  data.tar.gz: 8e1c6d319bf63b68715bfe6fbcc7bd30ca66531dbafcfd27ca3ef920d573d9b2d2454745a582501a0b845f7474c427e0493371f8ff2eb83031d16f8c4a9b67f1
+  metadata.gz: 352ddf2bbe0dbe7c79a650a32f37c070855d3330ecb444a79b33afbb253108bac567794959cd2a2111f10c7c2623f08a341f17211ee70c13841c783f0611ed04
+  data.tar.gz: 5ecbac7d33b5a6db0d8ad2f5964dadd9bc6f394eab3d6935584c5b4ab3633dadc1ed2249e99de8e532f8cd1c4cd4268a76cf7104c21f3b00bc924e8fd12ee64b

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [v1.9.6](https://github.com/bensheldon/good_job/tree/v1.9.6) (2021-06-04)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v1.9.5...v1.9.6)
+
+**Closed issues:**
+
+- Pause jobs during migration / maintenance? [\#257](https://github.com/bensheldon/good_job/issues/257)
+- How to properly report errors to error tracker service [\#159](https://github.com/bensheldon/good_job/issues/159)
+
+**Merged pull requests:**
+
+- Add deleting jobs from UI. [\#265](https://github.com/bensheldon/good_job/pull/265) ([morgoth](https://github.com/morgoth))
+- Collapse Dashboard params by default [\#263](https://github.com/bensheldon/good_job/pull/263) ([morgoth](https://github.com/morgoth))
+
 ## [v1.9.5](https://github.com/bensheldon/good_job/tree/v1.9.5) (2021-05-24)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v1.9.4...v1.9.5)

data/engine/app/controllers/good_job/dashboards_controller.rb

@@ -14,7 +14,7 @@ module GoodJob
       def jobs
         after_scheduled_at = params[:after_scheduled_at].present? ? Time.zone.parse(params[:after_scheduled_at]) : nil
         sql = GoodJob::Job.display_all(after_scheduled_at: after_scheduled_at, after_id: params[:after_id])
-                          .limit(params.fetch(:limit, 10))
+                          .limit(params.fetch(:limit, 25))
         sql = sql.with_job_class(params[:job_class]) if params[:job_class]
         if params[:state]
           case params[:state]

data/engine/app/controllers/good_job/jobs_controller.rb

@@ -0,0 +1,9 @@
+module GoodJob
+  class JobsController < GoodJob::BaseController
+    def destroy
+      deleted_count = GoodJob::Job.where(id: params[:id]).delete_all
+      message = deleted_count.positive? ? { notice: "Job deleted" } : { alert: "Job not deleted" }
+      redirect_to root_path, **message
+    end
+  end
+end

data/engine/app/views/layouts/good_job/base.html.erb

@@ -51,6 +51,19 @@
       </div>
     </div>
 
+    <% if notice %>
+      <div class="alert alert-success alert-dismissible fade show d-flex align-items-center offset-md-3 col-6" role="alert">
+        <%= render "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 "shared/icons/check", 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 %>
     <%= yield %>
   </div>
 </body>

data/engine/app/views/shared/_jobs_table.erb

@@ -9,6 +9,7 @@
         <th>Scheduled At</th>
         <th>Error</th>
         <th>ActiveJob Params</th>
+        <th>Actions</th>
       </thead>
       <tbody>
         <% jobs.each do |job| %>
@@ -19,7 +20,18 @@
             <td><%= job.queue_name %></td>
             <td><%= job.scheduled_at || job.created_at %></td>
             <td><%= job.error %></td>
-            <td><pre><%= JSON.pretty_generate(job.serialized_params) %></pre></td>
+            <td>
+              <%= tag.button "Preview", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
+                data: {bs_toggle: "collapse", bs_target: "##{dom_id(job, 'params')}"},
+                aria: {expanded: false, controls: dom_id(job, "params")}
+              %>
+              <%= tag.pre JSON.pretty_generate(job.serialized_params), id: dom_id(job, "params"), class: "collapse" %>
+            </td>
+            <td>
+              <%= button_to job_path(job.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete job" do %>
+                <%= render "shared/icons/trash" %>
+              <% end %>
+            </td>
           </tr>
         <% end %>
       </tbody>

data/engine/app/views/shared/icons/_check.html.erb

@@ -0,0 +1,4 @@
+<!-- https://icons.getbootstrap.com/icons/check-circle-fill/ -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-check-circle-fill <%= local_assigns[:class] %>" viewBox="0 0 16 16">
+  <path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zm-3.97-3.03a.75.75 0 0 0-1.08.022L7.477 9.417 5.384 7.323a.75.75 0 0 0-1.06 1.06L6.97 11.03a.75.75 0 0 0 1.079-.02l3.992-4.99a.75.75 0 0 0-.01-1.05z" />
+</svg>

data/engine/app/views/shared/icons/_exclamation.html.erb

@@ -0,0 +1,4 @@
+<!-- https://icons.getbootstrap.com/icons/exclamation-triangle-fill/ -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-exclamation-triangle-fill <%= local_assigns[:class] %>" viewBox="0 0 16 16">
+  <path d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5zm.002 6a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" />
+</svg>

data/engine/app/views/shared/icons/_trash.html.erb

@@ -0,0 +1,5 @@
+<!-- https://icons.getbootstrap.com/icons/trash/ -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
+  <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z" />
+  <path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z" />
+</svg>

data/engine/config/routes.rb

@@ -1,6 +1,7 @@
 GoodJob::Engine.routes.draw do
   root to: 'dashboards#index'
-  resources :active_jobs, only: :show
+  resources :active_jobs, only: %i[show]
+  resources :jobs, only: %i[destroy]
 
   scope controller: :assets do
     get :bootstrap_css

data/lib/good_job/version.rb

@@ -1,4 +1,4 @@
 module GoodJob
   # GoodJob gem version.
-  VERSION = '1.9.5'.freeze
+  VERSION = '1.9.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob
@@ -327,12 +327,16 @@ files:
 - engine/app/controllers/good_job/assets_controller.rb
 - engine/app/controllers/good_job/base_controller.rb
 - engine/app/controllers/good_job/dashboards_controller.rb
+- engine/app/controllers/good_job/jobs_controller.rb
 - engine/app/helpers/good_job/application_helper.rb
 - engine/app/views/good_job/active_jobs/show.html.erb
 - engine/app/views/good_job/dashboards/index.html.erb
 - engine/app/views/layouts/good_job/base.html.erb
 - engine/app/views/shared/_chart.erb
 - engine/app/views/shared/_jobs_table.erb
+- engine/app/views/shared/icons/_check.html.erb
+- engine/app/views/shared/icons/_exclamation.html.erb
+- engine/app/views/shared/icons/_trash.html.erb
 - engine/config/routes.rb
 - engine/lib/good_job/engine.rb
 - exe/good_job