Moved quick filters into saved searches

And removed all quick filter code

Author: dutow

app/controllers/topics_controller.rb

@@ -1,11 +1,10 @@
 class TopicsController < ApplicationController
   before_action :set_topic, only: [ :show, :aware, :read_all, :star, :unstar, :latest_patchset ]
   before_action :require_authentication, only: [ :aware, :aware_bulk, :aware_all, :read_all, :star, :unstar ]
-  before_action :require_team_membership, only: [ :index, :new_topics_count ]
 
   def index
     @search_query = nil
-    base_query = apply_filters(Topic.includes(:creator, creator_person: :default_alias, last_sender_person: :default_alias))
+    base_query = Topic.includes(:creator, creator_person: :default_alias, last_sender_person: :default_alias)
 
     apply_cursor_pagination(base_query)
     preload_topic_participants
@@ -696,161 +695,8 @@ def preload_team_reader_states(topic_ids, last_ids)
     result
   end
 
-  def apply_filters(base_query)
-    filter = params[:filter].to_s
-    team_id = params[:team_id].presence&.to_i
-    current_user_id = current_user&.id
-    tag_filter = params[:note_tag].to_s.strip.downcase
-
-    if tag_filter.present? && user_signed_in?
-      visible_notes = Note.active.visible_to(current_user)
-      tagged_notes = visible_notes.joins(:note_tags).where(note_tags: { tag: tag_filter })
-      note_topics = tagged_notes.select(:topic_id).distinct
-
-      base_query = base_query.joins("INNER JOIN (#{note_topics.to_sql}) tagged_notes ON tagged_notes.topic_id = topics.id")
-      @active_note_tag = tag_filter
-    end
-
-    case filter
-    when "no_contrib_replies"
-      base_query = base_query.joins(:messages)
-                             .left_joins(messages: { sender: { person: :contributor_memberships } })
-                             .group("topics.id")
-                             .having("COUNT(DISTINCT contributor_memberships.person_id) = 0")
-    when "patch_no_replies"
-      base_query = base_query.joins(messages: :attachments)
-                             .group("topics.id")
-                             .having("COUNT(messages.id) = 1")
-                             .where("attachments.file_name ILIKE ? OR attachments.file_name ILIKE ?", "%.patch", "%.diff")
-    when "reading_incomplete"
-      if current_user_id
-        base_query = base_query.joins(:messages)
-                               .joins("LEFT JOIN message_read_ranges mrr ON mrr.topic_id = topics.id AND mrr.user_id = #{current_user_id}")
-                               .group("topics.id")
-                               .having("COALESCE(MAX(mrr.range_end_message_id), 0) > 0")
-                               .having("COALESCE(MAX(mrr.range_end_message_id), 0) < MAX(messages.id)")
-      end
-    when "new_for_me"
-      if current_user_id
-        aware_before = current_user&.aware_before || Time.at(0)
-        base_query = base_query.joins(:messages)
-                               .joins("LEFT JOIN message_read_ranges mrr ON mrr.topic_id = topics.id AND mrr.user_id = #{current_user_id}")
-                               .group("topics.id")
-                               .having("MAX(messages.created_at) > ?", aware_before)
-                               .having("COALESCE(MAX(mrr.range_end_message_id), 0) < MAX(messages.id)")
-      end
-    when "team_unread"
-      if team_id && current_user_id
-        member_ids = TeamMember.where(team_id: team_id).select(:user_id)
-        base_query = base_query.joins(:messages)
-                               .where.not(id: MessageReadRange.where(user_id: member_ids).select(:topic_id))
-                               .group("topics.id")
-      end
-    when "team_reading_others"
-      if team_id && current_user_id
-        teammate_ids = TeamMember.where(team_id: team_id).where.not(user_id: current_user_id).select(:user_id)
-        base_query = base_query.joins(:messages)
-                               .joins("LEFT JOIN message_read_ranges mrr_self ON mrr_self.topic_id = topics.id AND mrr_self.user_id = #{current_user_id}")
-                               .joins("INNER JOIN message_read_ranges mrr_team ON mrr_team.topic_id = topics.id AND mrr_team.user_id IN (#{teammate_ids.to_sql})")
-                               .group("topics.id")
-                               .having("COALESCE(MAX(mrr_self.range_end_message_id), 0) < MAX(messages.id)")
-      end
-    when "team_reading_any"
-      if team_id && current_user_id
-        member_ids = TeamMember.where(team_id: team_id).select(:user_id)
-        base_query = base_query.joins(:messages)
-                               .joins("INNER JOIN message_read_ranges mrr_team ON mrr_team.topic_id = topics.id AND mrr_team.user_id IN (#{member_ids.to_sql})")
-                               .group("topics.id")
-      end
-    when "started_by_me"
-      if current_user_id
-        base_query = base_query.where(creator_person_id: current_user.person_id)
-      end
-    when "messaged_by_me"
-      if current_user_id
-        base_query = base_query.joins(:messages).where(messages: { sender_person_id: current_user.person_id }).distinct
-      end
-    when "team_started"
-      if team_id
-        member_person_ids = User.joins(:team_members).where(team_members: { team_id: team_id }).select(:person_id)
-        base_query = base_query.where(creator_person_id: member_person_ids)
-      end
-    when "team_messaged"
-      if team_id
-        member_person_ids = User.joins(:team_members).where(team_members: { team_id: team_id }).select(:person_id)
-        base_query = base_query.where(id: Message.where(sender_person_id: member_person_ids).select(:topic_id))
-      end
-    when "starred_by_me"
-      if current_user_id
-        base_query = base_query.joins(:topic_stars)
-                               .where(topic_stars: { user_id: current_user_id })
-      end
-    when "starred_by_team"
-      if team_id && current_user_id
-        member_ids = TeamMember.where(team_id: team_id).select(:user_id)
-        base_query = base_query.joins(:topic_stars)
-                               .where(topic_stars: { user_id: member_ids })
-                               .distinct
-      end
-    end
-    base_query
-  end
-
-  def apply_state_filters
-    filter = params[:filter].to_s
-    return if filter.blank?
-    return unless @topic_states
-    team_id = params[:team_id].presence&.to_i
-
-    case filter
-    when "reading_incomplete"
-      @topics = @topics.select { |t| @topic_states.dig(t.id, :status) == :reading }
-    when "new_for_me"
-      aware_before = current_user.aware_before
-      @topics = @topics.select do |t|
-        state = @topic_states[t.id] || {}
-        last_time = state[:last_time]
-        last_id = state[:last_id]
-        aware_until = state[:aware_until]
-        status = state[:status]
-
-        newer_than_global = aware_before.nil? || (last_time && last_time > aware_before)
-        missing_latest = last_id && (!aware_until || aware_until < last_id)
-        not_read = status != :read
-
-        newer_than_global && missing_latest && not_read
-      end
-    when "team_unread"
-      @topics = @topics.select do |t|
-        team_readers = filter_team_readers(t, team_id: team_id)
-        team_readers.empty?
-      end
-    when "team_reading_others"
-      @topics = @topics.select do |t|
-        state = @topic_states[t.id] || {}
-        my_status = state[:status]
-        team_readers = filter_team_readers(t, team_id: team_id)
-        team_readers.any? && my_status != :read && my_status != :reading
-      end
-    when "team_reading_any"
-      @topics = @topics.select do |t|
-        team_readers = filter_team_readers(t, team_id: team_id)
-        team_readers.any?
-      end
-    end
-
-    topic_ids = @topics.map(&:id)
-    @topic_states.slice!(*topic_ids) if topic_ids.any?
-  end
-
-  def filter_team_readers(topic, team_id:)
-    readers = @topic_states.dig(topic.id, :team_readers) || []
-    return readers unless team_id
-    readers.select { |r| r[:team_id] == team_id }
-  end
-
   def topics_base_query(search_query: nil)
