solid_queue_tui 0.1.2 → 0.1.3

data/lib/solid_queue_tui/views/failed_view.rb

@@ -4,62 +4,29 @@ module SolidQueueTui
   module Views
     class FailedView
       include Filterable
-
-
-      LOAD_THRESHOLD = 10
+      include Confirmable
+      include Paginatable
+      include FormattingHelpers
 
       def initialize(tui)
         @tui = tui
-        @table_state = RatatuiRuby::TableState.new(nil)
-        @table_state.select(0)
-        @selected_row = 0
-        @failed_jobs = []
-        @total_count = nil
-        @all_loaded = false
-        @confirm_action = nil
+        init_pagination
+        init_confirm
         init_filter
       end
 
       def update(failed_jobs:)
-        @failed_jobs = failed_jobs
-        @all_loaded = failed_jobs.size < SolidQueueTui.page_size
-        @selected_row = @selected_row.clamp(0, [@failed_jobs.size - 1, 0].max)
-        @table_state.select(@selected_row)
+        update_items(failed_jobs)
       end
 
       def append(failed_jobs:)
-        @failed_jobs.concat(failed_jobs)
-        @all_loaded = failed_jobs.size < SolidQueueTui.page_size
-      end
-
-      def total_count=(count)
-        @total_count = count
-      end
-
-      def current_offset
-        @failed_jobs.size
-      end
-
-      def reset_pagination!
-        @failed_jobs = []
-        @total_count = nil
-        @all_loaded = false
-        @selected_row = 0
-        @table_state.select(0)
+        append_items(failed_jobs)
       end
 
       def render(frame, area)
