sidekiq-tasks 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed1b4bb10d4cc9515458f41b69d8c0d347f7ed8e58e8043538465978666a4eb4
-  data.tar.gz: ffe569c14fcef6e479e866666c5aaae303d69f145c657612334db9f03f7bfbf6
+  metadata.gz: b815ea42b8cc57ba73f3711e735fda709755b75c282e200dc18ab5287eadfdd6
+  data.tar.gz: 3e3e652e28ae9ee632452e89bab64bf34db9d4961a6b1eb7e5ff05914cfca3e3
 SHA512:
-  metadata.gz: f3f94631245ff618c1a0449160aa105122bcbfe34ce3df10ab1ac161fe44328ca0c551af0a2a635fef7a783762c2710e91c11dcd2c0fb5d1450ea83bd79a460d
-  data.tar.gz: 9de015b2eeacedc5104a033e07cf50dd47d760a09ef70389e32b9db36dfdc4594ceb971416f76a00f741accdb0fe6900730652cef9db1775e9ec760a0d21d496
+  metadata.gz: 53cb0abf54140641134acaf350bf51bf989f3b8d454359fe2b3f32a9ad1937d6257b06de3a000e602f3a63a217e475c4229c23712a88987731a27cab73485d29
+  data.tar.gz: 854ef40802df6e3d3cd6eda1eae39df3aff31efc8d1e82c69ae201b1ca3576060fcd9dd3bb71e7bfc6b1c8275f6db7169c61fcaabd84da18be121b3a9c0e55d6

data/.rubocop.yml

@@ -1,11 +1,15 @@
 AllCops:
-  TargetRubyVersion: 3.1
+  TargetRubyVersion: 3.0
   NewCops: disable
   SuggestExtensions: false
 
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
 
+Layout/LineLength:
+  Exclude:
+    - spec/**/*
+
 Metrics/AbcSize:
   Exclude:
     - lib/sidekiq/tasks/web/extension.rb
@@ -23,6 +27,10 @@ Metrics/ParameterLists:
   Exclude:
     - spec/**/*
 
+Metrics/PerceivedComplexity:
+  Exclude:
+    - lib/sidekiq/tasks/web/extension.rb
+
 Naming/FileName:
   Exclude:
     - lib/sidekiq/sidekiq-tasks.rb
@@ -57,3 +65,6 @@ Style/TrailingCommaInArrayLiteral:
 
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
+
+Style/WordArray:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Changelog
 
+### [0.1.3] - 2025-03-22
+
+- Change required Ruby version to 3.0.0.
+- Add `DisableWithComment` rule to disable a specific task with a magic comment.
+
+### [0.1.2] - 2025-03-22
+
+- Update plugin registration for Sidekiq 7.3+ compatibility.
+
 ### [0.1.1] - 2025-02-25
 
 - Add an environment confirmation input to the task enqueuing form.

data/README.md

@@ -56,10 +56,20 @@ task :my_task do
 end
 ```
 
+You can also use `DisableWithComment` rule to selectively **exclude** tasks. (see [strategies configuration](#strategies-configuration))
+It works similarly to `EnableWithComment`, but with inverted logic. Example of a disabled task:
+
+```ruby
+# sidekiq-tasks:disable
+task :my_task do
+  puts "my_task"
+end
+```
+
 ## Strategies configuration
 
 Strategies can be configured through the `config.strategies` option.
-For example if you want to remove the `EnableWithComment` rule from the default strategy and enable all tasks from the `lib` folder:
+For example if you want to enable all tasks in the lib folder and disable a few specific ones manually:
 
 ```ruby
 Sidekiq::Tasks.configure do |config|
@@ -67,6 +77,7 @@ Sidekiq::Tasks.configure do |config|
     Sidekiq::Tasks::Strategies::RakeTask.new(
       rules: [
         Sidekiq::Tasks::Strategies::Rules::TaskFromLib.new,
+        Sidekiq::Tasks::Strategies::Rules::DisableWithComment.new,
       ]
     )
   ]

data/lib/sidekiq/tasks/strategies/rules/disable_with_comment.rb

@@ -0,0 +1,19 @@
+module Sidekiq
+  module Tasks
+    module Strategies
+      module Rules
+        class DisableWithComment < EnableWithComment
+          def respected?(task)
+            !super
+          end
+
+          protected
+
+          def magic_comment_regex
+            /sidekiq-tasks:disable/
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/tasks/strategies/rules/enable_with_comment.rb

