pg_sql_triggers 1.4.0 → 1.5.0

data/app/models/pg_sql_triggers/trigger_registry.rb

@@ -21,7 +21,9 @@ module PgSqlTriggers
   # @example Drop and re-execute triggers
   #   trigger.drop!(reason: "No longer needed", actor: current_user, confirmation: "EXECUTE TRIGGER_DROP")
   #   trigger.re_execute!(reason: "Fix drift", actor: current_user, confirmation: "EXECUTE TRIGGER_RE_EXECUTE")
-  # rubocop:disable Metrics/ClassLength
+  # rubocop:disable Metrics/ClassLength -- core AR model: groups lifecycle operations
+  # (enable!/disable!/drop!/re_execute!), drift helpers, audit hooks, and SQL builders.
+  # Splitting further would fragment tightly-coupled state and audit concerns.
   class TriggerRegistry < PgSqlTriggers::ApplicationRecord
     self.table_name = "pg_sql_triggers_registry"
 
@@ -39,6 +41,16 @@ module PgSqlTriggers
     scope :for_environment, ->(env) { where(environment: [env, nil]) }
     scope :by_source, ->(source) { where(source: source) }
 
+    # Case-insensitive search on trigger name and table name (used by web dashboard).
+    scope :matching_search, lambda { |raw|
+      query = raw.to_s.strip
+      next all if query.blank?
+
+      sanitized = ActiveRecord::Base.sanitize_sql_like(query)
+      term = "%#{sanitized}%"
+      where("trigger_name ILIKE :term OR table_name ILIKE :term", term: term)
+    }
+
     # Returns the current drift state of this trigger.
     #
     # @return [String] One of: "in_sync", "drifted", "manual_override", "disabled", "dropped", "unknown"
@@ -119,32 +131,12 @@ module PgSqlTriggers
         end
       end
 
-      # Update the registry record (always update, even if trigger doesn't exist)
-      begin
-        update!(enabled: true)
-        after_state = capture_state
-        log_audit_success(:trigger_enable, actor, before_state: before_state, after_state: after_state)
-      rescue ActiveRecord::StatementInvalid, StandardError => e
-        # If update! fails, try update_column which bypasses validations and callbacks
-        # and might not use execute in the same way
-        Rails.logger.warn("Could not update registry via update!: #{e.message}") if defined?(Rails.logger)
-        begin
-          # rubocop:disable Rails/SkipsModelValidations
-          update_column(:enabled, true)
-          # rubocop:enable Rails/SkipsModelValidations
-          after_state = capture_state
-          log_audit_success(:trigger_enable, actor, before_state: before_state, after_state: after_state)
-        rescue StandardError => update_error
-          # If update_column also fails, just set the in-memory attribute
-          # The test might reload, but we've done our best
-          # rubocop:disable Layout/LineLength
-          Rails.logger.warn("Could not update registry via update_column: #{update_error.message}") if defined?(Rails.logger)
-          # rubocop:enable Layout/LineLength
-          self.enabled = true
-          after_state = capture_state
-          log_audit_success(:trigger_enable, actor, before_state: before_state, after_state: after_state)
-        end
-      end
+      # Update the registry record (always update, even if trigger doesn't exist).
+      # If persistence fails for any reason, fall back to the in-memory attribute so
+      # callers/observers still see a consistent state for this request.
+      persist_enabled_state(true)
+      after_state = capture_state
+      log_audit_success(:trigger_enable, actor, before_state: before_state, after_state: after_state)
     end
 
     # Disables this trigger in the database and updates the registry.
@@ -191,32 +183,12 @@ module PgSqlTriggers
         end
       end
 
-      # Update the registry record (always update, even if trigger doesn't exist)
-      begin
-        update!(enabled: false)
-        after_state = capture_state
-        log_audit_success(:trigger_disable, actor, before_state: before_state, after_state: after_state)
-      rescue ActiveRecord::StatementInvalid, StandardError => e
-        # If update! fails, try update_column which bypasses validations and callbacks
-        # and might not use execute in the same way
-        Rails.logger.warn("Could not update registry via update!: #{e.message}") if defined?(Rails.logger)
-        begin
-          # rubocop:disable Rails/SkipsModelValidations
-          update_column(:enabled, false)
-          # rubocop:enable Rails/SkipsModelValidations
-          after_state = capture_state
-          log_audit_success(:trigger_disable, actor, before_state: before_state, after_state: after_state)
-        rescue StandardError => update_error
-          # If update_column also fails, just set the in-memory attribute
-          # The test might reload, but we've done our best
-          # rubocop:disable Layout/LineLength
-          Rails.logger.warn("Could not update registry via update_column: #{update_error.message}") if defined?(Rails.logger)
-          # rubocop:enable Layout/LineLength
-          self.enabled = false
-          after_state = capture_state
-          log_audit_success(:trigger_disable, actor, before_state: before_state, after_state: after_state)
-        end
-      end
+      # Update the registry record (always update, even if trigger doesn't exist).
+      # If persistence fails for any reason, fall back to the in-memory attribute so
+      # callers/observers still see a consistent state for this request.
+      persist_enabled_state(false)
+      after_state = capture_state
+      log_audit_success(:trigger_disable, actor, before_state: before_state, after_state: after_state)
     end
 
     # Drops this trigger from the database and removes it from the registry.