-    return apply_filters(Topic.includes(:creator, creator_person: :default_alias, last_sender_person: :default_alias)) if search_query.nil?
+    return Topic.includes(:creator, creator_person: :default_alias, last_sender_person: :default_alias) if search_query.nil?
 
     cleaned_query = search_query.to_s.strip
     return Topic.none if cleaned_query.blank?
@@ -1030,8 +876,6 @@ def hydrate_topics_from_entries(entries)
 
   def topics_page_cache_key
     return nil unless @topics&.first
-    return nil if params[:filter].present? || params[:team_id].present?
-    return nil if params[:note_tag].present?
 
     latest_topic = @topics.first
     watermark = "#{latest_topic.last_activity.to_i}_#{latest_topic.id}"
@@ -1041,8 +885,6 @@ def topics_page_cache_key
   def topics_turbo_stream_cache_key
     [
       "topics-index-turbo",
-      params[:filter],
-      params[:team_id],
       params[:cursor].presence || "root",
       topic_link_pref_cache_key
     ]
@@ -1053,8 +895,6 @@ def topics_turbo_stream_cache_read
   end
 
   def topics_turbo_stream_cache_fetch
-    return yield if params[:filter].present? || params[:team_id].present? || params[:note_tag].present?
-
     Rails.cache.fetch(topics_turbo_stream_cache_key, expires_in: 10.minutes) { yield }
   end
 
