rails_pulse 0.2.2 → 0.2.3

data/app/models/rails_pulse/routes/cards/request_count_totals.rb

@@ -2,8 +2,10 @@ module RailsPulse
   module Routes
     module Cards
       class RequestCountTotals
-        def initialize(route: nil)
+        def initialize(route: nil, disabled_tags: [], show_non_tagged: true)
           @route = route
+          @disabled_tags = disabled_tags
+          @show_non_tagged = show_non_tagged
         end
 
         def to_metric_card
@@ -11,11 +13,13 @@ module RailsPulse
           previous_7_days = 14.days.ago.beginning_of_day
 
           # Single query to get all count metrics with conditional aggregation
-          base_query = RailsPulse::Summary.where(
-            summarizable_type: "RailsPulse::Route",
-            period_type: "day",
-            period_start: 2.weeks.ago.beginning_of_day..Time.current
-          )
+          base_query = RailsPulse::Summary
+            .with_tag_filters(@disabled_tags, @show_non_tagged)
+            .where(
+              summarizable_type: "RailsPulse::Route",
+              period_type: "day",
+              period_start: 2.weeks.ago.beginning_of_day..Time.current
+            )
           base_query = base_query.where(summarizable_id: @route.id) if @route
 
           metrics = base_query.select(

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

@@ -2,20 +2,24 @@ module RailsPulse
   module Routes
     module Charts
       class AverageResponseTimes
-        def initialize(ransack_query:, period_type: nil, route: nil, start_time: nil, end_time: nil, start_duration: nil)
+        def initialize(ransack_query:, period_type: nil, route: nil, start_time: nil, end_time: nil, start_duration: nil, disabled_tags: [], show_non_tagged: true)
           @ransack_query = ransack_query
           @period_type = period_type
           @route = route
           @start_time = start_time
           @end_time = end_time
           @start_duration = start_duration
+          @disabled_tags = disabled_tags
+          @show_non_tagged = show_non_tagged
         end
 
         def to_rails_chart
-          summaries = @ransack_query.result(distinct: false).where(
-            summarizable_type: "RailsPulse::Route",
-            period_type: @period_type
-          )
+          summaries = @ransack_query.result(distinct: false)
+            .with_tag_filters(@disabled_tags, @show_non_tagged)
+            .where(
+              summarizable_type: "RailsPulse::Route",
+              period_type: @period_type
+            )
 
           summaries = summaries.where(summarizable_id: @route.id) if @route
           summaries = summaries

data/app/models/rails_pulse/routes/tables/index.rb

@@ -2,12 +2,13 @@ module RailsPulse
   module Routes
     module Tables
       class Index
-        def initialize(ransack_query:, period_type: nil, start_time:, params:, disabled_tags: [])
+        def initialize(ransack_query:, period_type: nil, start_time:, params:, disabled_tags: [], show_non_tagged: true)
           @ransack_query = ransack_query
           @period_type = period_type
           @start_time = start_time
           @params = params
           @disabled_tags = disabled_tags
+          @show_non_tagged = show_non_tagged
         end
 
         def to_table
@@ -24,10 +25,19 @@ module RailsPulse
             )
 
           # Apply tag filters by excluding routes with disabled tags
-          @disabled_tags.each do |tag|
+          # Separate "non_tagged" from actual tags (it's a virtual tag)
+          actual_disabled_tags = @disabled_tags.reject { |tag| tag == "non_tagged" }
+
+          # Exclude routes with actual disabled tags
+          actual_disabled_tags.each do |tag|
             base_query = base_query.where.not("rails_pulse_routes.tags LIKE ?", "%#{tag}%")
           end
 
+          # Exclude non-tagged routes if show_non_tagged is false
+          unless @show_non_tagged
+            base_query = base_query.where("rails_pulse_routes.tags IS NOT NULL AND rails_pulse_routes.tags != '[]'")
+          end
+
           base_query = base_query.where(summarizable_id: @route.id) if @route
 
           # Apply grouping and aggregation

data/app/models/rails_pulse/summary.rb

@@ -33,6 +33,61 @@ module RailsPulse
       where(summarizable_type: "RailsPulse::Request", summarizable_id: 0)
     }
 
