sidekiq-belt 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 311732e41366c1a1737b160f74364c13e76015f731191ee0cbd34af81b80afd2
-  data.tar.gz: 120418dea454eec7c1c9e47d35ad64d823a478d761accc9b9a6b28505e046e3b
+  metadata.gz: c5e4649a97ccde536e22d2449ec678ccde0b955c0788c223fecd16487e7e9880
+  data.tar.gz: 690b2b57d00bba771275d7143c2104f9b139fc2b883600bf4a95bfbd8b6591b5
 SHA512:
-  metadata.gz: 32111af8a8f7f4325f4dee59864eb8bcf0469747663dcdab7f0c5bdb5ec7636526f44447e1914b7cd7cce5b3ad60957c66b6fa52ff5fc2ad4549c78c81723ee2
-  data.tar.gz: bf61e75d9ca7875ee303726765c323074dfe3f2d76e35ab725cfb51f308a56fbb1fc902a1ce1ae065770ae1e98f88ada773eab0809712ffdb543b9b082146c31
+  metadata.gz: dd3e644e8fb40e12809cd5de2744640a46df7695ad2146d7333ac09a7bcc3460168a23ff891d0e60b54fed06986240242f816f2e344d45fc86ead4c9399e350b
+  data.tar.gz: 61dc37a8dd5f5e3b29d7410275b3c2776063ac6e2944a72b01619cbb713e8c24d55dbf21c301781865cc9b8b030d7278d1e521e115742b1d6938fc103d65d377

data/CHANGELOG.md

@@ -1,9 +1,17 @@
 ## [Unreleased]
 
-## [0.2.0] - 2023-10-07
+## [0.3.1] - 2023-11-01
+
+- Added style to pause button
+
+## [0.3.0] - 2023-10-28
+
+- Feature to add button to remove failed batches
+
+## [0.2.0] - 2023-10-14
 
 - Feature to Pause/Unpause Periodic Jobs
 
-## [0.1.0] - 2023-10-07
+## [0.1.0] - 2023-10-12
 
 - Feature to run manualy Periodic Jobs

data/README.md

@@ -1,5 +1,13 @@
 # Sidekiq::Belt
 
+
+<a href='http://badge.fury.io/rb/sidekiq-belt'>
+    <img src="https://badge.fury.io/rb/sidekiq-belt.png" alt="Gem Version" />
+</a>
+<a href='https://github.com/dannnylo/sidekiq-belt/workflows/CI/badge.svg'>
+  <img src="https://github.com/dannnylo/sidekiq-belt/workflows/CI/badge.svg" alt="Build Status" />
+</a>
+
 This Ruby gem enhances the capabilities of Sidekiq, Sidekiq Pro, and Sidekiq Enterprise by adding essential utilities.
 
 ## Installation
@@ -59,14 +67,19 @@ To enable this feature, pass the `periodic_pause` option:
 ```ruby
 Sidekiq::Belt.use!([:periodic_pause])
 ```