-        if @confirm_action
-          confirm_area, content_area = @tui.layout_split(
-            area,
-            direction: :vertical,
-            constraints: [
-              @tui.constraint_length(3),
-              @tui.constraint_fill(1)
-            ]
-          )
-          render_confirm(frame, confirm_area)
-          render_failed_table(frame, content_area)
+        if confirm_mode?
+          render_failed_table(frame, area)
+          render_confirm_popup(frame, area)
         elsif filter_mode?
           filter_area, content_area = @tui.layout_split(
             area,
@@ -77,7 +44,7 @@ module SolidQueueTui
       end
 
       def handle_input(event)
-        if @confirm_action
+        if confirm_mode?
           handle_confirm_input(event)
         elsif filter_mode?
           handle_filter_input(event)
@@ -86,17 +53,9 @@ module SolidQueueTui
         end
       end
 
-      def selected_item
-        return nil if @failed_jobs.empty? || @selected_row >= @failed_jobs.size
-        @failed_jobs[@selected_row]
-      end
-
       def bindings
-        if @confirm_action
-          [
-            { key: "y", action: "Confirm" },
-            { key: "n/Esc", action: "Cancel" }
-          ]
+        if confirm_mode?
+          confirm_bindings
         elsif filter_mode?
           filter_bindings
         else
@@ -112,7 +71,7 @@ module SolidQueueTui
       end
 
       def capturing_input?
-        filter_mode? || @confirm_action
+        filter_mode? || confirm_mode?
       end
 
       def breadcrumb
@@ -121,10 +80,6 @@ module SolidQueueTui
 
       private
 
-      def needs_more?
-        !@all_loaded && @selected_row >= @failed_jobs.size - LOAD_THRESHOLD
-      end
-
       def handle_normal_input(event)
         case event
         in { type: :key, code: "j" } | { type: :key, code: "up" }
@@ -144,7 +99,7 @@ module SolidQueueTui
           @confirm_action = :discard if selected_item
           nil
         in { type: :key, code: "A" }
-          @confirm_action = :retry_all unless @failed_jobs.empty?
+          @confirm_action = :retry_all unless items.empty?
           nil
         in { type: :key, code: "/" }
           enter_filter_mode
@@ -156,52 +111,38 @@ module SolidQueueTui
         end
       end
 
-      def handle_confirm_input(event)
-        case event
-        in { type: :key, code: "y" }
-          action = @confirm_action
-          @confirm_action = nil
-          case action
-          when :retry
-            item = selected_item
-            return nil unless item
-            Actions::RetryJob.call(item.id)
-            :refresh
-          when :discard
-            item = selected_item
-            return nil unless item
-            Actions::DiscardJob.call(item.id)
-            :refresh
-          when :retry_all
-            f = filters
-            Actions::RetryJob.retry_all(filter: f[:class_name], queue: f[:queue])
-            :refresh
-          end
-        in { type: :key, code: "n" } | { type: :key, code: "esc" }
-          @confirm_action = nil
-          nil
-        else
-          nil
+      def confirm_message
+        case @confirm_action
+        when :retry
+          job = selected_item
+          "Retry job ##{job&.job_id} (#{job&.class_name})? [y/n]"
+        when :discard
+          job = selected_item
+          "Discard job ##{job&.job_id} (#{job&.class_name})? This cannot be undone. [y/n]"
+        when :retry_all
+          count = @total_count || items.size
+          label = @filters.empty? ? "failed jobs" : "filtered failed jobs"
+          "Retry ALL #{count} #{label}? [y/n]"
         end
       end
 
-      def move_selection(delta)
-        return if @failed_jobs.empty?
-        @selected_row = (@selected_row + delta).clamp(0, @failed_jobs.size - 1)
-        @table_state.select(@selected_row)
-        :load_more if needs_more?
-      end
-
-      def jump_to_top
-        @selected_row = 0
-        @table_state.select(0)
-      end
-
-      def jump_to_bottom
-        return if @failed_jobs.empty?
-        @selected_row = @failed_jobs.size - 1
-        @table_state.select(@selected_row)
-        return :load_more if needs_more?
+      def execute_confirm_action(action)
+        case action
+        when :retry
+          item = selected_item
+          return nil unless item
+          Actions::RetryJob.call(item.id)
+          :refresh
+        when :discard
+          item = selected_item
+          return nil unless item
+          Actions::DiscardJob.call(item.id)
+          :refresh
+        when :retry_all
+          f = filters
+          Actions::RetryJob.retry_all(filter: f[:class_name], queue: f[:queue])
+          :refresh
+        end
       end
 
       def render_failed_table(frame, area)
@@ -214,7 +155,7 @@ module SolidQueueTui
           { key: :failed_at,     label: "FAILED",      width: 12 }
         ]
 