+    # Tag filtering scope for charts and metrics
+    # Filters summaries based on disabled tags in the underlying route/query
+    scope :with_tag_filters, ->(disabled_tags = [], show_non_tagged = true) {
+      # Separate "non_tagged" from actual tags (it's a virtual tag)
+      actual_disabled_tags = disabled_tags.reject { |tag| tag == "non_tagged" }
+
+      # Return early if no filters are applied
+      return all if actual_disabled_tags.empty? && show_non_tagged
+
+      # Determine which table to join based on summarizable_type
+      # We need to handle both Route and Query summaries
+      relation = all
+
+      # Filter route summaries
+      route_ids = RailsPulse::Route.all
+
+      # Exclude routes with disabled tags
+      actual_disabled_tags.each do |tag|
+        route_ids = route_ids.where.not("tags LIKE ?", "%#{tag}%")
+      end
+
+      # Exclude non-tagged routes if show_non_tagged is false
+      route_ids = route_ids.where("tags IS NOT NULL AND tags != '[]'") unless show_non_tagged
+
+      route_ids = route_ids.pluck(:id)
+
+      # Filter query summaries
+      query_ids = RailsPulse::Query.all
+
+      # Exclude queries with disabled tags
+      actual_disabled_tags.each do |tag|
+        query_ids = query_ids.where.not("tags LIKE ?", "%#{tag}%")
+      end
+
+      # Exclude non-tagged queries if show_non_tagged is false
+      query_ids = query_ids.where("tags IS NOT NULL AND tags != '[]'") unless show_non_tagged
+
+      query_ids = query_ids.pluck(:id)
+
+      # Apply filters: include only summaries for filtered routes/queries
+      # If no routes/queries match the filter, we need to ensure nothing is returned
+      # Use -1 as an impossible ID instead of 0 (which might be used for aggregates)
+      relation = relation.where(
+        "(" \
+        "  (summarizable_type = 'RailsPulse::Route' AND summarizable_id IN (?)) OR " \
+        "  (summarizable_type = 'RailsPulse::Query' AND summarizable_id IN (?)) OR " \
+        "  (summarizable_type = 'RailsPulse::Request')" \
+        ")",
+        route_ids.presence || [ -1 ],
+        query_ids.presence || [ -1 ]
+      )
+
+      relation
+    }
+
     # Ransack configuration
     def self.ransackable_attributes(auth_object = nil)
       %w[

data/app/views/layouts/rails_pulse/_global_filters.html.erb

@@ -15,8 +15,15 @@
   <div data-rails-pulse--global-filters-target="wrapper" data-action="click->rails-pulse--global-filters#closeOnClickOutside" style="display: none; position: fixed; inset: 0; background-color: rgba(0, 0, 0, 0.8); z-index: 1000; align-items: center; justify-content: center;">
     <div class="dialog" data-rails-pulse--global-filters-target="dialog" style="position: relative; opacity: 1; transform: scale(1);">
       <div class="dialog__content">
-        <h2 class="text-lg font-semibold mb-4">Global Filters</h2>
-        <p class="text-sm text-subtle mb-4">Set default time filters that persist across all pages. These can be overridden by page-specific filters.</p>
+        <div class="flex items-start justify-between">
+          <div>
+            <h2 class="text-lg font-semibold mbe-4">Global Filters</h2>
+            <p class="text-sm text-subtle">Set default time filters that persist across all pages. These can be overridden by page-specific filters.</p>
+          </div>
+          <%= link_to '#', "aria-label": "Close", data: { action: "rails-pulse--global-filters#close" }, class: "text-subtle hover:text-default" do %>
+            <%= rails_pulse_icon 'x', width: '20' %>
+          <% end %>
+        </div>
 
         <%= form_with url: settings_global_filters_path, method: :patch, local: true, data: { action: "submit->rails-pulse--global-filters#submit" } do |form| %>
           <div class="flex flex-col gap mb-4">

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

@@ -0,0 +1,36 @@
+<% global_filters = session_global_filters %>
+<% disabled_tags = global_filters['disabled_tags'] || [] %>
+<% has_date_filters = global_filters['start_time'].present? && global_filters['end_time'].present? %>
+<% has_performance_filter = global_filters['performance_threshold'].present? %>
+<% has_tag_filters = disabled_tags.any? || session[:show_non_tagged] == false %>
+<% has_any_filters = has_date_filters || has_performance_filter || has_tag_filters %>
+
+<% if has_any_filters %>
+  <div class="flex items-center gap text-sm">
+    Filtered:
+    <% if has_date_filters %>
+      <% start_time = Time.parse(global_filters['start_time']) %>
+      <% end_time = Time.parse(global_filters['end_time']) %>
+      <span class="badge badge--secondary"><%= start_time.strftime("%b %d, %Y %-I:%M %p") %> - <%= end_time.strftime("%b %d, %Y %-I:%M %p") %></span>
+    <% end %>
+
+    <% if has_performance_filter %>
+      <% threshold_label = case global_filters['performance_threshold']
+        when 'slow' then 'Slow and Above'
+        when 'very_slow' then 'Very Slow and Above'
+        when 'critical' then 'Critical'
+        else global_filters['performance_threshold'].titleize
+        end %>
+      <span class="badge badge--secondary"><%= threshold_label %></span>
+    <% end %>
+
+    <% if has_tag_filters %>
+      <% disabled_tags.each do |tag| %>
+        <span class="badge badge--secondary"><%= tag.humanize %></span>
+      <% end %>
+      <% if session[:show_non_tagged] == false %>
+        <span class="badge badge--secondary">Non tagged hidden</span>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -16,5 +16,9 @@
     <div class="breadcrumb-tags">
       <%= render 'rails_pulse/tags/tag_manager', taggable: taggable %>
     </div>
+  <% elsif defined?(show_active_filters) && show_active_filters %>
+    <div class="breadcrumb-tags">
+      <%= render 'rails_pulse/components/active_filters' %>
+    </div>
   <% end %>
 </div>

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

@@ -1,3 +1,7 @@
+<div class="flex justify-end mb-1">
+  <%= render 'rails_pulse/components/active_filters' %>
+</div>
+
 <div class="row">
   <%= render 'rails_pulse/components/metric_card', { class: "grid-item block", data: @average_query_times_metric_card } %>
   <%= render 'rails_pulse/components/metric_card', { class: "grid-item block", data: @percentile_response_times_metric_card } %>

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

@@ -1,4 +1,4 @@
-<%= render 'rails_pulse/components/page_header' %>
+<%= render 'rails_pulse/components/page_header', show_active_filters: true %>
 
 <% unless turbo_frame_request? %>
   <div class="row">

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

@@ -1,4 +1,4 @@
-<%= render 'rails_pulse/components/page_header' %>
+<%= render 'rails_pulse/components/page_header', show_active_filters: true %>
 
 <% unless turbo_frame_request? %>
   <div class="row">

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

@@ -1,4 +1,4 @@
-<%= render 'rails_pulse/components/page_header' %>
+<%= render 'rails_pulse/components/page_header', show_active_filters: true %>
 
 <% unless turbo_frame_request? %>
   <div class="row">

data/app/views/rails_pulse/tags/_tag_manager.html.erb

@@ -11,7 +11,7 @@
 >
   <div class="tag-list">
     <% current_tags.each do |tag| %>
-      <span class="tag">
+      <span class="badge badge--secondary font-normal">
         <%= tag %>
         <%= button_to remove_tag_path(taggable_type, taggable.id, tag: tag),
               method: :delete,
@@ -29,7 +29,7 @@
         <button
           type="button"
           id="tag_menu_button_<%= taggable_type %>_<%= taggable.id %>"
-          class="btn btn--sm tag-add-button"
+          class="badge badge--positive tag-add-button font-normal"
           data-rails-pulse--popover-target="button"
           data-action="rails-pulse--popover#toggle"
           aria-haspopup="true"

data/config/initializers/rails_charts_csp_patch.rb

@@ -61,15 +61,15 @@ if defined?(RailsCharts)
   end
 end
 
-# Apply the patch to ApplicationHelper and any modules that include chart helpers
+# Apply the CSP patch only to Rails Pulse helpers, not the entire application
+# By prepending to ChartHelper instead of ApplicationHelper, we scope the patch to RailsPulse
+# namespace only, avoiding conflicts with any chart libraries in the host application
+# (Chartkick, Highcharts, Google Charts, ApexCharts, custom helpers, etc.)
 Rails.application.config.to_prepare do
-  if defined?(RailsCharts)
-    # Patch ActionView::Base to include our CSP patch for line_chart
-    ActionView::Base.prepend(RailsCharts::CspPatch)
-
-    # Also patch any Rails Pulse helpers that might use charts
-    if defined?(RailsPulse::ApplicationHelper)
-      RailsPulse::ApplicationHelper.prepend(RailsCharts::CspPatch)
-    end
+  if defined?(RailsCharts) && defined?(RailsPulse::ChartHelper)
+    # Prepend CSP patch to RailsPulse::ChartHelper
+    # This wraps only the rails_charts methods, ensuring clean CSP nonce injection
+    # without affecting the host application's chart helpers
+    RailsPulse::ChartHelper.prepend(RailsCharts::CspPatch)
   end
 end

data/lib/rails_pulse/cleanup_service.rb

@@ -69,6 +69,11 @@ module RailsPulse
       return 0 unless defined?(RailsPulse::Request)
 
       count = RailsPulse::Request.where("occurred_at < ?", cutoff_time).count
+      request_ids = RailsPulse::Request.where("occurred_at < ?", cutoff_time).pluck(:id)
+
+      # Delete associated operations first to respect foreign key constraints
+      RailsPulse::Operation.where(request_id: request_ids).delete_all
+
       RailsPulse::Request.where("occurred_at < ?", cutoff_time).delete_all
       count
     end
@@ -140,6 +145,9 @@ module RailsPulse
         .limit(records_to_delete)
         .pluck(:id)
 
+      # Delete associated operations first to respect foreign key constraints
+      RailsPulse::Operation.where(request_id: ids_to_delete).delete_all
+
       RailsPulse::Request.where(id: ids_to_delete).delete_all
       records_to_delete
     end

data/lib/rails_pulse/engine.rb

@@ -14,6 +14,17 @@ 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 }
@@ -50,6 +61,20 @@ module RailsPulse
       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.2"
+  VERSION = "0.2.3"
 end