@@ -3,24 +3,28 @@ module Sidekiq
     module Strategies
       module Rules
         class EnableWithComment < Base
-          MAGIC_COMMENT_REGEX = /sidekiq-tasks:enable/
-
           def respected?(task)
-            file, start_line = task.locations.first.split(":")
-            start_line_counting_desc = start_line.to_i > 2 ? start_line.to_i - 3 : 0
-            lines = File.read(file).split("\n")[start_line_counting_desc..start_line_counting_desc + 1].reverse
+            lines = relevant_lines(task)
 
-            valid_magic_comment_line?(lines)
-          rescue Errno::ENOENT
-            raise ArgumentError, "File '#{file}' not found"
+            return false if lines.first.match?(/namespace/)
+
+            lines.any? { |line| line.strip.match?(magic_comment_regex) }
           end
 
-          private
+          protected
 
-          def valid_magic_comment_line?(lines)
-            return false if lines.first.match?(/namespace/)
+          def magic_comment_regex
+            /sidekiq-tasks:enable/
+          end
+
+          private
 
-            lines.any? { |line| line.strip.match?(MAGIC_COMMENT_REGEX) }
+          def relevant_lines(task)
+            file, start_line = task.locations.first.split(":")
+            start_line_counting_desc = start_line.to_i > 2 ? start_line.to_i - 3 : 0
+            File.read(file).split("\n")[start_line_counting_desc..start_line_counting_desc + 1].reverse
+          rescue Errno::ENOENT
+            raise ArgumentError, "File '#{file}' not found"
           end
         end
       end

data/lib/sidekiq/tasks/strategies/rules.rb

@@ -5,6 +5,7 @@ module Sidekiq
         autoload :Base, "sidekiq/tasks/strategies/rules/base"
         autoload :TaskFromLib, "sidekiq/tasks/strategies/rules/task_from_lib"
         autoload :EnableWithComment, "sidekiq/tasks/strategies/rules/enable_with_comment"
+        autoload :DisableWithComment, "sidekiq/tasks/strategies/rules/disable_with_comment"
       end
     end
   end

data/lib/sidekiq/tasks/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Tasks
-    VERSION = "0.1.1"
+    VERSION = "0.1.3"
   end
 end

data/lib/sidekiq/tasks/web/extension.rb

@@ -1,25 +1,27 @@
+require "sidekiq/tasks/web/helpers/application_helper"
+require "sidekiq/tasks/web/helpers/task_helper"
+require "sidekiq/tasks/web/helpers/pagination_helper"
+require "sidekiq/tasks/web/search"
+require "sidekiq/tasks/web/pagination"
+require "sidekiq/tasks/web/params"
+
 module Sidekiq
   module Tasks
     module Web
       class Extension
-        LOCALES_PATH = File.expand_path("../web/locales", __dir__).freeze
-
         def self.registered(app)
-          app.settings.locales << File.join(LOCALES_PATH)
-
-          app.helpers do
-            include Sidekiq::Tasks::Web::Helpers::ApplicationHelper
-            include Sidekiq::Tasks::Web::Helpers::TaskHelper
-          end
+          app.helpers(Sidekiq::Tasks::Web::Helpers::ApplicationHelper)
+          app.helpers(Sidekiq::Tasks::Web::Helpers::TaskHelper)
+          app.helpers(Sidekiq::Tasks::Web::Helpers::PaginationHelper)
 
           app.get "/tasks" do
-            @search = Sidekiq::Tasks::Web::Search.new(params)
+            @search = Sidekiq::Tasks::Web::Search.new(params.transform_keys(&:to_sym))
 
             erb(read_view(:tasks), locals: {search: @search})
           end
 
           app.get "/tasks/:name" do
-            @task = find_task!(params["name"])
+            @task = find_task!(env["rack.route_params"][:name])
 
             erb(read_view(:task), locals: {task: @task})
           rescue Sidekiq::Tasks::NotFoundError
@@ -31,7 +33,7 @@ module Sidekiq
               throw :halt, [400, {Rack::CONTENT_TYPE => "text/plain"}, ["Invalid confirm"]]
             end
 
-            task = find_task!(params["name"])
+            task = find_task!(env["rack.route_params"][:name])
             args = Sidekiq::Tasks::Web::Params.new(task, params["args"]).permit!
 
             task.enqueue(args)

