rails_pulse 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8ed469f307dd71e912b46a4da0a0daa60abbdc262a8dbd12604db00a66335fe
-  data.tar.gz: 8af5a6bf946a86e1bc277c1d719100ace739bb429c07969fd1e4ec31887d6f70
+  metadata.gz: 943ab1e08e81dbe5ede71b7d3c9ca526a65c9a0ce1767c7f9c37cee8883925cf
+  data.tar.gz: b3661c728215dc4759e6a3e04dd49dc113d13155972ed30f6ff35d0a2a07b10c
 SHA512:
-  metadata.gz: eceb3af7e713b6049688e50a8fd79af7b2f09c7720158c8d15257235b0c7488ebe7c0eccfaab3cd5dfb5923f80e9a8bd8693d0a9fb2f4e021aca8846c4ac435c
-  data.tar.gz: f982a50256d99968eb68fee89e6380d3f75511e6c3e8e878ddca375919f6a68a201f9ce46c6868e2425c127ae1862ca0d1895b0e01afea89a9af6a4e85d7f0f9
+  metadata.gz: db5d711b9d8931c6aa489b9069f05d16514a997b9798c743f2c2998611797dbc3dbdcfdcd12e69f65b2b3459292d1e7558075c02805aa0f49a398b85716736ea
+  data.tar.gz: 55ccd02b5a9bb13ba46e36e0051c2440d8026956743e02660968209c66e61fe25f4ed8c3dd04a77b08a6209df9e13c922f42e481ade7cf53447d89a93976e680

data/README.md