@@ -1064,17 +904,4 @@ def topic_link_pref_cache_key
     current_user.open_threads_at_first_unread? ? "first-unread" : "top"
   end
 
-  def require_team_membership
-    team_id = params[:team_id].presence&.to_i
-    return unless team_id
-
-    unless user_signed_in?
-      redirect_to new_session_path, alert: "Please sign in"
-      return
-    end
-
-    team = Team.find_by(id: team_id)
-    render_404 and return unless team
-    render_404 unless team.member?(current_user)
-  end
 end

app/helpers/topics_helper.rb

@@ -234,22 +234,4 @@ def topic_title_link(topic)
       topic_path(topic)
     end
   end
-
-  def topic_filter_labels
-    {
-      "no_contrib_replies"   => "No contributor/committer replies",
-      "patch_no_replies"     => "Patch, no replies",
-      "reading_incomplete"   => "Reading in progress",
-      "new_for_me"           => "New for me",
-      "started_by_me"        => "Started by me",
-      "messaged_by_me"       => "I posted here",
-      "starred_by_me"        => "Starred by me",
-      "starred_by_team"      => "Starred by team",
-      "team_unread"          => "Not yet read by team",
-      "team_reading_others"  => "Teammates reading",
-      "team_reading_any"     => "Team reading",
-      "team_started"         => "Started by team",
-      "team_messaged"        => "Team messages"
-    }
-  end
 end

app/views/layouts/application.html.slim

@@ -41,7 +41,7 @@ html data-theme="light"
     - if user_signed_in? && current_user.username.blank?
       .global-warning
         span Please set a username in Settings.
-    - starred_active = controller_name == "topics" && action_name == "index" && params[:filter].to_s == "starred_by_me"
+    - starred_active = controller_name == "topics" && action_name == "search" && params[:q].to_s == "starred:me"
     nav.main-navigation
       .nav-container
         .nav-brand
@@ -61,7 +61,7 @@ html data-theme="light"
                 - icon_class = starred_active ? "fa-solid fa-star" : "fa-regular fa-star"
                 - link_classes = ["nav-link"]
                 - link_classes << "is-active" if starred_active
-                = link_to topics_path(filter: "starred_by_me"), class: link_classes.join(" "), title: "Starred by me", aria: { label: "Starred by me" } do
+                = link_to search_topics_path(q: "starred:me"), class: link_classes.join(" "), title: "Starred by me", aria: { label: "Starred by me" } do
                   i class=icon_class aria-hidden="true"
                   span.sr-only Starred
               = link_to "Search", topics_path(anchor: "search"), class: "nav-link"
