solid_queue_tui 0.1.2 → 0.1.3

data/lib/solid_queue_tui/views/queues_view.rb

@@ -3,84 +3,140 @@
 module SolidQueueTui
   module Views
     class QueuesView
+      include Confirmable
+      include Filterable
+      include Paginatable
+      include FormattingHelpers
+
       def initialize(tui)
         @tui = tui
-        @table_state = RatatuiRuby::TableState.new(nil)
-        @table_state.select(0)
-        @selected_row = 0
+        @mode = :list
+        @selected_queue = nil
+
+        # List mode state
+        @list_table_state = RatatuiRuby::TableState.new(nil)
+        @list_table_state.select(0)
+        @list_selected_row = 0
         @queues = []
-        @confirm_action = nil
+
+        # Detail mode state (via Paginatable + Filterable)
+        init_pagination
+        init_confirm
+        init_filter
+      end
+
+      def detail_mode? = @mode == :detail
+
+      def selected_queue_name
+        @selected_queue&.name
       end
 
       def update(queues:)
         @queues = queues
-        @selected_row = @selected_row.clamp(0, [@queues.size - 1, 0].max)
-        @table_state.select(@selected_row)
+        @list_selected_row = @list_selected_row.clamp(0, [@queues.size - 1, 0].max)
+        @list_table_state.select(@list_selected_row)
+      end
+
+      def update_detail(jobs:)
+        update_items(jobs)
+      end
+
+      def append(jobs:)
+        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 @mode == :list
+          render_list(frame, area)
         else
-          render_table(frame, area)
+          render_detail(frame, area)
         end
       end
 
       def handle_input(event)
-        if @confirm_action
+        if @mode == :list
+          handle_list_input(event)
+        elsif confirm_mode?
           handle_confirm_input(event)
+        elsif filter_mode?
+          handle_filter_input(event)
         else
-          handle_normal_input(event)
+          handle_detail_input(event)
         end
       end
 
       def selected_item
-        return nil if @queues.empty? || @selected_row >= @queues.size
-        @queues[@selected_row]
+        if @mode == :list
+          return nil if @queues.empty? || @list_selected_row >= @queues.size
+          @queues[@list_selected_row]
+        else
+          return nil if items.empty? || @selected_row >= items.size
+          items[@selected_row]
+        end
       end
 
       def capturing_input?
-        !!@confirm_action
+        detail_mode? || confirm_mode? || filter_mode?
       end
 
       def bindings
-        if @confirm_action
-          [
-            { key: "y", action: "Confirm" },
-            { key: "n/Esc", action: "Cancel" }
-          ]
+        if @mode == :list
+          if confirm_mode?
+            confirm_bindings
+          else
+            [
+              { key: "j/k", action: "Navigate" },
+              { key: "Enter", action: "View Jobs" },
+              { key: "p", action: "Pause/Resume" },
+              { key: "G/g", action: "Bottom/Top" }
+            ]
+          end
         else
-          [
-            { key: "j/k", action: "Navigate" },
-            { key: "p", action: "Pause/Resume" },
-            { key: "G/g", action: "Bottom/Top" }
-          ]
+          if confirm_mode?
+            confirm_bindings
+          elsif filter_mode?
+            filter_bindings
+          else
+            [
+              { key: "j/k", action: "Navigate" },
+              { key: "Enter", action: "Detail" },
+              { key: "/", action: "Filter" },
+              { key: "Esc", action: "Back" },
+              { key: "G/g", action: "Bottom/Top" }
+            ]
+          end
         end
       end
 
-      def breadcrumb = "queues"
+      def breadcrumb
+        if @mode == :list
+          "queues"
+        else
+          base = "queues > #{@selected_queue&.name}"
+          @filters.empty? ? base : "#{base}:filtered"
+        end
+      end
 
       private
 
-      def handle_normal_input(event)
+      # === List mode ===
+
+      def handle_list_input(event)
+        if confirm_mode?
+          return handle_confirm_input(event)
+        end
+
         case event
         in { type: :key, code: "j" } | { type: :key, code: "up" }
-          move_selection(-1)
+          list_move_selection(-1)
         in { type: :key, code: "k" } | { type: :key, code: "down" }
-          move_selection(1)
+          list_move_selection(1)
         in { type: :key, code: "g" }
-          jump_to_top
+          list_jump_to_top
         in { type: :key, code: "G" }