@@ -263,8 +235,9 @@ module PgSqlTriggers
     # @param reason [String] Required reason for re-executing the trigger
     # @param confirmation [String, nil] Optional confirmation text for kill switch protection
     # @param actor [Hash, nil] Information about who is performing the action (must have :type and :id keys)
-    # @raise [ArgumentError] If reason is missing or empty, or if function_body is blank
+    # @raise [ArgumentError] If reason is missing or empty
     # @raise [PgSqlTriggers::KillSwitchError] If kill switch blocks the operation
+    # @raise [StandardError] If SQL cannot be generated to recreate the trigger
     # @return [PgSqlTriggers::TriggerRegistry] self
     def re_execute!(reason:, confirmation: nil, actor: nil)
       actor ||= { type: "Console", id: "TriggerRegistry#re_execute!" }
@@ -314,6 +287,12 @@ module PgSqlTriggers
     end
 
     def calculate_checksum
+      deferral = PgSqlTriggers::DeferralChecksum.parts(
+        constraint_trigger: constraint_trigger,
+        deferrable: deferrable,
+        initially: initially
+      )
+      events_segment = PgSqlTriggers::EventsChecksum.segment_from_definition_json(definition)
       Digest::SHA256.hexdigest([
         trigger_name,
         table_name,
@@ -321,7 +300,9 @@ module PgSqlTriggers
         function_body || "",
         condition || "",
         timing || "before",
-        for_each || "row"
+        for_each || "row",
+        events_segment,
+        *deferral
       ].join)
     end
 
@@ -393,8 +374,15 @@ module PgSqlTriggers
     end
 
     def recreate_trigger
-      sql = function_body.presence || build_trigger_sql_from_definition
-      raise StandardError, "Cannot re-execute: missing function_body" if sql.blank?
+      # DSL triggers are recreated from the stored JSON definition (+build_trigger_sql_from_definition+).
+      # Other sources may persist a full trigger SQL payload in +function_body+.
+      sql = if source == "dsl"
+              build_trigger_sql_from_definition
+            else
+              function_body.presence || build_trigger_sql_from_definition
+            end
+
+      raise StandardError, "Cannot re-execute: no SQL could be generated" if sql.blank?
 
       ActiveRecord::Base.connection.execute(sql)
       if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
@@ -416,15 +404,25 @@ module PgSqlTriggers
       fn_name = defn["function_name"]
       return nil if fn_name.blank?
 
-      t_name      = table_name
-      timing_kw   = (defn["timing"] || timing || "BEFORE").upcase
-      events      = Array(defn["events"]).map { |e| e.to_s.upcase }.join(" OR ")
-      events      = "INSERT" if events.blank?
-      cond        = defn["condition"] || condition
+      t_name = table_name
+      constraint = ActiveModel::Type::Boolean.new.cast(defn["constraint_trigger"])
+      timing_kw = if constraint
+                    "AFTER"
+                  else
+                    (defn["timing"] || timing || "before").to_s.upcase
+                  end
+      events_sql = PgSqlTriggers::EventsChecksum.events_sql_fragment(
+        defn,
+        quote_column: ->(col) { quote_identifier(col) }
+      )
+      cond = defn["condition"] || condition
       for_each_kw = (defn["for_each"] || for_each || "row").upcase
 
-      sql = "CREATE TRIGGER #{quote_identifier(trigger_name)} "
-      sql += "#{timing_kw} #{events} ON #{quote_identifier(t_name)} "
+      create_kw = constraint ? "CREATE CONSTRAINT TRIGGER" : "CREATE TRIGGER"
+      sql = "#{create_kw} #{quote_identifier(trigger_name)} "
+      sql += "#{timing_kw} #{events_sql} ON #{quote_identifier(t_name)} "
+      deferral = deferral_sql_fragment(defn)
+      sql += "#{deferral} " if deferral.present?
       sql += "FOR EACH #{for_each_kw} "
       sql += "WHEN (#{cond}) " if cond.present?
       sql += "EXECUTE FUNCTION #{fn_name}();"
@@ -433,6 +431,26 @@ module PgSqlTriggers
       nil
     end
 