@@ -81,7 +81,7 @@ html data-theme="light"
           span.tagline PostgreSQL Hackers Archive
         - if user_signed_in?
           - unread = activity_unread_count
-          - starred_href = starred_active ? topics_path : topics_path(filter: "starred_by_me")
+          - starred_href = starred_active ? topics_path : search_topics_path(q: "starred:me")
           - starred_title = starred_active ? "All topics" : "Starred by me"
           = link_to starred_href, class: "nav-link nav-mobile-star#{' is-active' if starred_active}", title: starred_title, aria: { label: starred_title } do
             i class=(starred_active ? "fa-solid fa-star" : "fa-regular fa-star") aria-hidden="true"

app/views/topics/_sidebar.html.slim

@@ -60,42 +60,9 @@
                     - all_team.each do |ss|
                       li = link_to ss.name, search_topics_path(q: ss.resolve_query(team: team)), class: ("quick-filter-link is-active" if active_search == ss.resolve_query(team: team))
 
-    .sidebar-section
-      h3.sidebar-heading Quick filters
-      .sidebar-content
-        - active_filter = params[:filter]
-        - active_team_id = params[:team_id]&.to_i
-
-        .filter-subsection
-          span.filter-subsection-label Status
-          ul.quick-filters
-            li = link_to "No contributor/committer replies", topics_path(filter: "no_contrib_replies"), class: ("quick-filter-link is-active" if active_filter == "no_contrib_replies")
-            li = link_to "Patch, no replies", topics_path(filter: "patch_no_replies"), class: ("quick-filter-link is-active" if active_filter == "patch_no_replies")
-
-        - if user_signed_in?
-          .filter-subsection
-            span.filter-subsection-label My activity
-            ul.quick-filters
-              li = link_to "Reading in progress", topics_path(filter: "reading_incomplete"), class: ("quick-filter-link is-active" if active_filter == "reading_incomplete")
-              li = link_to "New for me", topics_path(filter: "new_for_me"), class: ("quick-filter-link is-active" if active_filter == "new_for_me")
-              li = link_to "Started by me", topics_path(filter: "started_by_me"), class: ("quick-filter-link is-active" if active_filter == "started_by_me")
-              li = link_to "I posted here", topics_path(filter: "messaged_by_me"), class: ("quick-filter-link is-active" if active_filter == "messaged_by_me")
-              li = link_to "Starred by me", topics_path(filter: "starred_by_me"), class: ("quick-filter-link is-active" if active_filter == "starred_by_me")
-
-          - current_user.teams.each do |team|
-            .filter-subsection
-              span.filter-subsection-label = team.name
-              ul.quick-filters
-                li = link_to "Starred by team", topics_path(filter: "starred_by_team", team_id: team.id), class: ("quick-filter-link is-active" if active_filter == "starred_by_team" && active_team_id == team.id)
-                li = link_to "Not yet read by team", topics_path(filter: "team_unread", team_id: team.id), class: ("quick-filter-link is-active" if active_filter == "team_unread" && active_team_id == team.id)
-                li = link_to "Teammates reading", topics_path(filter: "team_reading_others", team_id: team.id), class: ("quick-filter-link is-active" if active_filter == "team_reading_others" && active_team_id == team.id)
-                li = link_to "Team reading", topics_path(filter: "team_reading_any", team_id: team.id), class: ("quick-filter-link is-active" if active_filter == "team_reading_any" && active_team_id == team.id)
-                li = link_to "Started by team", topics_path(filter: "team_started", team_id: team.id), class: ("quick-filter-link is-active" if active_filter == "team_started" && active_team_id == team.id)
-                li = link_to "Team messages", topics_path(filter: "team_messaged", team_id: team.id), class: ("quick-filter-link is-active" if active_filter == "team_messaged" && active_team_id == team.id)
-
     - if user_signed_in? && @available_note_tags.present?
       .sidebar-section
         h3.sidebar-heading My tags
         ul.quick-filters.tags-list
           - @available_note_tags.each do |tag, count|