@@ -601,7 +601,7 @@ Rails Pulse is built using modern, battle-tested technologies that ensure reliab
 - **[Turbo Frames](https://turbo.hotwired.dev/handbook/frames)** - Lazy loading and partial page updates for optimal performance
 
 ### **Data Visualization**
-- **[Rails Charts](https://github.com/railsjazz/rails_charts)** - Rails wrapper around Apache ECharts
+- **[Apache ECharts](https://echarts.apache.org/)** - Powerful, interactive charting library
 - **[Lucide Icons](https://lucide.dev/)** - Beautiful, consistent iconography with pre-compiled SVG bundle
 
 ### **Asset Management**

data/app/assets/stylesheets/rails_pulse/components/tags.css

@@ -75,8 +75,8 @@
 }
 
 .tag-add-button {
-  padding: 0.25rem 0.5rem;
-  font-size: 0.875rem;
+  padding: 0.2rem 0.5rem;
+  font-size: 0.8rem;
   line-height: 1.25;
   white-space: nowrap;
 }

data/app/controllers/concerns/chart_table_concern.rb

@@ -2,7 +2,6 @@ module ChartTableConcern
   extend ActiveSupport::Concern
 
   included do
-    include Pagy::Backend
     include TimeRangeConcern
     include ResponseRangeConcern
     include ZoomRangeConcern
@@ -38,8 +37,10 @@ module ChartTableConcern
       start_time: @start_time,
       end_time: @end_time,
       start_duration: @start_duration,
+      disabled_tags: session_disabled_tags,
+      show_non_tagged: session[:show_non_tagged] != false,
       **chart_options
-    ).to_rails_chart
+    ).to_chart_data
   end
 
   def setup_table_data(ransack_params)
@@ -50,7 +51,7 @@ module ChartTableConcern
     table_results = build_table_results
     handle_pagination
 
-    @pagy, @table_data = pagy(table_results, limit: session_pagination_limit)
+    @pagy, @table_data = pagy(table_results, items: session_pagination_limit)
   end
 
   def setup_zoom_range_data

data/app/controllers/rails_pulse/application_controller.rb

@@ -1,5 +1,12 @@
 module RailsPulse
   class ApplicationController < ActionController::Base
+    # Support both Pagy 8.x (Backend) and Pagy 9+ (Method)
+    if defined?(Pagy::Method)
+      include Pagy::Method
+    else
+      include Pagy::Backend
+    end
+
     before_action :authenticate_rails_pulse_user!
     before_action :set_show_non_tagged_default
     helper_method :session_global_filters, :session_disabled_tags
@@ -8,15 +15,16 @@ module RailsPulse
       limit = limit || params[:limit]
       session[:pagination_limit] = limit.to_i if limit.present?
 
-      # Render JSON for direct API calls or AJAX requests (but not turbo frame requests)
-      if (request.xhr? && !turbo_frame_request?) || (request.patch? && action_name == "set_pagination_limit")
+    # Render JSON for direct API calls or AJAX requests (but not turbo frame requests)
+    if (request.xhr? && !turbo_frame_request?) || (request.patch? && action_name == "set_pagination_limit")
         render json: { status: "ok" }
-      end
+    end
     end
 
     def set_global_filters
       if params[:clear] == "true"
         session.delete(:global_filters)
+        session[:show_non_tagged] = true  # Reset show_non_tagged to default
       else
         filters = session[:global_filters] || {}
 

data/app/controllers/rails_pulse/dashboard_controller.rb

@@ -1,18 +1,22 @@
 module RailsPulse
   class DashboardController < ApplicationController
     def index
-      @average_query_times_metric_card = RailsPulse::Routes::Cards::AverageResponseTimes.new(route: nil).to_metric_card
-      @percentile_response_times_metric_card = RailsPulse::Routes::Cards::PercentileResponseTimes.new(route: nil).to_metric_card
-      @request_count_totals_metric_card = RailsPulse::Routes::Cards::RequestCountTotals.new(route: nil).to_metric_card
-      @error_rate_per_route_metric_card = RailsPulse::Routes::Cards::ErrorRatePerRoute.new(route: nil).to_metric_card
+      # Get tag filter values from session
+      disabled_tags = session_disabled_tags
+      show_non_tagged = session[:show_non_tagged] != false
+
+      @average_query_times_metric_card = RailsPulse::Routes::Cards::AverageResponseTimes.new(route: nil, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @percentile_response_times_metric_card = RailsPulse::Routes::Cards::PercentileResponseTimes.new(route: nil, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @request_count_totals_metric_card = RailsPulse::Routes::Cards::RequestCountTotals.new(route: nil, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @error_rate_per_route_metric_card = RailsPulse::Routes::Cards::ErrorRatePerRoute.new(route: nil, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
 
       # Generate chart data for inline rendering
-      @average_response_time_chart_data = RailsPulse::Dashboard::Charts::AverageResponseTime.new.to_chart_data
-      @p95_response_time_chart_data = RailsPulse::Dashboard::Charts::P95ResponseTime.new.to_chart_data
+      @average_response_time_chart_data = RailsPulse::Dashboard::Charts::AverageResponseTime.new(disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_chart_data
+      @p95_response_time_chart_data = RailsPulse::Dashboard::Charts::P95ResponseTime.new(disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_chart_data
 
       # Generate table data for inline rendering
-      @slow_routes_table_data = RailsPulse::Dashboard::Tables::SlowRoutes.new.to_table_data
-      @slow_queries_table_data = RailsPulse::Dashboard::Tables::SlowQueries.new.to_table_data
+      @slow_routes_table_data = RailsPulse::Dashboard::Tables::SlowRoutes.new(disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_table_data
+      @slow_queries_table_data = RailsPulse::Dashboard::Tables::SlowQueries.new(disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_table_data
     end
   end
 end

data/app/controllers/rails_pulse/queries_controller.rb

@@ -70,7 +70,8 @@ module RailsPulse
     def build_chart_ransack_params(ransack_params)
       base_params = ransack_params.except(:s).merge(
         period_start_gteq: Time.at(@start_time),
-        period_start_lt: Time.at(@end_time)
+        period_start_lt: Time.at(@end_time),
+        summarizable_type_eq: "RailsPulse::Query"
       )
 
       # Only add duration filter if we have a meaningful threshold
@@ -78,8 +79,7 @@ module RailsPulse
 
       if show_action?
         base_params.merge(
-          summarizable_id_eq: @query.id,
-          summarizable_type_eq: "RailsPulse::Query"
+          summarizable_id_eq: @query.id
         )
       else
         base_params
@@ -123,7 +123,8 @@ module RailsPulse
           period_type: period_type,
           start_time: @start_time,
           params: params,
-          disabled_tags: session_disabled_tags
+          disabled_tags: session_disabled_tags,
+          show_non_tagged: session[:show_non_tagged] != false
         ).to_table
       end
     end
@@ -133,9 +134,13 @@ module RailsPulse
     def setup_metric_cards
       return if turbo_frame_request?
 
-      @average_query_times_metric_card = RailsPulse::Queries::Cards::AverageQueryTimes.new(query: @query).to_metric_card
-      @percentile_query_times_metric_card = RailsPulse::Queries::Cards::PercentileQueryTimes.new(query: @query).to_metric_card
-      @execution_rate_metric_card = RailsPulse::Queries::Cards::ExecutionRate.new(query: @query).to_metric_card
+      # Get tag filter values from session
+      disabled_tags = session_disabled_tags
+      show_non_tagged = session[:show_non_tagged] != false
+
+      @average_query_times_metric_card = RailsPulse::Queries::Cards::AverageQueryTimes.new(query: @query, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @percentile_query_times_metric_card = RailsPulse::Queries::Cards::PercentileQueryTimes.new(query: @query, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @execution_rate_metric_card = RailsPulse::Queries::Cards::ExecutionRate.new(query: @query, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
     end
 
     def show_action?
@@ -158,7 +163,7 @@ module RailsPulse
       table_results = build_table_results
       handle_pagination
 
-      @pagy, @table_data = pagy(table_results, limit: session_pagination_limit)
+      @pagy, @table_data = pagy(table_results, items: session_pagination_limit)
     end
 
     def handle_pagination

data/app/controllers/rails_pulse/requests_controller.rb

@@ -26,10 +26,14 @@ module RailsPulse
     def setup_metric_cards
       return if  turbo_frame_request?
 
-      @average_response_times_metric_card = RailsPulse::Routes::Cards::AverageResponseTimes.new(route: nil).to_metric_card
-      @percentile_response_times_metric_card = RailsPulse::Routes::Cards::PercentileResponseTimes.new(route: nil).to_metric_card
-      @request_count_totals_metric_card = RailsPulse::Routes::Cards::RequestCountTotals.new(route: nil).to_metric_card
-      @error_rate_per_route_metric_card = RailsPulse::Routes::Cards::ErrorRatePerRoute.new(route: nil).to_metric_card
+      # Get tag filter values from session
+      disabled_tags = session_disabled_tags
+      show_non_tagged = session[:show_non_tagged] != false
+
+      @average_response_times_metric_card = RailsPulse::Routes::Cards::AverageResponseTimes.new(route: nil, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @percentile_response_times_metric_card = RailsPulse::Routes::Cards::PercentileResponseTimes.new(route: nil, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @request_count_totals_metric_card = RailsPulse::Routes::Cards::RequestCountTotals.new(route: nil, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @error_rate_per_route_metric_card = RailsPulse::Routes::Cards::ErrorRatePerRoute.new(route: nil, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
     end
 
 
@@ -124,7 +128,8 @@ module RailsPulse
       table_results = build_table_results
       handle_pagination
 
-      @pagy, @table_data = pagy(table_results, limit: session_pagination_limit)
+      # Use 'items:' for Pagy 8.x compatibility ('limit:' is for Pagy 43+)
+      @pagy, @table_data = pagy(table_results, items: session_pagination_limit)
     end
 
     def handle_pagination

data/app/controllers/rails_pulse/routes_controller.rb

@@ -20,10 +20,14 @@ module RailsPulse
     def setup_metric_cards
       return if turbo_frame_request?
 
-      @average_query_times_metric_card = RailsPulse::Routes::Cards::AverageResponseTimes.new(route: @route).to_metric_card
-      @percentile_response_times_metric_card = RailsPulse::Routes::Cards::PercentileResponseTimes.new(route: @route).to_metric_card
-      @request_count_totals_metric_card = RailsPulse::Routes::Cards::RequestCountTotals.new(route: @route).to_metric_card
-      @error_rate_per_route_metric_card = RailsPulse::Routes::Cards::ErrorRatePerRoute.new(route: @route).to_metric_card
+      # Get tag filter values from session
+      disabled_tags = session_disabled_tags
+      show_non_tagged = session[:show_non_tagged] != false
+
+      @average_query_times_metric_card = RailsPulse::Routes::Cards::AverageResponseTimes.new(route: @route, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @percentile_response_times_metric_card = RailsPulse::Routes::Cards::PercentileResponseTimes.new(route: @route, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @request_count_totals_metric_card = RailsPulse::Routes::Cards::RequestCountTotals.new(route: @route, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
+      @error_rate_per_route_metric_card = RailsPulse::Routes::Cards::ErrorRatePerRoute.new(route: @route, disabled_tags: disabled_tags, show_non_tagged: show_non_tagged).to_metric_card
     end
 
     def chart_model
@@ -87,7 +91,9 @@ module RailsPulse
       if show_action?
         # Only show requests that belong to time periods where we have route summaries
         # This ensures the table data is consistent with the chart data
-        base_query = apply_tag_filters(@ransack_query.result)
+        # Note: We don't apply tag filters here because we want to show all requests
+        # for this specific route, regardless of individual request tags
+        base_query = @ransack_query.result
           .joins(<<~SQL)
             INNER JOIN rails_pulse_summaries ON
               rails_pulse_summaries.summarizable_id = rails_pulse_requests.route_id AND
@@ -110,7 +116,8 @@ module RailsPulse
           period_type: period_type,
           start_time: @start_time,
           params: params,
-          disabled_tags: session_disabled_tags
+          disabled_tags: session_disabled_tags,
+          show_non_tagged: session[:show_non_tagged] != false
         ).to_table
       end
     end
@@ -135,7 +142,7 @@ module RailsPulse
       table_results = build_table_results
       handle_pagination
 
-      @pagy, @table_data = pagy(table_results, limit: session_pagination_limit)
+      @pagy, @table_data = pagy(table_results, items: session_pagination_limit)
     end
 
     def handle_pagination

data/app/helpers/rails_pulse/application_helper.rb

@@ -1,7 +1,5 @@
 module RailsPulse
   module ApplicationHelper
-    include Pagy::Frontend
-
     include BreadcrumbsHelper
     include ChartHelper
     include FormattingHelper
@@ -10,6 +8,10 @@ module RailsPulse
     include FormHelper
     include TagsHelper
 
+    # Include Pagy frontend helpers for Pagy 8.x compatibility
+    # Pagy 43+ doesn't need this, but it doesn't hurt to include it
+    include Pagy::Frontend if defined?(Pagy::Frontend)
+
     # Replacement for lucide_icon helper that works with pre-compiled assets
     # Outputs a custom element that will be hydrated by Stimulus
     def rails_pulse_icon(name, options = {})
@@ -36,6 +38,49 @@ module RailsPulse
     # Backward compatibility alias - can be removed after migration
     alias_method :lucide_icon, :rails_pulse_icon
 
+    # Get items per page from Pagy instance (compatible with Pagy 8.x and 43+)
+    def pagy_items(pagy)
+      # Pagy 43+ uses options[:items] or has a limit method
+      if pagy.respond_to?(:options) && pagy.options.is_a?(Hash)
+        pagy.options[:items]
+      # Pagy 8.x uses vars[:items]
+      elsif pagy.respond_to?(:vars)
+        pagy.vars[:items]
+      # Fallback
+      else
+        pagy.limit || 10
+      end
+    end
+
+    # Get page URL from Pagy instance (compatible with Pagy 8.x and 43+)
+    def pagy_page_url(pagy, page_number)
+      # Pagy 43+ has page_url method
+      if pagy.respond_to?(:page_url)
+        pagy.page_url(page_number)
+      # Pagy 8.x requires using pagy_url_for helper
+      else
+        pagy_url_for(pagy, page_number)
+      end
+    end
+
+    # Get previous page number (compatible with Pagy 8.x and 43+)
+    def pagy_previous(pagy)
+      # Pagy 43+ uses 'previous'
+      if pagy.respond_to?(:previous)
+        pagy.previous
+      # Pagy 8.x uses 'prev'
+      elsif pagy.respond_to?(:prev)
+        pagy.prev
+      else
+        nil
+      end
+    end
+
+    # Get next page number (compatible with Pagy 8.x and 43+)
+    def pagy_next(pagy)
+      pagy.respond_to?(:next) ? pagy.next : nil
+    end
+
     # Make Rails Pulse routes available as rails_pulse in views
     def rails_pulse
       @rails_pulse_helper ||= RailsPulseHelper.new(self)

data/app/helpers/rails_pulse/chart_helper.rb

@@ -1,5 +1,30 @@
 module RailsPulse
   module ChartHelper
+    # Main chart rendering method - unified API for all chart types
+    # Uses Stimulus controller to handle chart initialization
+    def render_stimulus_chart(data, type:, **options)
+      chart_id = options[:id] || "rails-pulse-chart-#{SecureRandom.hex(8)}"
+      height = options[:height] || "400px"
+      width = options[:width] || "100%"
+      theme = options[:theme] || "railspulse"
+      chart_options = options[:options] || {}
+
+      # Build data attributes for Stimulus
+      stimulus_data = {
+        controller: "rails-pulse--chart",
+        rails_pulse__chart_type_value: type,
+        rails_pulse__chart_data_value: data.to_json,
+        rails_pulse__chart_options_value: chart_options.to_json,
+        rails_pulse__chart_theme_value: theme
+      }
+
+      content_tag(:div, "",
+        id: chart_id,
+        style: "height: #{height}; width: #{width};",
+        data: stimulus_data
+      )
+    end
+
     # Base chart options shared across all chart types
     def base_chart_options(units: nil, zoom: false)
       {
@@ -97,16 +122,21 @@ module RailsPulse
 
     private
 
+    # Wraps JavaScript function strings for later processing
+    def js_function(func_string)
+      "__FUNCTION_START__#{func_string}__FUNCTION_END__"
+    end
+
     def apply_tooltip_formatter(options, tooltip_formatter)
       return unless tooltip_formatter.present?
 
-      options[:tooltip][:formatter] = RailsCharts.js(tooltip_formatter)
+      options[:tooltip][:formatter] = js_function(tooltip_formatter)
     end
 
     def apply_xaxis_formatter(options, xaxis_formatter)
       return unless xaxis_formatter.present?
 
-      options[:xAxis][:axisLabel] ||= { formatter: RailsCharts.js(xaxis_formatter) }
+      options[:xAxis][:axisLabel] ||= { formatter: js_function(xaxis_formatter) }
     end
 
     def apply_zoom_configuration(options, zoom, zoom_start, zoom_end, chart_data)

data/app/javascript/rails_pulse/application.js

@@ -12,6 +12,7 @@ import PopoverController from "./controllers/popover_controller";
 import FormController from "./controllers/form_controller";
 
 // Rails Pulse Controllers
+import ChartController from "./controllers/chart_controller";
 import IndexController from "./controllers/index_controller";
 import ColorSchemeController from "./controllers/color_scheme_controller";
 import PaginationController from "./controllers/pagination_controller";
@@ -29,7 +30,7 @@ const application = Application.start();
 application.debug = false;
 window.Stimulus = application;
 
-// Make ECharts available globally for rails_charts gem
+// Make ECharts available globally for chart rendering
 window.echarts = echarts;
 
 // Make Turbo available globally
@@ -42,6 +43,7 @@ application.register("rails-pulse--menu", MenuController);
 application.register("rails-pulse--popover", PopoverController);
 application.register("rails-pulse--form", FormController);
 
+application.register("rails-pulse--chart", ChartController);
 application.register("rails-pulse--index", IndexController);
 application.register("rails-pulse--color-scheme", ColorSchemeController);
 application.register("rails-pulse--pagination", PaginationController);
@@ -96,59 +98,6 @@ echarts.registerTheme('railspulse', {
   "bar": { "itemStyle": { "barBorderWidth": 0 } }
 });
 
-// Chart resize functionality (moved from inline script for CSP compliance)
-window.addEventListener('resize', function() {
-  if (window.RailsCharts && window.RailsCharts.charts) {
-    Object.keys(window.RailsCharts.charts).forEach(function(chartID) {
-      window.RailsCharts.charts[chartID].resize();
-    });
-  }
-});
-
-// Apply axis label colors based on current color scheme
-function applyChartAxisLabelColors() {
-  if (!window.RailsCharts || !window.RailsCharts.charts) return;
-  const scheme = document.documentElement.getAttribute('data-color-scheme');
-  const isDark = scheme === 'dark';
-  const axisColor = isDark ? '#ffffff' : '#999999';
-  Object.keys(window.RailsCharts.charts).forEach(function(chartID) {
-    const chart = window.RailsCharts.charts[chartID];
-    try {
-      chart.setOption({
-        xAxis: { axisLabel: { color: axisColor } },
-        yAxis: { axisLabel: { color: axisColor } }
-      });
-    } catch (e) {
-      // noop
-    }
-  });
-}
-
-// Initial apply after charts initialize and on scheme changes
-document.addEventListener('DOMContentLoaded', () => {
-  // run shortly after load to allow charts to initialize
-  setTimeout(applyChartAxisLabelColors, 50);
-});
-document.addEventListener('rails-pulse:color-scheme-changed', applyChartAxisLabelColors);
-
-// Global function to initialize Rails Charts in any container.
-// This is needed as we render Rails Charts in Turbo Frames.
-window.initializeChartsInContainer = function(containerId) {
-  requestAnimationFrame(() => {
-    const container = containerId ? document.getElementById(containerId) : document;
-    const scripts = container.querySelectorAll('script');
-    scripts.forEach(script => {
-      const content = script.textContent;
-      const match = content.match(/function\s+(init_rails_charts_[a-f0-9]+)/);
-      if (match && window[match[1]]) {
-        window[match[1]]();
-      }
-    });
-    // ensure colors are correct for any charts initialized in this container
-    setTimeout(applyChartAxisLabelColors, 10);
-  });
-};
-
 // Export for global access
 window.RailsPulse = {
   application,