solid_queue_tui 0.1.2 → 0.1.3

data/lib/solid_queue_tui/views/scheduled_view.rb

@@ -4,62 +4,29 @@ module SolidQueueTui
   module Views
     class ScheduledView
       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
-        @jobs = []
-        @total_count = nil
-        @all_loaded = false
-        @confirm_action = nil
+        init_pagination
+        init_confirm
         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)
-        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_table(frame, content_area)
+        if confirm_mode?
+          render_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,21 +53,13 @@ module SolidQueueTui
         end
       end
 
-      def selected_item
-        return nil if @jobs.empty? || @selected_row >= @jobs.size
-        @jobs[@selected_row]
-      end
-
       def capturing_input?
-        filter_mode? || @confirm_action
+        filter_mode? || confirm_mode?
       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
@@ -121,10 +80,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" }
@@ -153,48 +108,30 @@ 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 :run_now
-            item = selected_item
-            return nil unless item
-            Actions::DispatchScheduledJob.call(item.id)
-            :refresh
-          when :discard
-            item = selected_item
-            return nil unless item
-            Actions::DiscardScheduledJob.call(item.id)
-            :refresh
-          end
-        in { type: :key, code: "n" } | { type: :key, code: "esc" }
-          @confirm_action = nil
-          nil
-        else
-          nil
+      def confirm_message
+        case @confirm_action
+        when :run_now
+          job = selected_item
+          "Run job ##{job&.id} (#{job&.class_name}) now? [y/n]"
+        when :discard
+          job = selected_item
+          "Discard job ##{job&.id} (#{job&.class_name})? This cannot be undone. [y/n]"
         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?
+      def execute_confirm_action(action)
+        case action
+        when :run_now
+          item = selected_item
+          return nil unless item
+          Actions::DispatchScheduledJob.call(item.id)
+          :refresh
+        when :discard
+          item = selected_item
+          return nil unless item
+          Actions::DiscardScheduledJob.call(item.id)
+          :refresh
+        end
       end
 
       def render_table(frame, area)
@@ -209,7 +146,7 @@ module SolidQueueTui
         ]
 
         now = Time.now.utc
-        rows = @jobs.map do |job|
+        rows = items.map do |job|
           delayed = job.scheduled_at && job.scheduled_at < now
           {
             id: job.id,
@@ -235,47 +172,6 @@ module SolidQueueTui
         table.render(frame, area, @table_state)
       end
 
-      def render_confirm(frame, area)
-        message = case @confirm_action
-                  when :run_now
-                    job = selected_item
-                    "Run job ##{job&.id} (#{job&.class_name}) now? [y/n]"
-                  when :discard
-                    job = selected_item
-                    "Discard job ##{job&.id} (#{job&.class_name})? This cannot be undone. [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 format_time(time)
-        return "n/a" unless time
-        time.strftime("%Y-%m-%d %H:%M:%S")
-      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.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "solid_queue_tui/version"
+require_relative "solid_queue_tui/formatting_helpers"
 
 # Data layer
 require_relative "solid_queue_tui/data/stats"
@@ -25,6 +26,8 @@ require_relative "solid_queue_tui/components/help_bar"
 
 # View concerns
 require_relative "solid_queue_tui/views/concerns/filterable"
+require_relative "solid_queue_tui/views/concerns/confirmable"
+require_relative "solid_queue_tui/views/concerns/paginatable"
 
 # Views
 require_relative "solid_queue_tui/views/dashboard_view"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solid_queue_tui
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Shiva Reddy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-21 00:00:00.000000000 Z
+date: 2026-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ratatui_ruby
@@ -109,10 +109,13 @@ files:
 - lib/solid_queue_tui/data/recurring_tasks_query.rb
 - lib/solid_queue_tui/data/stats.rb
 - lib/solid_queue_tui/dev_reloader.rb
+- lib/solid_queue_tui/formatting_helpers.rb
 - lib/solid_queue_tui/railtie.rb
 - lib/solid_queue_tui/version.rb
 - lib/solid_queue_tui/views/blocked_view.rb
+- lib/solid_queue_tui/views/concerns/confirmable.rb
 - lib/solid_queue_tui/views/concerns/filterable.rb
+- lib/solid_queue_tui/views/concerns/paginatable.rb
 - lib/solid_queue_tui/views/dashboard_view.rb
 - lib/solid_queue_tui/views/failed_view.rb
 - lib/solid_queue_tui/views/finished_view.rb
@@ -135,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.2.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="