-            li = link_to "##{tag} (#{count})", topics_path(note_tag: tag), class: ("quick-filter-link is-active" if params[:note_tag] == tag)
+            li = link_to "##{tag} (#{count})", search_topics_path(q: "tag:#{tag}"), class: ("quick-filter-link is-active" if params[:q] == "tag:#{tag}")

app/views/topics/_topics.html.slim

@@ -5,9 +5,7 @@
     td colspan=3
       .topics-empty-state
         i.fa-regular.fa-folder-open aria-hidden="true"
-        p No topics match this filter.
-        - if params[:filter].present? || params[:note_tag].present?
-          = link_to "Clear filters", topics_path, class: "topics-empty-clear"
+        p No topics found.
 
 - topics.each do |topic|
   - tp_data = topic_participants_map[topic.id] || {}

app/views/topics/index.html.slim

@@ -1,16 +1,5 @@
 - cache_block = lambda do
-  - if params[:filter].present?
-    = link_to topics_path(note_tag: params[:note_tag]), class: "topics-filter-chip" do
-      i.fa-solid.fa-filter aria-hidden="true"
-      span = topic_filter_labels[params[:filter]] || params[:filter].humanize
-      i.fa-solid.fa-xmark.topics-filter-chip-close aria-hidden="true"
-  - elsif params[:note_tag].present?
-    = link_to topics_path, class: "topics-filter-chip" do
-      i.fa-solid.fa-tag aria-hidden="true"
-      span = "##{params[:note_tag]}"
-      i.fa-solid.fa-xmark.topics-filter-chip-close aria-hidden="true"
-
-  #new-topics-banner data-controller="new-topics-banner" data-new-topics-banner-url-value=new_topics_count_topics_path(viewing_since: @viewing_since.iso8601, filter: params[:filter], team_id: params[:team_id]) data-new-topics-banner-interval-ms-value="180000"
+  #new-topics-banner data-controller="new-topics-banner" data-new-topics-banner-url-value=new_topics_count_topics_path(viewing_since: @viewing_since.iso8601) data-new-topics-banner-interval-ms-value="180000"
     = render partial: "new_topics_banner", locals: { count: @new_topics_count, viewing_since: @viewing_since }
 
   .topics-table
@@ -26,7 +15,7 @@
     - if @topics.size == 25
       - last_topic = @topics.last
       - cursor = "#{last_topic.last_activity.iso8601}_#{last_topic.id}"
-      = turbo_frame_tag "pagination", src: topics_path(cursor: cursor, viewing_since: @viewing_since.iso8601, filter: params[:filter], team_id: params[:team_id], note_tag: params[:note_tag], format: :turbo_stream), loading: :lazy do
+      = turbo_frame_tag "pagination", src: topics_path(cursor: cursor, viewing_since: @viewing_since.iso8601, format: :turbo_stream), loading: :lazy do
         .loading-indicator Loading more topics...
     - else
       = turbo_frame_tag "pagination"

app/views/topics/index.turbo_stream.slim

@@ -10,7 +10,7 @@
   - last_topic = @topics.last
   - cursor = "#{last_topic.last_activity.iso8601}_#{last_topic.id}"
   = turbo_stream.replace "pagination" do
-    = turbo_frame_tag "pagination", src: topics_path(cursor: cursor, viewing_since: @viewing_since.iso8601, filter: params[:filter], team_id: params[:team_id], note_tag: params[:note_tag], format: :turbo_stream), loading: :lazy do
+    = turbo_frame_tag "pagination", src: topics_path(cursor: cursor, viewing_since: @viewing_since.iso8601, format: :turbo_stream), loading: :lazy do
       .loading-indicator Loading more topics...
 - elsif params[:cursor].present?
   = turbo_stream.remove "pagination"