+    def deferral_sql_fragment(defn)
+      return "" unless ActiveModel::Type::Boolean.new.cast(defn["constraint_trigger"])
+
+      case defn["deferrable"].to_s
+      when "not_deferrable"
+        "NOT DEFERRABLE"
+      when "deferrable"
+        case defn["initially"].to_s
+        when "deferred"
+          "DEFERRABLE INITIALLY DEFERRED"
+        when "immediate"
+          "DEFERRABLE INITIALLY IMMEDIATE"
+        else
+          "DEFERRABLE"
+        end
+      else
+        ""
+      end
+    end
+
     def update_registry_after_re_execute
       update!(last_executed_at: Time.current)
       if !enabled && ActiveRecord::Base.connection.table_exists?(table_name)
@@ -459,9 +477,7 @@ module PgSqlTriggers
       }
     end
 
-    # rubocop:disable Metrics/ParameterLists
-    def log_audit_success(operation, actor, reason: nil, confirmation_text: nil,
-                          before_state: nil, after_state: nil, diff: nil)
+    def log_audit_success(operation, actor, **options)
       return unless defined?(PgSqlTriggers::AuditLog)
 
       PgSqlTriggers::AuditLog.log_success(
@@ -469,18 +485,13 @@ module PgSqlTriggers
         trigger_name: trigger_name,
         actor: actor,
         environment: Rails.env,
-        reason: reason,
-        confirmation_text: confirmation_text,
-        before_state: before_state,
-        after_state: after_state,
-        diff: diff
+        **options
       )
     rescue StandardError => e
       Rails.logger.error("Failed to log audit entry: #{e.message}") if defined?(Rails.logger)
     end
 
-    def log_audit_failure(operation, actor, error_message, reason: nil,
-                          confirmation_text: nil, before_state: nil)
+    def log_audit_failure(operation, actor, error_message, **options)
       return unless defined?(PgSqlTriggers::AuditLog)
 
       PgSqlTriggers::AuditLog.log_failure(
@@ -489,14 +500,30 @@ module PgSqlTriggers
         actor: actor,
         environment: Rails.env,
         error_message: error_message,
-        reason: reason,
-        confirmation_text: confirmation_text,
-        before_state: before_state
+        **options
       )
     rescue StandardError => e
       Rails.logger.error("Failed to log audit entry: #{e.message}") if defined?(Rails.logger)
     end
-    # rubocop:enable Metrics/ParameterLists
+
+    # Persist the +enabled+ flag: +update!+, then +update_column+ if needed, then in-memory.
+    # Returns true when a DB write succeeded, false when only the in-memory value changed.
+    def persist_enabled_state(value)
+      update!(enabled: value)
+      true
+    rescue ActiveRecord::StatementInvalid, StandardError => e
+      Rails.logger.warn("Could not update registry via update!: #{e.message}") if defined?(Rails.logger)
+      begin
+        # rubocop:disable Rails/SkipsModelValidations -- fallback when update! fails (callbacks/validations/locks)
+        update_column(:enabled, value)
+        # rubocop:enable Rails/SkipsModelValidations
+        true
+      rescue ActiveRecord::StatementInvalid, StandardError => e2
+        Rails.logger.warn("Could not update registry via update_column: #{e2.message}") if defined?(Rails.logger)
+        self.enabled = value
+        false
+      end
+    end
   end
   # rubocop:enable Metrics/ClassLength
 end

data/app/views/pg_sql_triggers/audit_logs/index.html.erb

@@ -4,7 +4,7 @@
     <h1 style="margin: 0;">Audit Log</h1>
     <div style="display: flex; gap: 1rem;">
       <%= link_to "Dashboard", dashboard_path, style: "padding: 0.5rem 1rem; background: #6c757d; color: white; text-decoration: none; border-radius: 4px; display: inline-block;" %>
-      <% csv_params = params.permit(:trigger_name, :operation, :status, :environment, :actor_id).to_h %>
+      <% csv_params = params.permit(:trigger_name, :operation, :status, :environment, :actor_id, :q).to_h %>
       <%= link_to "Export CSV", audit_logs_path(csv_params.merge(format: :csv)), style: "padding: 0.5rem 1rem; background: #28a745; color: white; text-decoration: none; border-radius: 4px; display: inline-block;" %>
     </div>
   </div>
@@ -13,6 +13,10 @@
   <div style="background: white; padding: 1.5rem; border-radius: 4px; box-shadow: 0 1px 3px rgba(0,0,0,0.1); margin-bottom: 2rem;">
     <h3 style="margin-top: 0; margin-bottom: 1rem;">Filters</h3>
     <%= form_with url: audit_logs_path, method: :get, local: true, style: "display: grid; grid-template-columns: repeat(auto-fit, minmax(200px, 1fr)); gap: 1rem;" do |f| %>