+![periodic_pause](https://github.com/dannnylo/sidekiq-belt/assets/20794/41fbcee4-9c5b-45cd-b6f7-c359a22f3979)
+![periodic_unpause](https://github.com/dannnylo/sidekiq-belt/assets/20794/ea06ae37-068e-4f66-ab10-d83970545a59)
 
 ### Delete an Unfinished Batch (sidekiq-pro)
 
-This feature is not yet implemented.
+This option adds a button to remove failed batches.
 
-### Delete a not finished Batch (sidekiq-pro)
+To enable this feature, pass the `failed_batch_remove` option:
+```ruby
+Sidekiq::Belt.use!([:failed_batch_remove])
+```
+![failed_batch_remove](https://github.com/dannnylo/sidekiq-belt/assets/20794/e285a8b2-4626-48e1-b04a-5190ae51d43b)
 
-It will be implemented in upcoming versions.
 
 ## Development
 

data/lib/sidekiq/belt/community/files.rb

@@ -10,6 +10,8 @@ module Sidekiq
         def self.use!(_options = [:all])
           # all = options.include?(:all)
           # Sidekiq::Belt::Pro::Feature.load! if all || options.include?(:feature)
+
+          true
         end
       end
     end

data/lib/sidekiq/belt/ent/files.rb

@@ -16,6 +16,8 @@ module Sidekiq
 
           Sidekiq::Belt::Ent::PeriodicPause.use! if all || options.include?(:periodic_pause)
           Sidekiq::Belt::Ent::PeriodicRun.use! if all || options.include?(:periodic_run)
+
+          true
         end
       end
     end

data/lib/sidekiq/belt/ent/periodic_pause.rb

@@ -22,7 +22,7 @@ module Sidekiq
           PAUSE_BUTTON = <<~ERB
             <form action="<%= root_path %>loops/<%= loup.lid %>/pause" method="post">
               <%= csrf_tag %>
-              <input class="btn btn-danger" type="submit" name="pause" value="<%= t('Pause') %>"
+              <input class="btn btn-danger btn-pause" type="submit" name="pause" value="<%= t('Pause') %>"
                 data-confirm="Pause the job <%= loup.klass %>? <%= t('AreYouSure') %>" />
             </form>
           ERB
@@ -30,13 +30,25 @@ module Sidekiq
           UNPAUSE_BUTTON = <<~ERB
             <form action="<%= root_path %>loops/<%= loup.lid %>/unpause" method="post">
               <%= csrf_tag %>
-              <input class="btn btn-danger" type="submit" name="pause" value="<%= t('Unpause') %>"
+              <input class="btn btn-danger btn-unpause" type="submit" name="pause" value="<%= t('Unpause') %>"
                 data-confirm="Unpause the job <%= loup.klass %>? <%= t('AreYouSure') %>" />
             </form>
           ERB
 
           def self.registered(app)
             app.replace_content("/loops") do |content|
+              content.gsub!("</header>", "</header>
+                <style>
+                  .btn-unpause {
+                    color: #000;
+                    background-image: none;
+                    background-color: #ddd;
+                  }
+                  .btn-unpause:hover {
+                    border: 1px solid;
+                  }
+                </style>")
+
               # Add the top of the table
               content.gsub!("</th>\n    </tr>", "</th><th><%= t('Pause/Unpause') %></th></th>\n    </tr>")
 

data/lib/sidekiq/belt/pro/failed_batch_remove.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "sidekiq/web/helpers"
+
+module Sidekiq
+  module Belt
+    module Pro
+      module FailedBatchRemove
+        module SidekiqFailedBatchRemove
+          REMOVE_BUTTON = <<~ERB
+            <form action="<%= root_path %>batches/<%= bid %>/remove" method="post">
+              <%= csrf_tag %>
+              <input class="btn btn-danger" type="submit" name="remove" value="<%= t('Remove') %>"
+                data-confirm="Do you want to remove batch <%= bid %>? <%= t('AreYouSure') %>" />
+            </form>
+          ERB
+
+          def self.registered(app)
+            app.replace_content("/batches") do |content|
+              content.gsub!("</th>\n      <%", "</th><th><%= t('Delete') %></th>\n      <%")
+
+              content.gsub!(
+                "</td>\n        </tr>\n      <% end %>",
+                "</td>\n<td>#{REMOVE_BUTTON}</td>\n      </tr>\n    <% end %>"
+              )
+            end
+
+            app.post("/batches/:bid/remove") do
+              Sidekiq::Batch::Status.new(params[:bid]).delete
+
+              return redirect "#{root_path}batches"
+            end
+          end
+        end
+
+        def self.use!
+          require("sidekiq/web")
+
+          Sidekiq::Web.register(Sidekiq::Belt::Pro::FailedBatchRemove::SidekiqFailedBatchRemove)
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/belt/pro/files.rb

@@ -2,18 +2,20 @@
 
 require "sidekiq"
 
-# require_relative "feature"
+require_relative "failed_batch_remove"
 
 module Sidekiq
   module Belt
     module Pro
       module Files
-        def self.use!(_options = [:all])
+        def self.use!(options = [:all])
           return unless Sidekiq.pro?
 
+          all = options.include?(:all)
+
+          Sidekiq::Belt::Pro::FailedBatchRemove.use! if all || options.include?(:failed_batch_remove)
+
           true
-          # all = options.include?(:all)
-          # Sidekiq::Belt::Pro::Feature.load! if all || options.include?(:feature)
         end
       end
     end

data/lib/sidekiq/belt/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Belt
-    VERSION = "0.2.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/sidekiq/web_action_helper.rb

@@ -5,10 +5,6 @@ require "sidekiq/web/action"
 
 module Sidekiq
   module WebActionHelper
-    def self.blocks
-      @blocks ||= {}
-    end
-
     def render(engine, content, options = {})
       begin
         path_info = /"([^"]*)"/.match(block.source.to_s)[1]
@@ -18,7 +14,7 @@ module Sidekiq
 
       path_info ||= ::Rack::Utils.unescape(env["PATH_INFO"])
 
-      Sidekiq::WebActionHelper.blocks.fetch(path_info.to_s, []).each do |content_block|
+      Sidekiq::Config::DEFAULTS[:replace_views].fetch(path_info.to_s, []).each do |content_block|
         content_block.call(content)
       end
 

data/lib/sidekiq/web_router_helper.rb

@@ -7,8 +7,9 @@ require_relative "web_action_helper"
 module Sidekiq
   module WebRouterHelper
     def replace_content(path, &block)
-      Sidekiq::WebActionHelper.blocks[path.to_s] ||= []
-      Sidekiq::WebActionHelper.blocks[path.to_s] << block
+      Sidekiq::Config::DEFAULTS[:replace_views] ||= {}
+      Sidekiq::Config::DEFAULTS[:replace_views][path.to_s] ||= []
+      Sidekiq::Config::DEFAULTS[:replace_views][path.to_s] << block
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-belt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Danilo Jeremias da Silva
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-14 00:00:00.000000000 Z
+date: 2023-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.1.4
 description: This Ruby gem enhances the capabilities of Sidekiq, Sidekiq Pro, and
   Sidekiq Enterprise by adding essential utilities.
 email:
@@ -45,6 +45,7 @@ files:
 - lib/sidekiq/belt/ent/files.rb
 - lib/sidekiq/belt/ent/periodic_pause.rb
 - lib/sidekiq/belt/ent/periodic_run.rb
+- lib/sidekiq/belt/pro/failed_batch_remove.rb
 - lib/sidekiq/belt/pro/files.rb
 - lib/sidekiq/belt/version.rb
 - lib/sidekiq/web_action_helper.rb