data/lib/sidekiq/tasks/web/helpers/application_helper.rb

@@ -5,10 +5,8 @@ module Sidekiq
         module ApplicationHelper
           extend self
 
-          VIEW_PATH = File.expand_path("../../web/views", __dir__).freeze
-
           def read_view(name)
-            File.read(File.join(VIEW_PATH, "#{name}.html.erb"))
+            File.read(File.join(Sidekiq::Tasks::Web::ROOT, "views", "#{name}.erb"))
           end
 
           def current_env

data/lib/sidekiq/tasks/web/helpers/pagination_helper.rb

@@ -0,0 +1,40 @@
+module Sidekiq
+  module Tasks
+    module Web
+      module Helpers
+        module PaginationHelper
+          extend self
+
+          def pagination_link(root_path, link, search)
+            build_tag(:li, class: "st-page-item") do
+              build_tag(
+                :a,
+                link[:text],
+                class: build_classes("st-page-link", disabled: link[:disabled], active: link[:active]),
+                href: pagination_url(root_path, search, link[:page])
+              )
+            end
+          end
+
+          private
+
+          def build_tag(tag, content = nil, **attributes, &block)
+            attr_string = attributes.map { |key, value| "#{key}=\"#{value}\"" }.join(" ")
+
+            "<#{tag} #{attr_string}>#{block&.call || content}</#{tag}>"
+          end
+
+          def build_classes(*classes, **conditions)
+            condition_classes = conditions.select { |_, value| value }.keys
+
+            (classes + condition_classes).join(" ")
+          end
+
+          def pagination_url(root_path, search, page)
+            "#{root_path}tasks?filter=#{ERB::Util.url_encode(search.filter)}&count=#{search.count}&page=#{page}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/tasks/web/pagination.rb