+      <div style="grid-column: 1 / -1;">
+        <%= label_tag :q, "Search", style: "display: block; margin-bottom: 0.5rem; font-weight: 600;" %>
+        <%= text_field_tag :q, params[:q], placeholder: "Trigger, operation, reason, error…", style: "width: 100%; padding: 0.5rem; border: 1px solid #ced4da; border-radius: 4px;" %>
+      </div>
       <div>
         <%= f.label :trigger_name, "Trigger Name", style: "display: block; margin-bottom: 0.5rem; font-weight: 600;" %>
         <%= f.select :trigger_name, options_for_select([["All", ""]] + @available_trigger_names.map { |n| [n, n] }, params[:trigger_name]), {}, { style: "width: 100%; padding: 0.5rem; border: 1px solid #ced4da; border-radius: 4px;" } %>
@@ -48,7 +52,7 @@
   <!-- Results Summary -->
   <div style="background: #f8f9fa; padding: 1rem; border-radius: 4px; margin-bottom: 1rem;">
     <strong>Total Results:</strong> <%= @total_count %> entries
-    <% if params[:trigger_name].present? || params[:operation].present? || params[:status].present? || params[:environment].present? %>
+    <% if params[:trigger_name].present? || params[:operation].present? || params[:status].present? || params[:environment].present? || params[:q].present? %>
       <span style="color: #6c757d;">(filtered)</span>
     <% end %>
   </div>
@@ -144,7 +148,7 @@
     <% if @total_pages > 1 %>
       <div style="display: flex; justify-content: center; align-items: center; gap: 1rem; margin-top: 2rem;">
         <% if @page > 1 %>
-          <% prev_params = params.except(:page).permit(:trigger_name, :operation, :status, :environment, :sort, :per_page).to_h %>
+          <% prev_params = params.except(:page).permit(:trigger_name, :operation, :status, :environment, :sort, :per_page, :q).to_h %>
           <%= link_to "« Previous", audit_logs_path(prev_params.merge(page: @page - 1)), style: "padding: 0.5rem 1rem; background: #007bff; color: white; text-decoration: none; border-radius: 4px;" %>
         <% else %>
           <span style="padding: 0.5rem 1rem; background: #e9ecef; color: #6c757d; border-radius: 4px; cursor: not-allowed;">« Previous</span>
@@ -155,7 +159,7 @@
         </span>
 
         <% if @page < @total_pages %>
-          <% next_params = params.except(:page).permit(:trigger_name, :operation, :status, :environment, :sort, :per_page).to_h %>
+          <% next_params = params.except(:page).permit(:trigger_name, :operation, :status, :environment, :sort, :per_page, :q).to_h %>
           <%= link_to "Next »", audit_logs_path(next_params.merge(page: @page + 1)), style: "padding: 0.5rem 1rem; background: #007bff; color: white; text-decoration: none; border-radius: 4px;" %>
         <% else %>
           <span style="padding: 0.5rem 1rem; background: #e9ecef; color: #6c757d; border-radius: 4px; cursor: not-allowed;">Next »</span>
@@ -166,7 +170,7 @@
     <div style="background: white; padding: 3rem; border-radius: 4px; box-shadow: 0 1px 3px rgba(0,0,0,0.1); text-align: center;">
       <h3 style="margin-top: 0; color: #6c757d;">No audit log entries found</h3>
       <p style="color: #6c757d;">
-        <% if params[:trigger_name].present? || params[:operation].present? || params[:status].present? || params[:environment].present? %>
+        <% if params[:trigger_name].present? || params[:operation].present? || params[:status].present? || params[:environment].present? || params[:q].present? %>
           Try adjusting your filters or <%= link_to "clear filters", audit_logs_path, style: "color: #007bff;" %>.
         <% else %>
           Audit log entries will appear here as operations are performed.

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

@@ -27,8 +27,67 @@
   </div>
 </div>
 
