rails_pulse 0.2.3 → 0.2.4

data/app/javascript/rails_pulse/controllers/pagination_controller.js

@@ -3,56 +3,50 @@ import { Controller } from "@hotwired/stimulus"
 export default class extends Controller {
   static targets = ["limit"]
   static values = {
-    storageKey: { type: String, default: "rails_pulse_pagination_limit" },
-    url: String
+    storageKey: { type: String, default: "rails_pulse_pagination_limit" }
   }
 
   connect() {
     this.restorePaginationLimit()
   }
 
-  // Update pagination limit and refresh the turbo frame
+  // Update pagination limit and navigate to page 1 with new limit
   updateLimit() {
     const limit = this.limitTarget.value
 
-    // Save to session storage only - no server request needed
+    // Save to session storage for persistence
     sessionStorage.setItem(this.storageKeyValue, limit)
 
-    // Find the closest turbo frame and reload it to apply new pagination
-    const turboFrame = this.element.closest('turbo-frame')
-    if (turboFrame) {
-      // Add the limit as a URL parameter so server picks it up
-      const currentUrl = new URL(window.location)
-      currentUrl.searchParams.set('limit', limit)
-      turboFrame.src = currentUrl.pathname + currentUrl.search
+    // Build URL with limit parameter and reset to page 1
+    const currentUrl = new URL(window.location)
+    currentUrl.searchParams.set('limit', limit)
+    currentUrl.searchParams.delete('page')
+
+    // Use Turbo.visit for smooth navigation that preserves query params
+    if (typeof Turbo !== 'undefined') {
+      Turbo.visit(currentUrl.toString(), { action: 'replace' })
     } else {
-      // Fallback to page reload if not within a turbo frame
-      const currentUrl = new URL(window.location)
-      currentUrl.searchParams.set('limit', limit)
-      window.location.href = currentUrl.pathname + currentUrl.search
+      window.location.href = currentUrl.toString()
     }
   }
 
-  // Get CSRF token from meta tag
-  getCSRFToken() {
-    const token = document.querySelector('meta[name="csrf-token"]')
-    return token ? token.getAttribute('content') : ''
-  }
-
-  // Save the pagination limit to session storage when it changes
-  savePaginationLimit() {
-    const limit = this.limitTarget.value
-    sessionStorage.setItem(this.storageKeyValue, limit)
-  }
-
-  // Restore the pagination limit from session storage on page load
+  // Restore the pagination limit from URL or session storage on page load
   restorePaginationLimit() {
-    const savedLimit = sessionStorage.getItem(this.storageKeyValue)
-    if (savedLimit && this.limitTarget) {
-      // Only set if the current value is different (prevents unnecessary DOM updates)
-      if (this.limitTarget.value !== savedLimit) {
+    // URL params take precedence over session storage
+    const urlParams = new URLSearchParams(window.location.search)
+    const urlLimit = urlParams.get('limit')
+
+    if (urlLimit && this.limitTarget) {
+      // Sync sessionStorage with URL param
+      sessionStorage.setItem(this.storageKeyValue, urlLimit)
+      if (this.limitTarget.value !== urlLimit) {
+        this.limitTarget.value = urlLimit
+      }
+    } else {
+      // Fall back to sessionStorage if no URL param
+      const savedLimit = sessionStorage.getItem(this.storageKeyValue)
+      if (savedLimit && this.limitTarget && this.limitTarget.value !== savedLimit) {
         this.limitTarget.value = savedLimit
-        // Don't trigger change event when restoring from session - prevents infinite loops
       }
     }
   }

data/app/jobs/rails_pulse/backfill_summaries_job.rb

@@ -1,7 +1,5 @@
 module RailsPulse
   class BackfillSummariesJob < ApplicationJob
-    queue_as :low_priority
-
     def perform(start_date, end_date, period_types = [ "hour", "day" ])
       start_date = start_date.to_datetime
       end_date = end_date.to_datetime

data/app/jobs/rails_pulse/cleanup_job.rb

@@ -1,7 +1,5 @@
 module RailsPulse
   class CleanupJob < ApplicationJob
-    queue_as :default
-
     def perform
       return unless RailsPulse.configuration.archiving_enabled
 

data/app/jobs/rails_pulse/summary_job.rb

@@ -1,7 +1,5 @@
 module RailsPulse
   class SummaryJob < ApplicationJob
-    queue_as :low_priority
-
     def perform(target_hour = nil)
       target_hour ||= 1.hour.ago.beginning_of_hour
 

data/app/models/rails_pulse/queries/charts/average_query_times.rb

@@ -13,7 +13,7 @@ module RailsPulse
           @show_non_tagged = show_non_tagged
         end
 
-        def to_rails_chart
+        def to_chart_data
           # The ransack query already contains the correct filters, just add period_type and tag filters
           summaries = @ransack_query.result(distinct: false)
             .with_tag_filters(@disabled_tags, @show_non_tagged)

data/app/models/rails_pulse/requests/charts/average_response_times.rb

@@ -13,7 +13,7 @@ module RailsPulse
           @show_non_tagged = show_non_tagged
         end
 
-        def to_rails_chart
+        def to_chart_data
           # Note: Overall request summaries (summarizable_id: 0) are not filtered by tags
           # as they aggregate all requests regardless of route tags
           summaries = @ransack_query.result(distinct: false)

data/app/models/rails_pulse/routes/charts/average_response_times.rb

@@ -13,7 +13,7 @@ module RailsPulse
           @show_non_tagged = show_non_tagged
         end
 
-        def to_rails_chart
+        def to_chart_data
           summaries = @ransack_query.result(distinct: false)
             .with_tag_filters(@disabled_tags, @show_non_tagged)
             .where(

data/app/views/rails_pulse/components/_metric_card.html.erb

@@ -9,7 +9,7 @@
   trend_amount = data[:trend_amount]
   trend_text = data[:trend_text]
 %>
-<div class="grid-item" data-controller="rails-pulse--chart" id="<%= id %>">
+<div class="grid-item" id="<%= id %>">
   <%= render 'rails_pulse/components/panel', { title: title, card_classes: 'card-compact' } do %>
     <div class="row mbs-2" style="--columns: 2; align-items: center; margin-bottom: 0;">
       <div class="grid-item">
@@ -38,7 +38,7 @@
               }
             )
           %>
-          <%= bar_chart chart_data, height: "100%", options: chart_options %>
+          <%= render_stimulus_chart chart_data, type: 'bar', height: "100%", options: chart_options %>
         </div>
       </div>
     </div>

data/app/views/rails_pulse/components/_sparkline_stats.html.erb

@@ -2,7 +2,7 @@
   <h4 class="text-xl mbs-1 font-bold"><%= summary %></h4>
 </div>
 <div class="chart-container chart-container--slim">
-  <%= bar_chart chart_data, height: "100%", options: sparkline_chart_options %>
+  <%= render_stimulus_chart chart_data, type: 'bar', height: "100%", options: sparkline_chart_options %>
 </div>
 <div>
   <span class="badge badge--<%= trend_direction == "down" ? "positive" : "negative" %>-inverse p-0">

data/app/views/rails_pulse/components/_table_pagination.html.erb

@@ -7,7 +7,7 @@
          data-rails-pulse--pagination-url-value="<%= rails_pulse.pagination_limit_path %>">
       <label for="pagination_limit" class="text-sm font-medium">Rows per page</label>
       <%= select_tag :limit,
-        options_for_select([[10, 10], [20, 20], [30, 30], [40, 40], [50, 50]], @pagy.vars[:items]),
+        options_for_select([[10, 10], [20, 20], [30, 30], [40, 40], [50, 50]], pagy_items(@pagy)),
         {
           id: "pagination_limit",
           class: "input",
@@ -21,22 +21,24 @@
       %>
     </div>
 
-    <div class="text-sm font-medium"><%= "Page #{@pagy.page} of #{@pagy.pages}" %></div>
+    <div class="text-sm font-medium"><%= "Page #{@pagy.page} of #{@pagy.last}" %></div>
 
     <nav class="flex items-center gap shrink-0" style="--btn-padding: .5rem;" aria-label="Pagination">
-      <%= link_to pagy_url_for(@pagy, 1), class: "btn", aria: { disabled: @pagy.prev.nil? }.compact_blank do %>
+      <% previous_page = pagy_previous(@pagy) %>
+      <% next_page = pagy_next(@pagy) %>
+      <%= link_to pagy_page_url(@pagy, 1), class: "btn", aria: { disabled: previous_page.nil? }.compact_blank do %>
         <%= rails_pulse_icon 'chevrons-left', width: '16', height: '16' %>
         <span class="sr-only">Go to first page</span>
       <% end %>
-      <%= link_to pagy_url_for(@pagy, @pagy.prev || @pagy.page), class: "btn", aria: { disabled: @pagy.prev.nil? }.compact_blank do %>
+      <%= link_to pagy_page_url(@pagy, previous_page || @pagy.page), class: "btn", aria: { disabled: previous_page.nil? }.compact_blank do %>
         <%= rails_pulse_icon 'chevron-left', width: '16', height: '16' %>
         <span class="sr-only">Go to previous page</span>
       <% end %>
-      <%= link_to pagy_url_for(@pagy, @pagy.next || @pagy.page), class: "btn", aria: { disabled: @pagy.next.nil? }.compact_blank do %>
+      <%= link_to pagy_page_url(@pagy, next_page || @pagy.page), class: "btn", aria: { disabled: next_page.nil? }.compact_blank do %>
         <%= rails_pulse_icon 'chevron-right', width: '16', height: '16' %>
         <span class="sr-only">Go to next page</span>
       <% end %>
-      <%= link_to pagy_url_for(@pagy, @pagy.last), class: "btn", aria: { disabled: @pagy.next.nil? }.compact_blank do %>
+      <%= link_to pagy_page_url(@pagy, @pagy.last), class: "btn", aria: { disabled: next_page.nil? }.compact_blank do %>
         <%= rails_pulse_icon 'chevrons-right', width: '16', height: '16' %>
         <span class="sr-only">Go to last page</span>
       <% end %>

data/app/views/rails_pulse/csp_test/show.html.erb

@@ -171,7 +171,7 @@
       <div class="card">
         <div class="p-4">
           <h2 class="text-lg font-semibold mb-3">Chart Component Test</h2>
-          <p class="text-subtle mb-4">Testing rails_charts CSP compliance:</p>
+          <p class="text-subtle mb-4">Testing chart CSP compliance:</p>
 
           <div id="chart-container" class="bg-shade border border-main rounded-md p-4 text-center">
             <span class="text-subtle">Chart components would render here in a real dashboard</span>

data/app/views/rails_pulse/dashboard/charts/_bar_chart.html.erb

@@ -1 +1 @@
-<%= bar_chart @component_data, height: "100%", options: bar_chart_options(units: "ms") %>
+<%= render_stimulus_chart @component_data, type: 'bar', height: "100%", options: bar_chart_options(units: "ms") %>

data/app/views/rails_pulse/dashboard/index.html.erb

@@ -20,9 +20,9 @@
     } do %>
       <% if @average_response_time_chart_data.present? %>
         <div class="chart-container chart-container--slim">
-          <%= bar_chart(
+          <%= render_stimulus_chart(
             @average_response_time_chart_data,
-            code: false,
+            type: 'bar',
             id: "dashboard_average_response_time_chart",
             height: "100%",
             options: bar_chart_options(
@@ -44,8 +44,9 @@
     } do %>
       <% if @p95_response_time_chart_data.present? %>
         <div class="chart-container chart-container--slim">
-          <%= bar_chart(
+          <%= render_stimulus_chart(
             @p95_response_time_chart_data,
+            type: 'bar',
             code: false,
             id: "dashboard_p95_response_time_chart",
             height: "100%",

data/app/views/rails_pulse/queries/index.html.erb

@@ -32,8 +32,9 @@
           class="chart-container chart-container--slim"
           data-rails-pulse--index-target="chart"
         >
-          <%= bar_chart(
+          <%= render_stimulus_chart(
             @chart_data,
+            type: 'bar',
             code: false,
             id: "average_query_times_chart",
             height: "100%",

data/app/views/rails_pulse/queries/show.html.erb

@@ -32,8 +32,9 @@
           class="chart-container chart-container--slim"
           data-rails-pulse--index-target="chart"
         >
-          <%= bar_chart(
+          <%= render_stimulus_chart(
             @chart_data,
+            type: 'bar',
             code: false,
             id: "query_responses_chart",
             height: "100%",

data/app/views/rails_pulse/routes/index.html.erb

@@ -34,8 +34,9 @@
           class="chart-container chart-container--slim"
           data-rails-pulse--index-target="chart"
         >
-          <%= bar_chart(
+          <%= render_stimulus_chart(
             @chart_data,
+            type: 'bar',
             code: false,
             id: "average_response_times_chart",
             height: "100%",

data/app/views/rails_pulse/routes/show.html.erb

@@ -35,8 +35,9 @@
             class="chart-container chart-container--slim"
             data-rails-pulse--index-target="chart"
           >
-            <%= bar_chart(
+            <%= render_stimulus_chart(
               @chart_data,
+            type: 'bar',
               code: false,
               id: "route_responses_chart",
               height: "100%",

data/config/importmap.rb

@@ -1,6 +1,6 @@
 pin "application", to: "rails_pulse/application.js"
 
-# echarts is a dependency of the rails_charts gem
+# echarts is used for chart rendering
 pin "echarts", to: "echarts.min.js"
 # pin "echarts/theme/inspired", to: "echarts/theme/inspired.js"
 pin "rails_pulse/theme", to: "rails_pulse/theme.js"

data/lib/rails_pulse/engine.rb

@@ -4,7 +4,6 @@ require "rails_pulse/middleware/asset_server"
 require "rails_pulse/subscribers/operation_subscriber"
 require "request_store"
 require "rack/static"
-require "rails_charts"
 require "ransack"
 require "pagy"
 require "turbo-rails"
@@ -14,17 +13,6 @@ module RailsPulse
   class Engine < ::Rails::Engine
     isolate_namespace RailsPulse
 
-    # Prevent rails_charts from polluting the global ActionView namespace
-    # This MUST happen before any initializers run to avoid conflicts with host apps
-    # that use Chartkick or other chart libraries
-    if defined?(RailsCharts::Engine)
-      # Find and remove the rails_charts.helpers initializer
-      RailsCharts::Engine.initializers.delete_if do |init|
-        init.name == "rails_charts.helpers"
-      end
-    end
-
-
     # Load Rake tasks
     rake_tasks do
       Dir.glob(File.expand_path("../tasks/**/*.rake", __FILE__)).each { |file| load file }
@@ -57,24 +45,6 @@ module RailsPulse
       RailsPulse::Subscribers::OperationSubscriber.subscribe!
     end
 
-    initializer "rails_pulse.rails_charts_theme" do
-      RailsCharts.options[:theme] = "railspulse"
-    end
-
-    # Manually include RailsCharts helpers only in RailsPulse views
-    # This ensures rails_charts methods are only available in RailsPulse namespace,
-    # not in the host application
-    initializer "rails_pulse.include_rails_charts_helpers" do
-      ActiveSupport.on_load :action_view do
-        if defined?(RailsCharts::Helpers) && defined?(RailsPulse::ChartHelper)
-          unless RailsPulse::ChartHelper.include?(RailsCharts::Helpers)
-            RailsPulse::ChartHelper.include(RailsCharts::Helpers)
-          end
-        end
-      end
-    end
-
-
     initializer "rails_pulse.ransack", after: "ransack.initialize" do
       # Ensure Ransack is loaded before our models
     end

data/lib/rails_pulse/version.rb

@@ -1,3 +1,3 @@
 module RailsPulse
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/public/rails-pulse-assets/csp-test.js

@@ -90,21 +90,21 @@
     checkAssetLoading();
     setupAjaxTest();
     trackCSPViolations();
+
+    // Add a visible indicator for system tests
+    const indicator = document.createElement('div');
+    indicator.id = 'js-loaded-indicator';
+    indicator.textContent = 'CSP Test JS loaded successfully';
+    indicator.style.display = 'none'; // Hidden but accessible to tests
+    document.body.appendChild(indicator);
   }
-  
+
+  console.log('CSP Test JS loaded successfully - monitoring for violations');
+
   // Run tests when DOM is ready
   if (document.readyState === 'loading') {
     document.addEventListener('DOMContentLoaded', initializeTests);
   } else {
     initializeTests();
   }
-  
-  console.log('CSP Test JS loaded successfully - monitoring for violations');
-  
-  // Add a visible indicator for system tests
-  const indicator = document.createElement('div');
-  indicator.id = 'js-loaded-indicator';
-  indicator.textContent = 'CSP Test JS loaded successfully';
-  indicator.style.display = 'none'; // Hidden but accessible to tests
-  document.body.appendChild(indicator);
 })();