job_harbor 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ae6910cda3368da6dc2a045f5ee6530e40f476f641c0995fb2d5bcb7e9bc39c
-  data.tar.gz: 5fb0dba8946dec6d7246045bc3cadcc58055f0f8003cc5bc2222f322840f5eab
+  metadata.gz: 61fd4075abe3acb8265885f2ff9e5d007bede4df800c2c466b98e11cbc1810b2
+  data.tar.gz: c7b3836df141e4711ccb3f4828eb926da10f6f5d9901a996338e7977cb011641
 SHA512:
-  metadata.gz: 2dbeee4543ff34b659adaf03845c04cb014b38c57db10d1148b64ac850d92dfe3b675a099c87128b21ddadfd74e55764e4b9512253bf2bfc00a308277fd5ac99
-  data.tar.gz: c25578475dbc7c3265bef7560eed0327f58beb1584b6fa3cd9ab0cf643d9ccfa6a571824ea585edf1ac0b71d9e4d6cf3acb947c1ac483a193c4c441c052c3936
+  metadata.gz: fca96f13699a78acf5e848527c86df9f98e53ca6f1ce7ab7bd4b7d0ba923e737e8badadc86d990627bed83ffe8c81d07b1c324e0654f4f0704a5790bc223bf26
+  data.tar.gz: f3b64f11f8a06145c40830703b2d48f7ced097e01a173b3c63a9c645bb880701bf4e13174c2c3ecc9a570d7bbec9e4a2bd422888e9751c645138429720bfb412

data/app/components/job_harbor/job_filters_component.rb

@@ -3,8 +3,8 @@
 module JobHarbor
   class JobFiltersComponent < ApplicationComponent
     def initialize(class_names:, queue_names:, current_class:, current_queue:, current_path:, params: {})
-      @class_names = class_names
-      @queue_names = queue_names
+      @class_names = with_selected(class_names, current_class)
+      @queue_names = with_selected(queue_names, current_queue)
       @current_class = current_class
       @current_queue = current_queue
       @current_path = current_path
@@ -22,6 +22,11 @@ module JobHarbor
 
     private
 