-          jump_to_bottom
+          list_jump_to_bottom
+        in { type: :key, code: "enter" }
+          enter_detail_mode
         in { type: :key, code: "p" }
           queue = selected_item
           if queue
@@ -92,40 +148,46 @@ module SolidQueueTui
         end
       end
 
-      def handle_confirm_input(event)
-        case event
-        in { type: :key, code: "y" }
-          @confirm_action = nil
-          queue = selected_item
-          return nil unless queue
-          Actions::ToggleQueuePause.call(queue.name)
-          :refresh
-        in { type: :key, code: "n" } | { type: :key, code: "esc" }
-          @confirm_action = nil
-          nil
-        else
-          nil
-        end
+      def enter_detail_mode
+        queue = selected_item
+        return nil unless queue
+        @selected_queue = queue
+        @mode = :detail
+        reset_pagination!
+        clear_filter
+        :enter_queue
       end
 
-      def move_selection(delta)
+      def list_move_selection(delta)
         return if @queues.empty?
-        @selected_row = (@selected_row + delta).clamp(0, @queues.size - 1)
-        @table_state.select(@selected_row)
+        @list_selected_row = (@list_selected_row + delta).clamp(0, @queues.size - 1)
+        @list_table_state.select(@list_selected_row)
+        nil
       end
 
-      def jump_to_top
-        @selected_row = 0
-        @table_state.select(0)
+      def list_jump_to_top
+        @list_selected_row = 0
+        @list_table_state.select(0)
+        nil
       end
 
-      def jump_to_bottom
-        return if @queues.empty?
-        @selected_row = @queues.size - 1
-        @table_state.select(@selected_row)
+      def list_jump_to_bottom
+        return nil if @queues.empty?
+        @list_selected_row = @queues.size - 1
+        @list_table_state.select(@list_selected_row)
+        nil
+      end
+
+      def render_list(frame, area)
+        if confirm_mode?
+          render_list_table(frame, area)
+          render_confirm_popup(frame, area)
+        else
+          render_list_table(frame, area)
+        end
       end
 
-      def render_table(frame, area)
+      def render_list_table(frame, area)
         columns = [
           { key: :name,   label: "QUEUE",   width: :fill },
           { key: :size,   label: "SIZE",    width: 10 },
@@ -145,36 +207,110 @@ module SolidQueueTui
           title: "Queues",
           columns: columns,
           rows: rows,
-          selected_row: @selected_row,
+          selected_row: @list_selected_row,
           empty_message: "No queues found"
         )
 
-        table.render(frame, area, @table_state)
+        table.render(frame, area, @list_table_state)
       end
 
-      def render_confirm(frame, area)
-        queue = selected_item
-        message = if @confirm_action == :pause
-                    "Pause queue '#{queue&.name}'? Workers will stop picking up jobs from this queue. [y/n]"
-                  else
-                    "Resume queue '#{queue&.name}'? [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
+      # === Detail mode ===
+
+      def handle_detail_input(event)
+        case event
+        in { type: :key, code: "j" } | { type: :key, code: "up" }
+          move_selection(-1)
+        in { type: :key, code: "k" } | { type: :key, code: "down" }
+          result = move_selection(1)
+          return :load_more if result == :load_more
+          nil
+        in { type: :key, code: "g" }
+          jump_to_top
+        in { type: :key, code: "G" }
+          jump_to_bottom
+        in { type: :key, code: "enter" }
+          :open_detail
+        in { type: :key, code: "/" }
+          enter_filter_mode
+          nil
+        in { type: :key, code: "esc" }
+          exit_detail_mode
+        else
+          nil
+        end
+      end
+
+      def exit_detail_mode
+        @mode = :list
+        @selected_queue = nil
+        :exit_queue
+      end
+
+      def render_detail(frame, area)
+        if filter_mode?
+          filter_area, content_area = @tui.layout_split(
+            area,
+            direction: :vertical,
+            constraints: [
+              @tui.constraint_length(3),
+              @tui.constraint_fill(1)
+            ]
+          )
+          render_filter_input(frame, filter_area)
+          render_detail_table(frame, content_area)
+        else
+          render_detail_table(frame, area)
+        end
+      end
+
+      def render_detail_table(frame, area)
+        columns = [
+          { key: :id,         label: "ID",       width: 8 },
+          { key: :class_name, label: "CLASS",    width: :fill },
+          { key: :priority,   label: "PRI",      width: 5 },
+          { key: :created_at, label: "ENQUEUED", width: 12 }
+        ]
+
+        rows = items.map do |job|
+          {
+            id: job.id,
+            class_name: job.class_name,
+            priority: job.priority,
+            created_at: time_ago(job.created_at)
+          }
+        end
+
+        table = Components::JobTable.new(
+          @tui,
+          title: filter_title("Queue '#{@selected_queue&.name}' — Pending"),
+          columns: columns,
+          rows: rows,
+          selected_row: @selected_row,
+          total_count: @total_count,
+          empty_message: "No pending jobs in this queue"
         )