-        rows = @failed_jobs.map do |job|
+        rows = items.map do |job|
           {
             id: job.job_id,
             class_name: job.class_name,
@@ -238,51 +179,6 @@ module SolidQueueTui
         table.render(frame, area, @table_state)
       end
 
-      def render_confirm(frame, area)
-        message = case @confirm_action
-                  when :retry
-                    job = selected_item
-                    "Retry job ##{job&.job_id} (#{job&.class_name})? [y/n]"
-                  when :discard
-                    job = selected_item
-                    "Discard job ##{job&.job_id} (#{job&.class_name})? This cannot be undone. [y/n]"
-                  when :retry_all
-                    count = @total_count || @failed_jobs.size
-                    label = @filters.empty? ? "failed jobs" : "filtered failed jobs"
-                    "Retry ALL #{count} #{label}? [y/n]"
-                  end
-
-        frame.render_widget(
-          @tui.paragraph(
-            text: " #{message}",
-            style: @tui.style(fg: :yellow, modifiers: [:bold]),
-            block: @tui.block(
-              title: " Confirm ",
-              title_style: @tui.style(fg: :red, modifiers: [:bold]),
-              borders: [:all],
-              border_type: :rounded,
-              border_style: @tui.style(fg: :red)
-            )
-          ),
-          area
-        )
-      end
-
-      def truncate(str, max)
-        return "" unless str
-        str.length > max ? "#{str[0...max - 3]}..." : str
-      end
-
-      def time_ago(time)
-        return "n/a" unless time
-        seconds = (Time.now.utc - time).to_i
-        case seconds
-        when 0..59       then "#{seconds}s ago"
-        when 60..3599    then "#{seconds / 60}m ago"
-        when 3600..86399 then "#{seconds / 3600}h ago"
-        else "#{seconds / 86400}d ago"
-        end
-      end
     end
   end
 end

data/lib/solid_queue_tui/views/finished_view.rb

@@ -4,47 +4,21 @@ module SolidQueueTui
   module Views
     class FinishedView
       include Filterable
-
-
-      LOAD_THRESHOLD = 10
+      include Paginatable
+      include FormattingHelpers
 
       def initialize(tui)
         @tui = tui
-        @table_state = RatatuiRuby::TableState.new(nil)
-        @table_state.select(0)
-        @selected_row = 0
-        @jobs = []
-        @total_count = nil
-        @all_loaded = false
+        init_pagination
         init_filter
       end
 
       def update(jobs:)
-        @jobs = jobs
-        @all_loaded = jobs.size < SolidQueueTui.page_size
-        @selected_row = @selected_row.clamp(0, [@jobs.size - 1, 0].max)
-        @table_state.select(@selected_row)
+        update_items(jobs)
       end
 
       def append(jobs:)
-        @jobs.concat(jobs)
-        @all_loaded = jobs.size < SolidQueueTui.page_size
-      end
-
-      def total_count=(count)
-        @total_count = count
-      end
-
-      def current_offset
-        @jobs.size
-      end
-
-      def reset_pagination!
-        @jobs = []
-        @total_count = nil
-        @all_loaded = false
-        @selected_row = 0
-        @table_state.select(0)
+        append_items(jobs)
       end
 
       def render(frame, area)
@@ -72,11 +46,6 @@ module SolidQueueTui
         end
       end
 
-      def selected_item
-        return nil if @jobs.empty? || @selected_row >= @jobs.size
-        @jobs[@selected_row]
-      end
-
       def bindings
         if filter_mode?
           filter_bindings
@@ -101,10 +70,6 @@ module SolidQueueTui
 
       private
 
-      def needs_more?
-        !@all_loaded && @selected_row >= @jobs.size - LOAD_THRESHOLD
-      end
-
       def handle_normal_input(event)
         case event
         in { type: :key, code: "j" } | { type: :key, code: "up" }
@@ -127,25 +92,6 @@ module SolidQueueTui
         end
       end
 
-      def move_selection(delta)
-        return if @jobs.empty?
-        @selected_row = (@selected_row + delta).clamp(0, @jobs.size - 1)
-        @table_state.select(@selected_row)
-        :load_more if needs_more?
-      end
-
-      def jump_to_top
-        @selected_row = 0
-        @table_state.select(0)
-      end
-
-      def jump_to_bottom
-        return if @jobs.empty?
-        @selected_row = @jobs.size - 1
-        @table_state.select(@selected_row)
-        return :load_more if needs_more?
-      end
-
       def render_table(frame, area)
         columns = [
           { key: :id,          label: "ID",          width: 8 },
@@ -156,14 +102,14 @@ module SolidQueueTui
           { key: :duration,    label: "DURATION",     width: 12 }
         ]
 
-        rows = @jobs.map do |job|
+        rows = items.map do |job|
           {
             id: job.id,
             queue_name: job.queue_name,
             class_name: job.class_name,
             priority: job.priority,
             finished_at: format_time(job.finished_at),
-            duration: format_duration(job.created_at, job.finished_at)
+            duration: job_duration(job.created_at, job.finished_at)
           }
         end
 
@@ -180,23 +126,9 @@ module SolidQueueTui
         table.render(frame, area, @table_state)
       end
 
-      def format_time(time)
-        return "n/a" unless time
-        time.strftime("%Y-%m-%d %H:%M:%S")
-      end
-
-      def format_duration(created, finished)
+      def job_duration(created, finished)
         return "n/a" unless created && finished
-        seconds = (finished - created).to_i
-        if seconds < 1
-          "<1s"
-        elsif seconds < 60
-          "#{seconds}s"
-        elsif seconds < 3600
-          "#{seconds / 60}m #{seconds % 60}s"
-        else
-          "#{seconds / 3600}h #{(seconds % 3600) / 60}m"
-        end
+        format_duration((finished - created).to_i)
       end
     end
   end

data/lib/solid_queue_tui/views/in_progress_view.rb

@@ -4,47 +4,21 @@ module SolidQueueTui
   module Views
     class InProgressView
       include Filterable
-
-
-      LOAD_THRESHOLD = 10
+      include Paginatable
+      include FormattingHelpers
 
       def initialize(tui)
         @tui = tui
-        @table_state = RatatuiRuby::TableState.new(nil)
-        @table_state.select(0)
-        @selected_row = 0
-        @jobs = []
-        @total_count = nil
-        @all_loaded = false
+        init_pagination
         init_filter
       end
 
       def update(jobs:)
-        @jobs = jobs
-        @all_loaded = jobs.size < SolidQueueTui.page_size
-        @selected_row = @selected_row.clamp(0, [@jobs.size - 1, 0].max)
-        @table_state.select(@selected_row)
+        update_items(jobs)
       end
 
       def append(jobs:)
-        @jobs.concat(jobs)
-        @all_loaded = jobs.size < SolidQueueTui.page_size
-      end
-
-      def total_count=(count)
-        @total_count = count
-      end
-
-      def current_offset
-        @jobs.size
-      end
-
-      def reset_pagination!
-        @jobs = []
-        @total_count = nil
-        @all_loaded = false
-        @selected_row = 0
-        @table_state.select(0)
+        append_items(jobs)
       end
 
       def render(frame, area)
@@ -72,11 +46,6 @@ module SolidQueueTui
         end
       end
 
-      def selected_item
-        return nil if @jobs.empty? || @selected_row >= @jobs.size
-        @jobs[@selected_row]
-      end
-
       def bindings
         if filter_mode?
           filter_bindings
@@ -100,10 +69,6 @@ module SolidQueueTui
 
       private
 
-      def needs_more?
-        !@all_loaded && @selected_row >= @jobs.size - LOAD_THRESHOLD
-      end
-
       def handle_normal_input(event)
         case event
         in { type: :key, code: "j" } | { type: :key, code: "up" }
@@ -126,25 +91,6 @@ module SolidQueueTui
         end
       end
 
-      def move_selection(delta)
-        return if @jobs.empty?
-        @selected_row = (@selected_row + delta).clamp(0, @jobs.size - 1)
-        @table_state.select(@selected_row)
-        :load_more if needs_more?
-      end
-
-      def jump_to_top
-        @selected_row = 0
-        @table_state.select(0)
-      end
-
-      def jump_to_bottom
-        return if @jobs.empty?
-        @selected_row = @jobs.size - 1
-        @table_state.select(@selected_row)
-        return :load_more if needs_more?
-      end
-
       def render_table(frame, area)
         columns = [
           { key: :id,         label: "ID",        width: 8 },
@@ -155,7 +101,7 @@ module SolidQueueTui
           { key: :started_at, label: "STARTED",    width: 12 }
         ]
 
-        rows = @jobs.map do |job|
+        rows = items.map do |job|
           {
             id: job.id,
             queue_name: job.queue_name,
@@ -179,16 +125,6 @@ module SolidQueueTui
         table.render(frame, area, @table_state)
       end
 
-      def time_ago(time)
-        return "n/a" unless time
-        seconds = (Time.now.utc - time).to_i
-        case seconds
-        when 0..59       then "#{seconds}s ago"
-        when 60..3599    then "#{seconds / 60}m ago"
-        when 3600..86399 then "#{seconds / 3600}h ago"
-        else "#{seconds / 86400}d ago"
-        end
-      end
     end
   end
 end