+    # The active filter stays selectable even after its last job is gone.
+    def with_selected(names, current)
+      current.present? ? (names | [ current ]).sort : names
+    end
+
     def class_filter
       content_tag(:div, class: "flex items-center gap-1.5") do
         safe_join([

data/app/components/job_harbor/job_row_component.rb

@@ -2,8 +2,9 @@
 
 module JobHarbor
   class JobRowComponent < ApplicationComponent
-    def initialize(job:)
+    def initialize(job:, return_to: nil)
       @job = job
+      @return_to = return_to
     end
 
     def call
@@ -92,16 +93,20 @@ module JobHarbor
       end
     end
 
+    def return_to
+      @return_to || request.fullpath
+    end
+
     def retry_button
       return unless @job.can_retry?
 
-      button_to "Retry", retry_job_path(@job), method: :post, class: "btn btn-secondary btn-xs"
+      button_to "Retry", retry_job_path(@job), method: :post, params: { return_to: return_to }, class: "btn btn-secondary btn-xs"
     end
 
     def discard_button
       return unless @job.can_discard?
 
-      button_to "Discard", discard_job_path(@job), method: :delete, class: "btn btn-destructive btn-xs",
+      button_to "Discard", discard_job_path(@job), method: :delete, params: { return_to: return_to }, class: "btn btn-destructive btn-xs",
         form: { data: { confirm: "Are you sure you want to discard this job?" } }
     end
   end

data/app/controllers/job_harbor/jobs_controller.rb

@@ -44,7 +44,7 @@ module JobHarbor
     def retry
       if @job.can_retry?
         perform_retry(@job)
-        redirect_to job_path(@job), notice: "Job has been queued for retry."
+        redirect_to return_path || job_path(@job), allow_other_host: false, notice: "Job has been queued for retry."
       else
         redirect_to job_path(@job), alert: "This job cannot be retried."
       end
@@ -52,7 +52,7 @@ module JobHarbor
 
     def discard
       if @job.can_discard? && @job.discard
-        redirect_to jobs_path(status: params[:return_status]), notice: "Job has been discarded."
+        redirect_to return_path || jobs_path(status: params[:return_status]), allow_other_host: false, notice: "Job has been discarded."
       else
         redirect_to job_path(@job), alert: "This job cannot be discarded."
       end
@@ -78,6 +78,31 @@ module JobHarbor
       redirect_to jobs_path, alert: "Job not found."
     end
 
+    # Only a path inside this engine's mount, so a crafted param can't send the operator elsewhere.
+    def return_path
+      path = url_from(params[:return_to]) if params[:return_to].is_a?(String)
+      return unless path && within_mount?(path)
+
+      queue_page_gone?(path) ? queues_path : path
+    end
+
+    def within_mount?(path)
+      mount = request.script_name
+      return false unless path == mount || path.start_with?("#{mount}/", "#{mount}?")
+
+      raw = path.split("?", 2).first
+      # %2e%2e and %2f are resolved by the browser, so judge the decoded path too.
+      [ raw, URI.decode_www_form_component(raw) ].none? { |candidate| candidate.match?(%r{//|\\|\s}) || candidate.split("/").include?("..") }
+    rescue ArgumentError
+      false
+    end
+
+    # A queue with no jobs left stops existing, so its page would answer "Queue not found" and drop the notice.
+    def queue_page_gone?(path)
+      name = path.split("?", 2).first[%r{\A#{Regexp.escape(request.script_name)}/queues/([^/]+)\z}, 1]
+      name.present? && QueueStats.find(Rack::Utils.unescape_path(name)).nil?
+    end
+
     def per_page_param
       per_page = params[:per_page].to_i
       valid_sizes = JobHarbor::PerPageSelectorComponent::PAGE_SIZES

data/app/controllers/job_harbor/workers_controller.rb

@@ -5,6 +5,7 @@ module JobHarbor
     def index
       @workers = SolidQueue::Process.order(last_heartbeat_at: :desc)
       @active_count = Processes.alive.count
+      @live_workers_count = Processes.live_workers.count
       @stale_count = @workers.count - @active_count
       set_page_title "Workers"
     end

data/app/models/job_harbor/job_presenter.rb

@@ -192,9 +192,10 @@ module JobHarbor
       end
 
       def paginate(scope, page:, per_page:)
-        page = [ page.to_i, 1 ].max
-        offset = (page - 1) * per_page
         total = scope.count
+        pages = (total.to_f / per_page).ceil
+        page = [ [ page.to_i, 1 ].max, [ pages, 1 ].max ].min
+        offset = (page - 1) * per_page
 
         jobs = scope.preload(*EXECUTION_STATUSES.keys).order(id: :desc).limit(per_page).offset(offset).map { |job| new(job) }
         [ PageInfo.new(page: page, per_page: per_page, count: total), jobs ]

data/app/views/job_harbor/workers/index.html.erb

@@ -1,12 +1,12 @@
 <div class="grid grid-cols-1 sm:grid-cols-3 gap-4 mb-6">
   <%= render JobHarbor::StatCardComponent.new(
-    label: "Total Workers",
+    label: "Processes",
     value: @workers.count,
     type: :workers
   ) %>
 
   <%= render JobHarbor::StatCardComponent.new(
-    label: "Active",
+    label: "Live",
     value: @active_count,
     type: :finished
   ) %>
@@ -18,6 +18,8 @@
   ) %>
 </div>
 
+<p class="text-sm text-muted-foreground mb-6" data-live-workers>Live workers: <%= @live_workers_count %></p>
+
 <% if @workers.empty? %>
   <%= render JobHarbor::EmptyStateComponent.new(
     title: "No workers found",

data/lib/job_harbor/version.rb

@@ -1,3 +1,3 @@
 module JobHarbor
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: job_harbor
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Evan Sparkman