-<% if @triggers.any? %>
-  <h3>Recent Triggers</h3>
+<% if @stats[:total].positive? %>
+  <div style="background: white; padding: 1rem 1.5rem; border-radius: 4px; box-shadow: 0 1px 3px rgba(0,0,0,0.1); margin-bottom: 2rem;">
+    <h3 style="margin-top: 0; margin-bottom: 1rem;">Search &amp; filters</h3>
+    <%= form_with url: dashboard_path, method: :get, local: true, style: "display: grid; grid-template-columns: repeat(auto-fit, minmax(180px, 1fr)); gap: 1rem; align-items: end;" do %>
+      <%= hidden_field_tag :page, params[:page] if params[:page].present? %>
+      <%= hidden_field_tag :per_page, params[:per_page] if params[:per_page].present? %>
+      <%= hidden_field_tag :trigger_page, 1 %>
+      <%= hidden_field_tag :trigger_per_page, @trigger_per_page %>
+      <div>
+        <label style="display: block; margin-bottom: 0.35rem; font-weight: 600; font-size: 0.875rem; color: #495057;">Search</label>
+        <%= text_field_tag :q, @filter_query, placeholder: "Trigger or table name…", style: "width: 100%; padding: 0.5rem; border: 1px solid #ced4da; border-radius: 4px;" %>
+      </div>
+      <div>
+        <label style="display: block; margin-bottom: 0.35rem; font-weight: 600; font-size: 0.875rem; color: #495057;">Table</label>
+        <%= select_tag :table, options_for_select([["All tables", ""]] + @filter_table_names.map { |t| [t, t] }, @filter_table), style: "width: 100%; padding: 0.5rem; border: 1px solid #ced4da; border-radius: 4px;" %>
+      </div>
+      <div>
+        <label style="display: block; margin-bottom: 0.35rem; font-weight: 600; font-size: 0.875rem; color: #495057;">Drift state</label>
+        <%= select_tag :state, options_for_select([
+          ["Any state", ""],
+          ["In sync", "in_sync"],
+          ["Drifted", "drifted"],
+          ["Disabled", "disabled"],
+          ["Dropped", "dropped"],
+          ["Unknown (external)", "unknown"],
+          ["Manual override", "manual_override"]
+        ], @filter_state), style: "width: 100%; padding: 0.5rem; border: 1px solid #ced4da; border-radius: 4px;" %>
+      </div>
+      <div>
+        <label style="display: block; margin-bottom: 0.35rem; font-weight: 600; font-size: 0.875rem; color: #495057;">Source</label>
+        <%= select_tag :source, options_for_select([
+          ["Any source", ""],
+          ["DSL", "dsl"],
+          ["Generated", "generated"],
+          ["Manual SQL", "manual_sql"]
+        ], @filter_source), style: "width: 100%; padding: 0.5rem; border: 1px solid #ced4da; border-radius: 4px;" %>
+      </div>
+      <div style="display: flex; gap: 0.5rem; flex-wrap: wrap;">
+        <%= submit_tag "Apply", style: "padding: 0.5rem 1rem; background: #007bff; color: white; border: none; border-radius: 4px; cursor: pointer; font-weight: 600;" %>
+        <%= link_to "Clear", dashboard_path(page: @page, per_page: @per_page), style: "padding: 0.5rem 1rem; background: #6c757d; color: white; text-decoration: none; border-radius: 4px; display: inline-block; line-height: 1.25;" %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<% if @stats[:total].zero? %>
+  <div style="background: #e7f3ff; border-left: 4px solid #007bff; padding: 1.5rem; border-radius: 4px; margin-bottom: 2rem;">
+    <h3 style="margin-top: 0;">No triggers yet</h3>
+    <p style="margin-bottom: 1rem;">Get started by generating your first trigger using the form-based wizard.</p>
+    <%= link_to "View Tables", tables_path, class: "btn btn-primary" %>
+  </div>
+<% elsif @trigger_list_total.zero? %>
+  <div style="background: #fff3cd; border-left: 4px solid #ffc107; padding: 1.5rem; border-radius: 4px; margin-bottom: 2rem;">
+    <h3 style="margin-top: 0;">No triggers match your filters</h3>
+    <p style="margin-bottom: 0;">Try adjusting search or filters, or <%= link_to "clear filters", dashboard_path(page: @page, per_page: @per_page), style: "color: #007bff;" %>.</p>
+  </div>
+<% else %>
+  <h3>Triggers</h3>
+  <div style="margin-bottom: 1rem; color: #6c757d; font-size: 0.875rem;">
+    Showing <%= (@trigger_page - 1) * @trigger_per_page + 1 %>–<%= [@trigger_page * @trigger_per_page, @trigger_list_total].min %> of <%= @trigger_list_total %> trigger<%= @trigger_list_total == 1 ? "" : "s" %>
+  </div>
   <table>
     <thead>
       <tr>
@@ -42,7 +101,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @triggers.limit(10).each do |trigger| %>
+      <% @triggers.each do |trigger| %>
         <tr>
           <td>
             <%= link_to trigger.trigger_name, trigger_path(trigger), style: "color: #007bff; text-decoration: none; font-weight: 600;" %>
@@ -72,7 +131,7 @@
                 <% if trigger.enabled %>
                   <% form_id = "trigger-disable-#{trigger.id}-form" %>
                   <%= form_with url: disable_trigger_path(trigger), method: :post, local: false, id: form_id, style: "margin: 0;" do |f| %>