@@ -0,0 +1,86 @@
+module Sidekiq
+  module Tasks
+    module Web
+      class Pagination
+        PREV_LABEL = "«".freeze
+        NEXT_LABEL = "»".freeze
+        ELLIPSIS_LABEL = "...".freeze
+        MIN_PAGE_DISPLAY = 7
+        PAGE_OFFSET = 2
+
+        attr_reader :current_page, :total_pages
+
+        def initialize(current_page, total_pages)
+          @current_page = current_page
+          @total_pages = total_pages
+        end
+
+        def links
+          return [] if total_pages <= 1
+
+          build_links.flatten.compact
+        end
+
+        private
+
+        def build_links
+          [
+            navigation_link(PREV_LABEL, current_page - 1, current_page > 1),
+            first_page_link,
+            leading_ellipsis,
+            middle_page_links,
+            trailing_ellipsis,
+            last_page_link,
+            navigation_link(NEXT_LABEL, current_page + 1, current_page < total_pages),
+          ]
+        end
+
+        def navigation_link(text, page, enabled)
+          enabled ? {page: page, text: text} : {page: nil, text: text, disabled: true}
+        end
+
+        def page_link(page)
+          {page: page, text: page.to_s, active: page == current_page}
+        end
+
+        def ellipsis
+          {page: 1, text: ELLIPSIS_LABEL, disabled: true}
+        end
+
+        def first_page_link
+          return nil if total_pages <= MIN_PAGE_DISPLAY
+
+          page_link(1)
+        end
+
+        def last_page_link
+          return nil if total_pages <= MIN_PAGE_DISPLAY
+
+          page_link(total_pages)
+        end
+
+        def leading_ellipsis
+          return nil if total_pages <= MIN_PAGE_DISPLAY || current_page <= PAGE_OFFSET + 2
+
+          ellipsis
+        end
+
+        def trailing_ellipsis
+          return nil if total_pages <= MIN_PAGE_DISPLAY || current_page >= total_pages - (PAGE_OFFSET + 1)
+
+          ellipsis
+        end
+
+        def middle_page_links
+          if total_pages <= MIN_PAGE_DISPLAY
+            (1..total_pages).map { |page| page_link(page) }
+          else
+            start_page = [current_page - PAGE_OFFSET, 2].max
+            end_page   = [current_page + PAGE_OFFSET, total_pages - 1].min
+            (start_page..end_page).map { |page| page_link(page) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/tasks/web/search.rb

@@ -2,10 +2,10 @@ module Sidekiq
   module Tasks
     module Web
       class Search
-        DEFAULT_COUNT = 25
+        DEFAULT_COUNT = 15
 
         def self.count_options
-          (1..4).map { |index| index * DEFAULT_COUNT }
+          (0..3).map { |index| DEFAULT_COUNT * (2**index) }
         end
 
         attr_reader :params

data/lib/sidekiq/tasks/web.rb

@@ -1,28 +1,37 @@
-require "sidekiq/tasks/web/helpers/application_helper"
-require "sidekiq/tasks/web/helpers/task_helper"
-require "sidekiq/tasks/web/search"
-require "sidekiq/tasks/task"
+require "sidekiq/tasks"
 
 module Sidekiq
   module Tasks
     module Web
-      ASSET_PATH = File.expand_path("web/assets", __dir__).freeze
-
       autoload :Extension, "sidekiq/tasks/web/extension"
-      autoload :Params, "sidekiq/tasks/web/params"
+
+      ROOT = File.expand_path("../../../web", File.dirname(__FILE__))
+      SIDEKIQ_GTE_7_3_0 = Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new("7.3.0")
     end
   end
 end
 
-if defined?(Sidekiq::Web)
+if Sidekiq::Tasks::Web::SIDEKIQ_GTE_7_3_0
+  Sidekiq::Web.configure do |config|
+    config.register(
+      Sidekiq::Tasks::Web::Extension,
+      name: "tasks",
+      tab: ["Tasks"],
+      index: ["tasks"],
+      root_dir: Sidekiq::Tasks::Web::ROOT,
+      asset_paths: ["js", "css"]
+    )
+  end
+else
+  Sidekiq::Web.tabs["Tasks"] = "tasks"
+  Sidekiq::Web.register(Sidekiq::Tasks::Web::Extension)
+  Sidekiq::Web.locales << "#{Sidekiq::Tasks::Web::ROOT}/locales"
+
   Sidekiq::Web.use(
     Rack::Static,
-    urls: ["/javascripts"],
-    root: File.expand_path("web/assets", __dir__),
+    urls: ["/tasks/css", "/tasks/js"],
+    root: "#{Sidekiq::Tasks::Web::ROOT}/assets",
     cascade: true,
     header_rules: [[:all, {"cache-control" => "private, max-age=86400"}]]
   )
-
-  Sidekiq::Web.register(Sidekiq::Tasks::Web::Extension)
-  Sidekiq::Web.tabs["Tasks"] = "tasks"
 end

data/web/assets/tasks/css/components/buttons.css

@@ -0,0 +1,41 @@
+:root {
+  --st-button-bg: #b1003e;
+  --st-button-text: white;
+  --st-button-border: none;
+  --st-button-hover-bg: #900030;
+  --st-button-disabled-bg: #ccc;
+  --st-button-disabled-text: #666;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --st-button-bg: #900030;
+    --st-button-text: white;
+    --st-button-border: none;
+    --st-button-hover-bg: #700024;
+    --st-button-disabled-bg: #555;
+    --st-button-disabled-text: #aaa;
+  }
+}
+
+.st-button {
+  background-color: var(--st-button-bg);
+  color: var(--st-button-text);
+  border: var(--st-button-border);
+  padding: 8px 16px;
+  border-radius: 6px;
+  font-size: 16px;
+  cursor: pointer;
+  transition: background 0.3s ease-in-out;
+}
+
+.st-button:hover {
+  background-color: var(--st-button-hover-bg);
+}
+
+.st-button:disabled {
+  background-color: var(--st-button-disabled-bg);
+  color: var(--st-button-disabled-text);
+  cursor: not-allowed;
+}
+

data/web/assets/tasks/css/components/forms.css

