solid_queue_tui 0.1.2 → 0.2.0

data/lib/solid_queue_tui/views/concerns/filterable.rb

@@ -116,6 +116,10 @@ module SolidQueueTui
         "#{base_title} (#{parts.join(', ')})"
       end
 
+      def clear_filter_binding
+        @filters.empty? ? nil : { key: "c", action: "Clear Filter" }
+      end
+
       def filter_bindings
         [
           { key: "Tab", action: "Next Field" },

data/lib/solid_queue_tui/views/concerns/paginatable.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module SolidQueueTui
+  module Views
+    module Paginatable
+      LOAD_THRESHOLD = 10
+
+      def init_pagination
+        @table_state = RatatuiRuby::TableState.new(nil)
+        @table_state.select(0)
+        @selected_row = 0
+        @items = []
+        @total_count = nil
+        @all_loaded = false
+      end
+
+      def items = @items
+
+      def selected_item
+        return nil if @items.empty? || @selected_row >= @items.size
+        @items[@selected_row]
+      end
+
+      def total_count=(count)
+        @total_count = count
+      end
+
+      def current_offset
+        @items.size
+      end
+
+      def reset_pagination!
+        @items = []
+        @total_count = nil
+        @all_loaded = false
+        @selected_row = 0
+        @table_state.select(0)
+      end
+
+      private
+
+      def update_items(new_items)
+        @selected_row = 0 if @selected_row >= new_items.size
+        @items = new_items
+        @all_loaded = new_items.size < SolidQueueTui.page_size
+        @selected_row = @selected_row.clamp(0, [@items.size - 1, 0].max)
+        @table_state.select(@selected_row)
+      end
+
+      def append_items(more_items)
+        @items.concat(more_items)
+        @all_loaded = more_items.size < SolidQueueTui.page_size
+      end
+
+      def needs_more?
+        !@all_loaded && @selected_row >= @items.size - LOAD_THRESHOLD
+      end
+
+      def move_selection(delta)
+        return if @items.empty?
+        @selected_row = (@selected_row + delta).clamp(0, @items.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 @items.empty?
+        @selected_row = @items.size - 1
+        @table_state.select(@selected_row)
+        :load_more if needs_more?
+      end
+    end
+  end
+end

data/lib/solid_queue_tui/views/dashboard_view.rb

@@ -3,9 +3,10 @@
 module SolidQueueTui
   module Views
     class DashboardView
+      include FormattingHelpers
+
       def initialize(tui)
         @tui = tui
-        @selected_row = 0
       end
 
       def update(stats:)
@@ -23,7 +24,7 @@ module SolidQueueTui
         )
 
         render_overview_panels(frame, top)
-        render_completion(frame, bottom)
+        render_metrics(frame, bottom)
       end
 
       def handle_input(event)
@@ -45,6 +46,8 @@ module SolidQueueTui
 
       private
 
+      # --- Top panels (sticky) ---
+
       def render_overview_panels(frame, area)
         return unless @stats
 
@@ -127,28 +130,228 @@ module SolidQueueTui
         )
       end
 
-      def render_completion(frame, area)
+      # --- Bottom section: chart + queue summary ---
+
+      def render_metrics(frame, area)
         return unless @stats
 