-                    <%= f.hidden_field :redirect_to, value: dashboard_path %>
+                    <%= f.hidden_field :redirect_to, value: request.fullpath %>
                     <button type="button" onclick="showKillSwitchModal('<%= form_id %>')"
                         style="padding: 0.25rem 0.75rem; background: #dc3545; color: white; border: none; border-radius: 3px; cursor: pointer; font-size: 0.75rem;">
                       Disable
@@ -86,7 +145,7 @@
                 <% else %>
                   <% form_id = "trigger-enable-#{trigger.id}-form" %>
                   <%= form_with url: enable_trigger_path(trigger), method: :post, local: false, id: form_id, style: "margin: 0;" do |f| %>
-                    <%= f.hidden_field :redirect_to, value: dashboard_path %>
+                    <%= f.hidden_field :redirect_to, value: request.fullpath %>
                     <button type="button" onclick="showKillSwitchModal('<%= form_id %>')"
                         style="padding: 0.25rem 0.75rem; background: #28a745; color: white; border: none; border-radius: 3px; cursor: pointer; font-size: 0.75rem;">
                       Enable
@@ -104,13 +163,13 @@
                 <% begin %>
                   <% drift_info = trigger.drift_result %>
                   <% if drift_info && drift_info[:state] == 'drifted' %>
-                    <%= render 'pg_sql_triggers/triggers/re_execute_modal', trigger: trigger, drift_info: drift_info, redirect_to: dashboard_path, button_size: :small %>
+                    <%= render 'pg_sql_triggers/triggers/re_execute_modal', trigger: trigger, drift_info: drift_info, redirect_to: request.fullpath, button_size: :small %>
                   <% end %>
                 <% rescue StandardError %>
                   <%# Skip if drift detection fails %>
                 <% end %>
 
-                <%= render 'pg_sql_triggers/triggers/drop_modal', trigger: trigger, redirect_to: dashboard_path, button_size: :small %>
+                <%= render 'pg_sql_triggers/triggers/drop_modal', trigger: trigger, redirect_to: request.fullpath, button_size: :small %>
               <% end %>
 
               <% unless PgSqlTriggers::Permissions.can?(current_actor, :enable_trigger) || PgSqlTriggers::Permissions.can?(current_actor, :drop_trigger) %>
@@ -122,11 +181,35 @@
       <% end %>
     </tbody>
   </table>
-<% else %>
-  <div style="background: #e7f3ff; border-left: 4px solid #007bff; padding: 1.5rem; border-radius: 4px;">
-    <h3 style="margin-top: 0;">No triggers yet</h3>
-    <p style="margin-bottom: 1rem;">Get started by generating your first trigger using the form-based wizard.</p>
-    <%= link_to "View Tables", tables_path, class: "btn btn-primary" %>
+
+  <div style="display: flex; justify-content: space-between; align-items: center; margin-top: 1rem; padding-top: 1rem; border-top: 1px solid #dee2e6; flex-wrap: wrap; gap: 0.75rem;">
+    <div>
+      <% if @trigger_total_pages > 1 %>
+        <% if @trigger_page > 1 %>
+          <%= link_to "← Previous", dashboard_path(dashboard_list_params(trigger_page: @trigger_page - 1)),
+              style: "padding: 0.5rem 1rem; background: #007bff; color: white; text-decoration: none; border-radius: 4px; margin-right: 0.5rem;" %>
+        <% end %>
+        <% if @trigger_page < @trigger_total_pages %>
+          <%= link_to "Next →", dashboard_path(dashboard_list_params(trigger_page: @trigger_page + 1)),
+              style: "padding: 0.5rem 1rem; background: #007bff; color: white; text-decoration: none; border-radius: 4px;" %>
+        <% end %>
+      <% end %>
+    </div>
+    <% if @trigger_total_pages > 1 %>
+      <div style="color: #6c757d; font-size: 0.875rem;">
+        Page <%= @trigger_page %> of <%= @trigger_total_pages %>
+      </div>
+    <% end %>
+    <%= form_with url: dashboard_path, method: :get, local: true, style: "display: flex; align-items: center; gap: 0.5rem; margin: 0;" do %>
+      <% dashboard_list_params.except(:trigger_page, :trigger_per_page).each do |key, value| %>
+        <%= hidden_field_tag key, value %>
+      <% end %>
+      <%= hidden_field_tag :trigger_page, 1 %>
+      <label style="color: #6c757d; font-size: 0.875rem;">Per page:</label>
+      <%= select_tag :trigger_per_page, options_for_select([10, 20, 50, 100], @trigger_per_page),
+          onchange: "this.form.submit()",
+          style: "padding: 0.25rem 0.5rem; border: 1px solid #ced4da; border-radius: 4px;" %>
+    <% end %>
   </div>
 <% end %>
 