@@ -0,0 +1,110 @@
+:root {
+  --st-border-color: #ccc;
+  --st-focus-border-color: #b1003e;
+  --st-input-bg: white;
+  --st-input-text: #000;
+  --st-select-bg: #ddd;
+  --st-label-color: #000;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --st-border-color: #555;
+    --st-focus-border-color: #900030;
+    --st-input-bg: #222;
+    --st-input-text: #ddd;
+    --st-select-bg: #333;
+    --st-label-color: #ddd;
+  }
+}
+
+.st-search-form {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  max-width: 350px;
+}
+
+.st-form-container {
+  max-width: 600px;
+}
+
+.st-form-row {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 15px;
+}
+
+.st-form-group {
+  flex: 1 1 calc(50% - 15px);
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 15px;
+}
+
+.st-form-group-full {
+  flex: 1 1 100%;
+  display: flex;
+  flex-direction: column;
+  margin-bottom: 15px;
+}
+
+.st-label {
+  font-weight: bold;
+  margin-bottom: 5px;
+  font-size: 14px;
+  color: var(--st-label-color);
+}
+
+.st-input {
+  width: 100%;
+  height: auto;
+  border: 1px solid var(--st-border-color);
+  padding: 8px 12px;
+  border-radius: 6px;
+  font-size: 16px;
+  background-color: var(--st-input-bg);
+  color: var(--st-input-text);
+  transition: border 0.3s ease-in-out, background 0.3s ease-in-out;
+}
+
+.st-input:focus,
+.st-select:focus {
+  outline: none;
+  border: 1px solid var(--st-focus-border-color);
+}
+
+.st-select {
+  height: auto;
+  border: 1px solid var(--st-border-color);
+  padding: 8px;
+  border-radius: 6px;
+  font-size: 16px;
+  background-color: var(--st-select-bg);
+  color: var(--st-input-text);
+  transition: border 0.3s ease-in-out, background 0.3s ease-in-out;
+}
+
+.st-input,
+.st-select,
+.st-button {
+  height: 40px;
+  box-sizing: border-box;
+}
+
+@media (max-width: 600px) {
+  .st-form-row {
+    flex-direction: column;
+    gap: 0;
+  }
+
+  .st-form-group,
+  .st-form-group-full {
+    flex: 1 1 100%;
+  }
+
+  .st-form-container {
+    max-width: 100%;
+    padding: 10px 0;
+  }
+}

data/web/assets/tasks/css/components/pagination.css

@@ -0,0 +1,52 @@
+:root {
+  --st-pagination-text: #b1003e;
+  --st-pagination-active-opacity: 0.5;
+  --st-pagination-disabled-text: #ccc;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --st-pagination-text: #ff4d79;
+    --st-pagination-active-opacity: 0.7;
+    --st-pagination-disabled-text: #555;
+  }
+}
+
+.st-pagination-wrapper {
+  overflow-x: auto;
+  padding-bottom: 10px;
+  display: flex;
+  width: 100%;
+  justify-content: space-between;
+}
+
+.st-pagination {
+  display: flex;
+  gap: 5px;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  white-space: nowrap;
+}
+
+.st-page-item {
+  display: flex;
+}
+
+a.st-page-link {
+  text-decoration: none;
+  display: block;
+  color: var(--st-pagination-text);
+  font-size: 14px;
+  transition: background 0.2s ease-in-out, color 0.2s ease-in-out;
+}
+
+a.st-page-link.active {
+  opacity: var(--st-pagination-active-opacity);
+}
+
+a.st-page-link.disabled {
+  pointer-events: none;
+  color: var(--st-pagination-disabled-text);
+}
+

data/web/assets/tasks/css/components/tables.css

@@ -0,0 +1,48 @@
+:root {
+  --st-table-bg: transparent;
+  --st-table-text: #333;
+  --st-table-border: #ddd;
+  --st-table-odd-bg: #fcfcfc;
+  --st-table-even-bg: transparent;
+  --st-table-header-bg: transparent;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --st-table-bg: transparent;
+    --st-table-text: #ddd;
+    --st-table-border: #555;
+    --st-table-odd-bg: #222;
+    --st-table-even-bg: #333;
+    --st-table-header-bg: #111;
+  }
+}
+
+.st-table {
+  background-color: var(--st-table-bg);
+  color: var(--st-table-text);
+  width: 100%;
+  max-width: 100%;
+  margin-bottom: 20px;
+}
+
+.st-table thead > tr > th,
+.st-table tbody > tr > th,
+.st-table tbody > tr > td {
+  border: 1px solid var(--st-table-border);
+  padding: 7px 10px;
+}
+
+.st-table tbody tr:nth-child(odd) {
+  background-color: var(--st-table-odd-bg);
+}
+
+.st-table tbody tr:nth-child(even) th,
+.st-table tbody tr:nth-child(even) td {
+  background-color: var(--st-table-even-bg);
+}
+
+.st-table thead > tr > th {
+  background-color: var(--st-table-header-bg);
+}
+

data/web/assets/tasks/css/ext.css