+
+        table.render(frame, area, @table_state)
+      end
+
+      # === Confirmable hooks (list mode only) ===
+
+      def confirm_message
+        queue = @queues[@list_selected_row]
+        if @confirm_action == :pause
+          "Pause queue '#{queue&.name}'? Workers will stop picking up jobs from this queue. [y/n]"
+        else
+          "Resume queue '#{queue&.name}'? [y/n]"
+        end
       end
+
+      def execute_confirm_action(action)
+        queue = @queues[@list_selected_row]
+        return nil unless queue
+        Actions::ToggleQueuePause.call(queue.name)
+        :refresh
+      end
+
     end
   end
 end

data/lib/solid_queue_tui/views/recurring_tasks_view.rb

@@ -3,13 +3,16 @@
 module SolidQueueTui
   module Views
     class RecurringTasksView
+      include Confirmable
+      include FormattingHelpers
+
       def initialize(tui)
         @tui = tui
         @table_state = RatatuiRuby::TableState.new(nil)
         @table_state.select(0)
         @selected_row = 0
         @tasks = []
-        @confirm_action = nil
+        init_confirm
       end
 
       def update(tasks:)
@@ -19,24 +22,16 @@ module SolidQueueTui
       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)
         else
           render_table(frame, area)
         end
       end
 
       def handle_input(event)
-        if @confirm_action
+        if confirm_mode?
           handle_confirm_input(event)
         else
           handle_normal_input(event)
@@ -49,15 +44,12 @@ module SolidQueueTui
       end
 
       def capturing_input?
-        !!@confirm_action
+        confirm_mode?
       end
 
       def bindings
-        if @confirm_action
-          [
-            { key: "y", action: "Confirm" },
-            { key: "n/Esc", action: "Cancel" }
-          ]
+        if confirm_mode?
+          confirm_bindings
         else
           [
             { key: "j/k", action: "Navigate" },
@@ -89,20 +81,16 @@ module SolidQueueTui
         end
       end
 
-      def handle_confirm_input(event)
-        case event
-        in { type: :key, code: "y" }
-          @confirm_action = nil
-          task = selected_item
-          return nil unless task
-          Actions::EnqueueRecurringTask.call(task.key)
-          :refresh
-        in { type: :key, code: "n" } | { type: :key, code: "esc" }
-          @confirm_action = nil
-          nil
-        else
-          nil
-        end
+      def confirm_message
+        task = selected_item
+        "Run '#{task&.key}' (#{task&.class_name || task&.command}) now? [y/n]"
+      end
+
+      def execute_confirm_action(action)
+        task = selected_item
+        return nil unless task
+        Actions::EnqueueRecurringTask.call(task.key)
+        :refresh
       end
 
       def move_selection(delta)
@@ -155,48 +143,13 @@ module SolidQueueTui
         table.render(frame, area, @table_state)
       end
 
-      def render_confirm(frame, area)
-        task = selected_item
-        message = "Run '#{task&.key}' (#{task&.class_name || task&.command}) now? [y/n]"
-
-        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
-
+      # Override: returns "Never" for nil and "just now" for very recent
       def time_ago(time)
         return "Never" unless time
         seconds = (Time.now.utc - time).to_i
         return "just now" if seconds < 5
         "#{humanize_duration(seconds)} ago"
       end
-
-      def time_until(time)
-        return "n/a" unless time
-        seconds = (time - Time.now.utc).to_i
-        return "now" if seconds <= 0
-        "in #{humanize_duration(seconds)}"
-      end
-
-      def humanize_duration(seconds)
-        case seconds.abs
-        when 0..59       then "#{seconds.abs}s"
-        when 60..3599    then "#{seconds.abs / 60}m"
-        when 3600..86399 then "#{seconds.abs / 3600}h"
-        else "#{seconds.abs / 86400}d"
-        end
-      end
     end
   end
 end