- <% @table_data.each do |route_request| %>
+ <% @table_data.each do |request| %>
+ <%
+ # Determine performance class based on request duration
+ performance_class = case request.duration
+ when 0..100 then "text-green-600"
+ when 100..300 then "text-yellow-600"
+ when 300..1000 then "text-orange-600"
+ else "text-red-600"
+ end
+ %>
- <% if @route.blank? %>
- | <%= link_to route_request.route.path_and_method, request_path(route_request), data: { turbo_frame: '_top' } %> |
- <% end %>
- <%= link_to human_readable_occurred_at(route_request.occurred_at), request_path(route_request), data: { turbo_frame: '_top' } %> |
- <%= route_request.duration.round(2) %> ms |
- <%= route_request.status %> |
- <%= request_status_indicator(route_request.duration) %> |
+
+ <%= link_to human_readable_occurred_at(request.occurred_at), request_path(request), data: { turbo_frame: '_top' } %>
+ |
+
+ <%= link_to "#{request.route.path} #{request.route.method}", route_path(request.route), data: { turbo_frame: '_top' } %>
+ |
+
+
+ <%= request.duration.round(2) %> ms
+
+ |
+
+ <%= request.status %>
+ |
<% end %>
diff --git a/app/views/rails_pulse/requests/index.html.erb b/app/views/rails_pulse/requests/index.html.erb
index 867a275..10ce34f 100644
--- a/app/views/rails_pulse/requests/index.html.erb
+++ b/app/views/rails_pulse/requests/index.html.erb
@@ -55,8 +55,16 @@
)
) %>
+ <% else %>
+
@@ -18,9 +15,6 @@
| <%= summary.avg_duration.to_i %> ms |
<%= summary.max_duration.to_i %> ms |
<%= number_with_delimiter summary.count %> |
- <%= summary.count < 1 ? '< 1' : (summary.count / 60.0).round(2) %> |
- <%= ((summary.error_count.to_f / summary.count) * 100).round(2) %>% |
- <%= route_status_indicator(summary.avg_duration >= 500 ? 1 : 0) %> |
<% end %>
diff --git a/app/views/rails_pulse/routes/show.html.erb b/app/views/rails_pulse/routes/show.html.erb
index 24bf189..949a647 100644
--- a/app/views/rails_pulse/routes/show.html.erb
+++ b/app/views/rails_pulse/routes/show.html.erb
@@ -1,7 +1,5 @@
<%= render 'rails_pulse/components/breadcrumbs' %>
-<%= @route.path_and_method %>
-
<% unless turbo_frame_request? %>
<%= render 'rails_pulse/components/metric_card', { class: "grid-item block", data: @average_query_times_metric_card } %>
@@ -62,7 +60,7 @@
<% end %>
<%= turbo_frame_tag :index_table, data: { rails_pulse__index_target: "indexTable" } do %>
- <%= render 'rails_pulse/requests/table' %>
+ <%= render 'rails_pulse/routes/requests_table' %>
<% end %>
<% else %>
<%= render 'rails_pulse/components/empty_state',
diff --git a/config/initializers/rails_charts_csp_patch.rb b/config/initializers/rails_charts_csp_patch.rb
index 2ac23ff..bbba541 100644
--- a/config/initializers/rails_charts_csp_patch.rb
+++ b/config/initializers/rails_charts_csp_patch.rb
@@ -1,62 +1,54 @@
-# Monkey patch for RailsCharts CSP compliance
-# This adds nonce attributes to script tags generated by the RailsCharts gem
+# CSP patch for RailsCharts gem
+# Adds nonce attributes to script tags generated by RailsCharts for CSP compliance
if defined?(RailsCharts)
module RailsCharts
module CspPatch
def line_chart(data_source, options = {})
- # Get the original chart HTML
chart_html = super(data_source, options)
+ add_csp_nonce_to_chart(chart_html)
+ end
- # Try to get CSP nonce from various sources
- nonce = get_csp_nonce
-
- if nonce.present? && chart_html.present?
- # Add nonce to all script tags in the chart HTML
- chart_html = add_nonce_to_scripts(chart_html.to_s, nonce)
- # Ensure the HTML is marked as safe for Rails to render
- chart_html = chart_html.html_safe if chart_html.respond_to?(:html_safe)
- end
-
- chart_html
+ def bar_chart(data_source, options = {})
+ chart_html = super(data_source, options)
+ add_csp_nonce_to_chart(chart_html)
end
private
- def get_csp_nonce
- # Try various methods to get the CSP nonce
- nonce = nil
+ def add_csp_nonce_to_chart(chart_html)
+ return chart_html unless chart_html.present?
- # Method 1: Check for Rails 6+ CSP nonce helper
- if respond_to?(:content_security_policy_nonce)
- nonce = content_security_policy_nonce
- end
-
- # Method 2: Check for custom csp_nonce helper
- if nonce.blank? && respond_to?(:csp_nonce)
- nonce = csp_nonce
- end
+ nonce = get_csp_nonce
+ return chart_html unless nonce.present?
- # Method 3: Check request environment
- if nonce.blank? && defined?(request) && request
- nonce = request.env["action_dispatch.content_security_policy_nonce"] ||
- request.env["secure_headers.content_security_policy_nonce"] ||
- request.env["csp_nonce"]
- end
+ # Add nonce to script tags and mark as safe
+ modified_html = add_nonce_to_scripts(chart_html.to_s, nonce)
+ modified_html.html_safe if modified_html.respond_to?(:html_safe)
+ end
- # Method 4: Check thread/request store
- if nonce.blank?
- nonce = Thread.current[:rails_pulse_csp_nonce] ||
- (defined?(RequestStore) && RequestStore.store[:rails_pulse_csp_nonce])
+ def get_csp_nonce
+ # Try common CSP nonce sources in order of preference
+ if respond_to?(:content_security_policy_nonce)
+ content_security_policy_nonce
+ elsif respond_to?(:csp_nonce)
+ csp_nonce
+ elsif defined?(request) && request
+ request.env["action_dispatch.content_security_policy_nonce"] ||
+ request.env["secure_headers.content_security_policy_nonce"] ||
+ request.env["csp_nonce"]
+ elsif respond_to?(:controller) && controller.respond_to?(:content_security_policy_nonce)
+ controller.content_security_policy_nonce
+ elsif defined?(@view_context) && @view_context.respond_to?(:content_security_policy_nonce)
+ @view_context.content_security_policy_nonce
+ else
+ Thread.current[:rails_pulse_csp_nonce] ||
+ (defined?(RequestStore) && RequestStore.store[:rails_pulse_csp_nonce])
end
-
- nonce.presence
end
def add_nonce_to_scripts(html, nonce)
- # Use regex to add nonce to script tags that don't already have one
html.gsub(/]*\snonce=)([^>]*)>/i) do |match|
- # Insert nonce attribute before the closing >
attributes = $1
if attributes.strip.empty?
"