-        lines = [
-          @tui.text_line(spans: [
-            @tui.text_span(content: "  Total: ", style: @tui.style(fg: :dark_gray)),
-            @tui.text_span(content: format_number(@stats.total_jobs), style: @tui.style(fg: :white, modifiers: [:bold])),
-            @tui.text_span(content: "   Completed: ", style: @tui.style(fg: :dark_gray)),
-            @tui.text_span(content: format_number(@stats.completed_jobs), style: @tui.style(fg: :green))
+        chart_area, bottom_area = @tui.layout_split(
+          area,
+          direction: :vertical,
+          constraints: [
+            @tui.constraint_percentage(70),
+            @tui.constraint_percentage(30)
+          ]
+        )
+
+        queue_area, summary_area = @tui.layout_split(
+          bottom_area,
+          direction: :horizontal,
+          constraints: [
+            @tui.constraint_percentage(50),
+            @tui.constraint_percentage(50)
+          ]
+        )
+
+        render_throughput_chart(frame, chart_area)
+        render_queue_depth(frame, queue_area)
+        render_summary(frame, summary_area)
+      end
+
+      def render_throughput_chart(frame, area)
+        enqueued = @stats.enqueued_per_hour
+        processed = @stats.processed_per_hour
+        failed = @stats.failed_per_hour
+
+        # Convert 24-element arrays to [x, y] coordinate pairs
+        enqueued_data = to_chart_data(enqueued)
+        processed_data = to_chart_data(processed)
+        failed_data = to_chart_data(failed)
+
+        # Y-axis bounds
+        all_values = [enqueued&.data, processed&.data, failed&.data].compact.flatten
+        y_max = (all_values.max || 10).to_f
+        y_max = 10.0 if y_max == 0
+
+        # X-axis labels at key positions
+        now = Time.now.utc
+        x_labels = [0, 6, 12, 18, 23].map do |i|
+          (now - (23 - i) * 3600).strftime("%H:%M")
+        end
+
+        # Y-axis labels
+        y_labels = ["0", format_number((y_max / 2).round), format_number(y_max.round)]
+
+        datasets = []
+        if enqueued_data.any?
+          datasets << RatatuiRuby::Widgets::Dataset.new(
+            name: "",
+            data: enqueued_data,
+            style: @tui.style(fg: :cyan),
+            marker: :braille,
+            graph_type: :line
+          )
+        end
+
+        if processed_data.any?
+          datasets << RatatuiRuby::Widgets::Dataset.new(
+            name: "",
+            data: processed_data,
+            style: @tui.style(fg: :green),
+            marker: :braille,
+            graph_type: :line
+          )
+        end
+
+        if failed_data.any?
+          datasets << RatatuiRuby::Widgets::Dataset.new(
+            name: "",
+            data: failed_data,
+            style: @tui.style(fg: :red),
+            marker: :braille,
+            graph_type: :line
+          )
+        end
+
+        x_axis = RatatuiRuby::Widgets::Axis.new(
+          bounds: [0.0, 23.0],
+          labels: x_labels,
+          style: @tui.style(fg: :dark_gray)
+        )
+
+        y_axis = RatatuiRuby::Widgets::Axis.new(
+          bounds: [0.0, y_max],
+          labels: y_labels,
+          style: @tui.style(fg: :dark_gray)
+        )
+
+        chart = @tui.chart(
+          datasets: datasets,
+          x_axis: x_axis,
+          y_axis: y_axis,
+          block: @tui.block(
+            title: " Throughput (24h) ",
+            title_style: @tui.style(fg: :cyan, modifiers: [:bold]),
+            titles: [
+              { content: " ● Enqueued ", position: :top, alignment: :right, style: @tui.style(fg: :cyan) },
+              { content: "● Processed ", position: :top, alignment: :right, style: @tui.style(fg: :green) },
+              { content: "● Failed ", position: :top, alignment: :right, style: @tui.style(fg: :red) }
+            ],
+            borders: [:all],
+            border_type: :rounded,
+            border_style: @tui.style(fg: :dark_gray)
+          )
+        )
+
+        frame.render_widget(chart, area)
+      end
+
+      def render_queue_depth(frame, area)
+        lines = []
+
+        queue_depths = @stats.queue_depths
+        if queue_depths.any?
+          total_depth = queue_depths.values.sum
+          sorted = queue_depths.sort_by { |_, v| -v }
+          top_queues = sorted.first(5)
+          remaining = sorted.drop(5)
+          max_depth = top_queues.first&.last || 1
+
+          top_queues.each_with_index do |(name, count), idx|
+            pct = total_depth > 0 ? (count.to_f / total_depth * 100).round(1) : 0
+            bar_width = 20
+            filled = max_depth > 0 ? (count.to_f / max_depth * bar_width).round : 0
+            empty_bar = bar_width - filled
+
+            lines << @tui.text_line(spans: [
+              @tui.text_span(content: "  #{name.ljust(14)}", style: @tui.style(fg: :white)),
+              @tui.text_span(content: "#{"█" * filled}", style: @tui.style(fg: :cyan)),
+              @tui.text_span(content: "#{"░" * empty_bar}", style: @tui.style(fg: :dark_gray)),
+              @tui.text_span(content: "  #{format_number(count).rjust(6)} (#{pct}%)", style: @tui.style(fg: :dark_gray))
+            ])
+
+            if idx < top_queues.size - 1
+              lines << @tui.text_line(spans: [
+                @tui.text_span(content: "", style: @tui.style(fg: :dark_gray))
+              ])
+            end
+          end
+
+          if remaining.any?
+            others_count = remaining.sum { |_, v| v }
+            pct = total_depth > 0 ? (others_count.to_f / total_depth * 100).round(1) : 0
+            lines << @tui.text_line(spans: [
+              @tui.text_span(content: "  +#{remaining.size} more", style: @tui.style(fg: :dark_gray)),
+              @tui.text_span(content: "  #{format_number(others_count).rjust(26)} (#{pct}%)", style: @tui.style(fg: :dark_gray))
+            ])
+          end
+        else
+          lines << @tui.text_line(spans: [
+            @tui.text_span(content: "  No queued jobs", style: @tui.style(fg: :dark_gray))
           ])
-        ]
+        end
+
+        frame.render_widget(
+          @tui.paragraph(
+            text: lines,
+            block: @tui.block(
+              title: " Queue Depth ",
+              title_style: @tui.style(fg: :cyan, modifiers: [:bold]),
+              borders: [:all],
+              border_type: :rounded,
+              border_style: @tui.style(fg: :dark_gray)
+            )
+          ),
+          area
+        )
+      end
+
+      def render_summary(frame, area)
+        lines = []
+
+        # Throughput totals (24h)
+        enq_total = @stats.enqueued_per_hour&.total || 0
+        proc_total = @stats.processed_per_hour&.total || 0
+        fail_total = @stats.failed_per_hour&.total || 0
+
+        [
+          ["Enqueued", enq_total, :cyan],
+          ["Processed", proc_total, :green],
+          ["Failed", fail_total, :red]
+        ].each do |label, value, color|
+          lines << @tui.text_line(spans: [
+            @tui.text_span(content: "  #{label.ljust(12)}", style: @tui.style(fg: color)),
+            @tui.text_span(content: format_number(value).rjust(10), style: @tui.style(fg: :white, modifiers: [:bold]))
+          ])
+        end
+
+        # Separator
+        lines << @tui.text_line(spans: [
+          @tui.text_span(content: "", style: @tui.style(fg: :dark_gray))
+        ])
+
+        # Overall totals + completion bar
+        [
+          ["Total", @stats.total_jobs, :white],
+          ["Completed", @stats.completed_jobs, :green]
+        ].each do |label, value, color|
+          lines << @tui.text_line(spans: [
+            @tui.text_span(content: "  #{label.ljust(12)}", style: @tui.style(fg: :dark_gray)),
+            @tui.text_span(content: format_number(value).rjust(10), style: @tui.style(fg: color, modifiers: [:bold]))
+          ])
+        end
 
         if @stats.total_jobs > 0
-          completed_ratio = @stats.completed_jobs.to_f / @stats.total_jobs
-          bar_width = 40
-          filled = (completed_ratio * bar_width).round
-          empty = bar_width - filled
+          ratio = @stats.completed_jobs.to_f / @stats.total_jobs
+          bar_w = 30
+          filled = (ratio * bar_w).round
+          empty_bar = bar_w - filled
 
           lines << @tui.text_line(spans: [
-            @tui.text_span(content: "  Completion: ", style: @tui.style(fg: :dark_gray)),
-            @tui.text_span(content: "#{'█' * filled}#{'░' * empty}", style: @tui.style(fg: :green)),
-            @tui.text_span(content: " #{(completed_ratio * 100).round(1)}%", style: @tui.style(fg: :white))
+            @tui.text_span(content: "  ", style: @tui.style(fg: :dark_gray)),
+            @tui.text_span(content: "#{"█" * filled}", style: @tui.style(fg: :green)),
+            @tui.text_span(content: "#{"░" * empty_bar}", style: @tui.style(fg: :dark_gray)),
+            @tui.text_span(content: " #{(ratio * 100).round(1)}%", style: @tui.style(fg: :white))
           ])
         end
 
@@ -156,7 +359,7 @@ module SolidQueueTui
           @tui.paragraph(
             text: lines,
             block: @tui.block(
-              title: " Overview ",
+              title: " Summary ",
               title_style: @tui.style(fg: :cyan, modifiers: [:bold]),
               borders: [:all],
               border_type: :rounded,
@@ -167,6 +370,13 @@ module SolidQueueTui
         )
       end
 
+      # --- Helpers ---
+
+      def to_chart_data(result)
+        return [] unless result
+        result.data.each_with_index.map { |v, i| [i.to_f, v.to_f] }
+      end
+
       def status_line(label, value, color)
         bar_char = value.to_i > 0 ? "●" : "○"
         @tui.text_line(spans: [
@@ -179,10 +389,6 @@ module SolidQueueTui
         ])
       end
 
-      def format_number(n)
-        return "0" if n.nil? || n == 0
-        n.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse
-      end
     end
   end
 end

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
@@ -106,13 +65,14 @@ module SolidQueueTui
             { key: "R", action: "Retry" },
             { key: "D", action: "Discard" },
             { key: "A", action: "Retry All" },
-            { key: "/", action: "Filter" }
-          ]
+            { key: "/", action: "Filter" },
+            clear_filter_binding
+          ].compact
         end
       end
 
       def capturing_input?
-        filter_mode? || @confirm_action
+        filter_mode? || confirm_mode?
       end
 
       def breadcrumb
@@ -121,10 +81,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,64 +100,50 @@ 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
           nil
-        in { type: :key, code: "esc" }
+        in { type: :key, code: "c" }
           clear_filter
         else
           nil
         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 +156,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 +180,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