@@ -0,0 +1,7 @@
+@import url("utilities.css");
+@import url("layouts/header.css");
+@import url("components/forms.css");
+@import url("components/tables.css");
+@import url("components/buttons.css");
+@import url("components/pagination.css");
+

data/web/assets/tasks/css/layouts/header.css

@@ -0,0 +1,5 @@
+.st-header {
+  padding-top: 15px;
+  padding-bottom: 15px;
+}
+

data/web/assets/tasks/css/utilities.css

@@ -0,0 +1,8 @@
+.st-text-primary {
+  color: #b1003e;
+}
+
+.st-ms-1 {
+  margin-left: 0.25rem;
+}
+

data/{lib/sidekiq/tasks/web/assets/javascripts → web/assets/tasks/js}/env_confirmation.js

@@ -1,10 +1,10 @@
-class EnvConfirmationController {
+class EnvConfirmation {
   constructor(envConfirmationInputSelector, submitBtnSelector) {
     this.envConfirmationInput = document.querySelector(envConfirmationInputSelector);
     this.submitBtn = document.querySelector(submitBtnSelector);
   }
 
-  connect() {
+  init() {
     this.submitBtn.disabled = true;
     this.currentEnv = this.envConfirmationInput.dataset.currentEnv;
     this.envConfirmationInput.addEventListener("input", this.#handleInputChange.bind(this));
@@ -16,5 +16,5 @@ class EnvConfirmationController {
 }
 
 document.addEventListener("DOMContentLoaded", function() {
-  new EnvConfirmationController("#envConfirmationInput", "#submitBtn").connect();
+  new EnvConfirmation("#envConfirmationInput", "#submitBtn").init();
 });

data/{lib/sidekiq/tasks/web → web}/locales/en.yml

@@ -1,4 +1,5 @@
 en:
+  search: "Search"
   prev: "Prev"
   next: "Next"
   tasks: "Tasks"

data/{lib/sidekiq/tasks/web → web}/locales/fr.yml

@@ -1,4 +1,5 @@
 fr:
+  search: "Rechercher"
   prev: "Précédent"
   next: "Suivant"
   tasks: "Tâches"

data/web/views/_pagination.erb

@@ -0,0 +1,15 @@
+<% if search.total_pages > 1 %>
+  <div class="st-pagination-wrapper">
+    <div>
+      <small class="st-text-primary">
+        <%= search.tasks.size %> / <%= Sidekiq::Tasks.tasks.size %>
+      </small>
+    </div>
+
+    <ul class="st-pagination">
+      <% Sidekiq::Tasks::Web::Pagination.new(search.page, search.total_pages).links.each do |link| %>
+        <%= pagination_link(root_path, link, search) %>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/{lib/sidekiq/tasks/web/views/task.html.erb → web/views/task.erb}

@@ -1,10 +1,14 @@
-<header class="row">
-  <div class="col-sm-5 pull-left">
-    <h1><%= t("task") %></h1>
-  </div>
+<% if Sidekiq::Tasks::Web::SIDEKIQ_GTE_7_3_0 %>
+  <% style_tag "tasks/css/ext.css" %>
+<% else %>
+  <link href="<%= root_path %>tasks/css/ext.css" media="screen" rel="stylesheet" type="text/css"/>
+<% end %>
+
+<header class="st-header">
+  <h1><%= t("task") %></h1>
 </header>
 
-<table class="table table-bordered table-striped">
+<table class="st-table">
   <tbody>
     <tr>
       <th><%= t("name") %></th>
@@ -25,8 +29,8 @@
   </tbody>
 </table>
 
-<header class="row">
-  <div class="col-sm-12">
+<header class="">
+  <div class="">
     <h2><%= t("history") %></h2>
   </div>
 </header>
@@ -34,7 +38,7 @@
 <% if task.history.empty? %>
   <p><%= t("no_history") %></p>
 <% else %>
-  <table class="table table-hover table-bordered table-striped">
+  <table class="st-table">
     <thead>
     <tr>
       <th><%= t("jid") %></th>
@@ -56,48 +60,38 @@
   </table>
 <% end %>
 
-<header class="row">
-  <div class="col-sm-12">
+<header class="">
+  <div class="">
     <h2><%= t("run_task") %></h2>
   </div>
 </header>
 
-<form action="<%= task_url(root_path, task) %>/enqueue" method="post">
+<form action="<%= task_url(root_path, task) %>/enqueue" method="post" class="st-form-container">
   <%= csrf_tag %>
 
-  <div class="row">
+  <div class="st-form-row">
     <% task.args.each do |arg| %>
-      <div class="col-sm-6">
-        <div class="form-group">
-          <label for="<%= arg %>"><%= arg %></label>
-          <input type="text" id="<%= arg %>" class="form-control" name="args[<%= arg %>]"/>
-        </div>
+      <div class="st-form-group">
+        <label for="<%= arg %>" class="st-label"><%= arg %></label>
+        <input type="text" id="<%= arg %>" class="st-input" name="args[<%= arg %>]"/>
       </div>
     <% end %>
   </div>
 
-  <div class="row">
-    <div class="col-sm-6">
-      <div class="form-group">
-        <label for="confirmInput">
-          <%= t("env_confirmation", current_env: current_env) %>
-        </label>
-
-        <input
-          type="text"
-          id="envConfirmationInput"
-          class="form-control"
-          name="env_confirmation"
-          data-current-env="<%= current_env %>"
-          required
-        />
-      </div>
-    </div>
+  <div class="st-form-group-full">
+    <label for="envConfirmationInput" class="st-label">
+      <%= t("env_confirmation", current_env: current_env) %>
+    </label>
+    <input type="text" id="envConfirmationInput" class="st-input" name="env_confirmation" data-current-env="<%= current_env %>" required/>
   </div>
 
-  <button type="submit" class="btn btn-primary" id="submitBtn" disabled>
+  <button type="submit" class="st-button" id="submitBtn" disabled> 
     <%= t("enqueue") %>
   </button>
 </form>
 
-<script type="text/javascript" src="<%= root_path %>javascripts/env_confirmation.js"></script>
+<% if Sidekiq::Tasks::Web::SIDEKIQ_GTE_7_3_0 %>
+  <%= script_tag "tasks/js/env_confirmation.js" %>
+<% else %>
+  <script type="text/javascript" src="<%= root_path %>tasks/js/env_confirmation.js"></script>
+<% end %>

data/{lib/sidekiq/tasks/web/views/tasks.html.erb → web/views/tasks.erb}

@@ -1,10 +1,14 @@
-<div class="header-container">
-  <h1><%= t("tasks") %></h1>
+<% if Sidekiq::Tasks::Web::SIDEKIQ_GTE_7_3_0 %>
+  <% style_tag "tasks/css/ext.css" %>
+<% else %>
+  <link href="<%= root_path %>tasks/css/ext.css" media="screen" rel="stylesheet" type="text/css"/>
+<% end %>
 
-  <form action="<%= root_path %>tasks" class="form-inline" method="get">
-    <input name="filter" class="form-control" type="text" value="<%= @search.filter %>" />
+<header class="st-header">
+  <form action="<%= root_path %>tasks" method="get" class="st-search-form">
+    <input name="filter" class="st-input" type="text" value="<%= @search.filter %>" placeholder="<%= t("search") %>">
 
-    <select name="count" class="form-control">
+    <select name="count" class="st-select">
       <% Sidekiq::Tasks::Web::Search.count_options.each do |count| %>
         <option value="<%= count %>" <%= "selected" if @search.count == count %>>
           <%= count %>
@@ -12,18 +16,16 @@
       <% end %>
     </select>
 
-    <input name="page" type="hidden" value="<%= @search.page %>" />
-
-    <button class="btn btn-default" type="submit">
+    <button type="submit" class="st-button st-button-primary">
       <%= t("filter") %>
     </button>
   </form>
-</div>
+</header>
 
 <% if @search.tasks.empty? %>
   <%= t("no_tasks") %>
 <% else %>
-  <table class="table table-hover table-bordered table-striped table-white">
+  <table class="st-table">
     <thead>
       <tr>
         <th><%= t("name") %></th>
@@ -34,7 +36,7 @@
       <% @search.tasks.each do |task| %>
         <tr>
           <td>
-            <a href="<%= task_url(root_path, task) %>">
+            <a href="<%= task_url(root_path, task) %>" class="st-text-primary">
               <b><%= task.name %></b>
             </a>
           </td>
@@ -45,9 +47,5 @@
     </tbody>
   </table>
 
-  <div class="pull-left">
-    <%= @search.tasks.size %> / <%= Sidekiq::Tasks.tasks.size %>
-  </div>
-
-  <%= render(:erb, read_view(:_pagination), locals: {search: @search}) %>
+  <%= erb(read_view(:_pagination), locals: {search: @search}) %>
 <% end %>

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-tasks
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Victor
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -29,182 +30,196 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.5'
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.40'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.40'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-session
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.1
+        version: '0'
 description: |
   Sidekiq Tasks is an extension for Sidekiq that provides an interface for launching tasks.
   Natively supports rake tasks and can be easily extended to support other task execution systems.
@@ -235,6 +250,7 @@ files:
 - lib/sidekiq/tasks/strategies/rake_task.rb
 - lib/sidekiq/tasks/strategies/rules.rb
 - lib/sidekiq/tasks/strategies/rules/base.rb
+- lib/sidekiq/tasks/strategies/rules/disable_with_comment.rb
 - lib/sidekiq/tasks/strategies/rules/enable_with_comment.rb
 - lib/sidekiq/tasks/strategies/rules/task_from_lib.rb
 - lib/sidekiq/tasks/task.rb
@@ -242,18 +258,27 @@ files:
 - lib/sidekiq/tasks/validations.rb
 - lib/sidekiq/tasks/version.rb
 - lib/sidekiq/tasks/web.rb
-- lib/sidekiq/tasks/web/assets/javascripts/env_confirmation.js
 - lib/sidekiq/tasks/web/extension.rb
 - lib/sidekiq/tasks/web/helpers/application_helper.rb
+- lib/sidekiq/tasks/web/helpers/pagination_helper.rb
 - lib/sidekiq/tasks/web/helpers/task_helper.rb
-- lib/sidekiq/tasks/web/locales/en.yml
-- lib/sidekiq/tasks/web/locales/fr.yml
+- lib/sidekiq/tasks/web/pagination.rb
 - lib/sidekiq/tasks/web/params.rb
 - lib/sidekiq/tasks/web/search.rb
-- lib/sidekiq/tasks/web/views/_pagination.html.erb
-- lib/sidekiq/tasks/web/views/task.html.erb
-- lib/sidekiq/tasks/web/views/tasks.html.erb
 - sig/sidekiq/tasks.rbs
+- web/assets/tasks/css/components/buttons.css
+- web/assets/tasks/css/components/forms.css
+- web/assets/tasks/css/components/pagination.css
+- web/assets/tasks/css/components/tables.css
+- web/assets/tasks/css/ext.css
+- web/assets/tasks/css/layouts/header.css
+- web/assets/tasks/css/utilities.css
+- web/assets/tasks/js/env_confirmation.js
+- web/locales/en.yml
+- web/locales/fr.yml
+- web/views/_pagination.erb
+- web/views/task.erb
+- web/views/tasks.erb
 homepage: https://github.com/victorauthiat/sidekiq-tasks
 licenses:
 - MIT
@@ -261,6 +286,7 @@ metadata:
   homepage_uri: https://github.com/victorauthiat/sidekiq-tasks
   source_code_uri: https://github.com/victorauthiat/sidekiq-tasks/blob/master
   changelog_uri: https://github.com/victorauthiat/sidekiq-tasks/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -268,14 +294,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Sidekiq extension for launching tasks.
 test_files: []

data/lib/sidekiq/tasks/web/views/_pagination.html.erb

@@ -1,25 +0,0 @@
-<% if search.total_pages > 1 %>
-  <ul class="pagination pull-right">
-    <% if search.page > 1 %>
-      <li>
-        <a href="<%= "#{root_path}tasks?filter=#{ERB::Util.url_encode(search.filter)}&count=#{search.count}&page=#{search.page - 1}" %>">
-          <%= t("prev") %>
-        </a>
-      </li>
-    <% end %>
-
-    <% (0..(search.total_pages - 1)).each.with_index(1) do |_page, index| %>
-      <li class="<%= 'active' if index == search.page %>">
-        <a href="<%= "#{root_path}tasks?filter=#{ERB::Util.url_encode(search.filter)}&count=#{search.count}&page=#{index}" %>"><%= index %></a>
-      </li>
-    <% end %>
-
-    <% if search.tasks.any? && search.tasks.size == search.count %>
-      <li>
-        <a href="<%= "#{root_path}tasks?filter=#{ERB::Util.url_encode(search.filter)}&count=#{search.count}&page=#{search.page + 1}" %>">
-          <%= t("next") %>
-        </a>
-      </li>
-    <% end %>
-  </ul>
-<% end %>