@@ -290,30 +373,30 @@
 
       <!-- Pagination Controls -->
       <% if @total_pages > 1 %>
-        <div style="display: flex; justify-content: space-between; align-items: center; margin-top: 1rem; padding-top: 1rem; border-top: 1px solid #dee2e6;">
+        <div style="display: flex; justify-content: space-between; align-items: center; margin-top: 1rem; padding-top: 1rem; border-top: 1px solid #dee2e6; flex-wrap: wrap; gap: 0.75rem;">
           <div>
             <% if @page > 1 %>
-              <%= link_to "← Previous", dashboard_path(page: @page - 1, per_page: @per_page),
+              <%= link_to "← Previous", dashboard_path(dashboard_list_params(page: @page - 1, per_page: @per_page)),
                   style: "padding: 0.5rem 1rem; background: #007bff; color: white; text-decoration: none; border-radius: 4px; margin-right: 0.5rem;" %>
             <% end %>
             <% if @page < @total_pages %>
-              <%= link_to "Next →", dashboard_path(page: @page + 1, per_page: @per_page),
+              <%= link_to "Next →", dashboard_path(dashboard_list_params(page: @page + 1, per_page: @per_page)),
                   style: "padding: 0.5rem 1rem; background: #007bff; color: white; text-decoration: none; border-radius: 4px;" %>
             <% end %>
           </div>
           <div style="color: #6c757d; font-size: 0.875rem;">
             Page <%= @page %> of <%= @total_pages %>
           </div>
-          <div style="display: flex; align-items: center; gap: 0.5rem;">
+          <%= form_with url: dashboard_path, method: :get, local: true, style: "display: flex; align-items: center; gap: 0.5rem; margin: 0;" do %>
+            <% dashboard_list_params.except(:page, :per_page).each do |key, value| %>
+              <%= hidden_field_tag key, value %>
+            <% end %>
+            <%= hidden_field_tag :page, 1 %>
             <label style="color: #6c757d; font-size: 0.875rem;">Per page:</label>
-            <select onchange="window.location.href='<%= dashboard_path %>?page=1&per_page=' + this.value"
-                    style="padding: 0.25rem 0.5rem; border: 1px solid #ced4da; border-radius: 4px;">
-              <option value="10" <%= 'selected' if @per_page == 10 %>>10</option>
-              <option value="20" <%= 'selected' if @per_page == 20 %>>20</option>
-              <option value="50" <%= 'selected' if @per_page == 50 %>>50</option>
-              <option value="100" <%= 'selected' if @per_page == 100 %>>100</option>
-            </select>
-          </div>
+            <%= select_tag :per_page, options_for_select([10, 20, 50, 100], @per_page),
+                onchange: "this.form.submit()",
+                style: "padding: 0.25rem 0.5rem; border: 1px solid #ced4da; border-radius: 4px;" %>
+          <% end %>
         </div>
       <% end %>
     <% else %>

data/app/views/pg_sql_triggers/tables/index.html.erb

@@ -20,14 +20,27 @@
 
 <!-- Filter Controls -->
 <div style="background: white; padding: 1rem 1.5rem; border-radius: 4px; box-shadow: 0 1px 3px rgba(0,0,0,0.1); margin-bottom: 2rem;">
+  <%= form_with url: tables_path, method: :get, local: true, style: "margin-bottom: 1rem;" do %>
+    <%= hidden_field_tag :filter, @filter %>
+    <%= hidden_field_tag :page, 1 %>
+    <%= hidden_field_tag :per_page, @per_page %>
+    <div style="display: flex; align-items: center; gap: 0.75rem; flex-wrap: wrap;">
+      <label style="color: #495057; font-weight: 600; font-size: 0.875rem;">Search tables:</label>
+      <%= text_field_tag :q, @search_query, placeholder: "Table name…", style: "flex: 1; min-width: 200px; padding: 0.5rem; border: 1px solid #ced4da; border-radius: 4px;" %>
+      <%= submit_tag "Search", style: "padding: 0.5rem 1rem; background: #007bff; color: white; border: none; border-radius: 4px; cursor: pointer; font-weight: 600;" %>
+      <% if @search_query.present? %>
+        <%= link_to "Clear search", tables_path(filter: @filter, page: 1, per_page: @per_page), style: "padding: 0.5rem 1rem; background: #6c757d; color: white; text-decoration: none; border-radius: 4px;" %>
+      <% end %>
+    </div>
+  <% end %>
   <div style="display: flex; align-items: center; gap: 1.5rem; flex-wrap: wrap;">
     <label style="color: #495057; font-weight: 600; font-size: 0.875rem;">Filter:</label>
     <div style="display: flex; gap: 1rem; flex-wrap: wrap;">
