Skip to content

Commit

Permalink
Add status filter to user's note page
Browse files Browse the repository at this point in the history
  • Loading branch information
kcne committed Nov 18, 2024
1 parent 9b9e857 commit 738e66a
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 1 deletion.
3 changes: 2 additions & 1 deletion app/controllers/notes_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ class NotesController < ApplicationController
def index
param! :page, Integer, :min => 1

@params = params.permit(:display_name)
@params = params.permit(:display_name, :status)
@title = t ".title", :user => @user.display_name
@page = (params[:page] || 1).to_i
@page_size = 10
@notes = @user.notes
@notes = @notes.visible unless current_user&.moderator?
@notes = @notes.where(:status => params[:status]) unless params[:status] == "all" || params[:status].blank?
@notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author)

render :layout => "site"
Expand Down
14 changes: 14 additions & 0 deletions app/views/notes/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@
:commented => tag.span(t(".subheading_commented"), :class => "px-2 py-1 bg-body") %></p>
<% end %>

<%= form_with :url => user_notes_path(@user), :method => :get, :data => { :turbo => true } do %>
<div class="row gx-2 align-items-end">
<div class="col-sm-auto mb-3">
<%= label_tag :status, t(".status") %>
<%= select_tag :status,
options_for_select([[t(".all"), "all"], [t(".open"), "open"], [t(".closed"), "closed"]], params[:status] || "all"),
:class => "form-select" %>
</div>
<div class="col-sm-auto mb-3">
<%= submit_tag t(".apply"), :name => nil, :class => "btn btn-primary" %>
</div>
</div>
<% end %>

<% if @notes.empty? %>
<h4><%= t ".no_notes" %></h4>

Expand Down
5 changes: 5 additions & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2966,6 +2966,11 @@ en:
description: "Description"
created_at: "Created at"
last_changed: "Last changed"
apply: "Apply"
all: "All"
open: "Open"
closed: "Closed"
status: "Status"
show:
title: "Note: %{id}"
description: "Description"
Expand Down
34 changes: 34 additions & 0 deletions test/controllers/notes_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -184,4 +184,38 @@ def test_new_note
assert_template "notes/new"
assert_select "#sidebar_content a[href='#{login_path(:referer => new_note_path)}']", :count => 0
end

def test_index_filter_by_status
user = create(:user)
other_user = create(:user)

open_note = create(:note, :status => "open")
create(:note_comment, :note => open_note, :author => user)

closed_note = create(:note, :status => "closed")
create(:note_comment, :note => closed_note, :author => user)

hidden_note = create(:note, :status => "hidden")
create(:note_comment, :note => hidden_note, :author => user)

commented_note = create(:note, :status => "open")
create(:note_comment, :note => commented_note, :author => other_user)
create(:note_comment, :note => commented_note, :author => user)

get user_notes_path(user, :status => "all")
assert_response :success
assert_select "table.note_list tbody tr", :count => 3

get user_notes_path(user, :status => "open")
assert_response :success
assert_select "table.note_list tbody tr", :count => 2

get user_notes_path(user, :status => "closed")
assert_response :success
assert_select "table.note_list tbody tr", :count => 1

get user_notes_path(user)
assert_response :success
assert_select "table.note_list tbody tr", :count => 3
end
end

0 comments on commit 738e66a

Please sign in to comment.