-      <%= link_to "All Tables", tables_path(filter: 'all', page: 1, per_page: @per_page),
+      <%= link_to "All Tables", tables_path(filter: 'all', page: 1, per_page: @per_page, q: @search_query),
           style: "padding: 0.5rem 1rem; background: #{@filter == 'all' ? '#007bff' : '#f8f9fa'}; color: #{@filter == 'all' ? 'white' : '#495057'}; text-decoration: none; border-radius: 4px; border: 1px solid #{@filter == 'all' ? '#007bff' : '#dee2e6'}; font-size: 0.875rem; font-weight: #{@filter == 'all' ? '600' : '400'};" %>
-      <%= link_to "With Triggers", tables_path(filter: 'with_triggers', page: 1, per_page: @per_page),
+      <%= link_to "With Triggers", tables_path(filter: 'with_triggers', page: 1, per_page: @per_page, q: @search_query),
           style: "padding: 0.5rem 1rem; background: #{@filter == 'with_triggers' ? '#28a745' : '#f8f9fa'}; color: #{@filter == 'with_triggers' ? 'white' : '#495057'}; text-decoration: none; border-radius: 4px; border: 1px solid #{@filter == 'with_triggers' ? '#28a745' : '#dee2e6'}; font-size: 0.875rem; font-weight: #{@filter == 'with_triggers' ? '600' : '400'};" %>
-      <%= link_to "Without Triggers", tables_path(filter: 'without_triggers', page: 1, per_page: @per_page),
+      <%= link_to "Without Triggers", tables_path(filter: 'without_triggers', page: 1, per_page: @per_page, q: @search_query),
           style: "padding: 0.5rem 1rem; background: #{@filter == 'without_triggers' ? '#6c757d' : '#f8f9fa'}; color: #{@filter == 'without_triggers' ? 'white' : '#495057'}; text-decoration: none; border-radius: 4px; border: 1px solid #{@filter == 'without_triggers' ? '#6c757d' : '#dee2e6'}; font-size: 0.875rem; font-weight: #{@filter == 'without_triggers' ? '600' : '400'};" %>
     </div>
   </div>
@@ -123,27 +136,26 @@
       <div style="display: flex; justify-content: space-between; align-items: center; margin-top: 1rem; padding: 1rem; border-top: 1px solid #dee2e6;">
         <div>
           <% if @page > 1 %>
-            <%= link_to "← Previous", tables_path(filter: @filter, page: @page - 1, per_page: @per_page),
+            <%= link_to "← Previous", tables_path(filter: @filter, page: @page - 1, per_page: @per_page, q: @search_query),
                 style: "padding: 0.5rem 1rem; background: #007bff; color: white; text-decoration: none; border-radius: 4px; margin-right: 0.5rem;" %>
           <% end %>
           <% if @page < @total_pages %>
-            <%= link_to "Next →", tables_path(filter: @filter, page: @page + 1, per_page: @per_page),
+            <%= link_to "Next →", tables_path(filter: @filter, page: @page + 1, per_page: @per_page, q: @search_query),
                 style: "padding: 0.5rem 1rem; background: #007bff; color: white; text-decoration: none; border-radius: 4px;" %>
           <% end %>
         </div>
         <div style="color: #6c757d; font-size: 0.875rem;">
           Page <%= @page %> of <%= @total_pages %>
         </div>
-        <div style="display: flex; align-items: center; gap: 0.5rem;">
+        <%= form_with url: tables_path, method: :get, local: true, style: "display: flex; align-items: center; gap: 0.5rem; margin: 0;" do %>
+          <%= hidden_field_tag :filter, @filter %>
+          <%= hidden_field_tag :page, 1 %>
+          <%= hidden_field_tag :q, @search_query if @search_query.present? %>
           <label style="color: #6c757d; font-size: 0.875rem;">Per page:</label>
-          <select onchange="window.location.href='<%= tables_path %>?filter=<%= @filter %>&page=1&per_page=' + this.value"
-                  style="padding: 0.25rem 0.5rem; border: 1px solid #ced4da; border-radius: 4px;">
-            <option value="10" <%= 'selected' if @per_page == 10 %>>10</option>
-            <option value="20" <%= 'selected' if @per_page == 20 %>>20</option>
-            <option value="50" <%= 'selected' if @per_page == 50 %>>50</option>
-            <option value="100" <%= 'selected' if @per_page == 100 %>>100</option>
-          </select>
-        </div>
+          <%= select_tag :per_page, options_for_select([10, 20, 50, 100], @per_page),
+              onchange: "this.form.submit()",
+              style: "padding: 0.25rem 0.5rem; border: 1px solid #ced4da; border-radius: 4px;" %>
+        <% end %>
       </div>
     <% end %>
   </div>