Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Added "My Cases" dropdown for volunteers #5272

Merged
merged 13 commits into from
Oct 22, 2023
Merged

Feat: Added "My Cases" dropdown for volunteers #5272

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8a2df7e
feat: added dropdown to my cases and fixed the carret
Rafael-Martins Oct 10, 2023
8df4f6c
fix: banner mistaken changed by diff
Rafael-Martins Oct 11, 2023
74b8d92
feat: create a partial for sidebar dropdown item
Rafael-Martins Oct 11, 2023
361f6e0
fix: enable only volunteer to see the dropdown
Rafael-Martins Oct 11, 2023
fd2906f
test: add and fix tests for the sidebar
Rafael-Martins Oct 11, 2023
b786513
Merge branch 'main' into create-mycases-dropdown
Rafael-Martins Oct 11, 2023
88d10b4
fix: banner postion
Rafael-Martins Oct 11, 2023
1af281f
chore: fix lint
Rafael-Martins Oct 11, 2023
8f81e0b
chore: fix lint
Rafael-Martins Oct 11, 2023
5d880e9
refactor: improve user role check in sidebar
Rafael-Martins Oct 11, 2023
7cf3ebf
refactor: use else instead another if
Rafael-Martins Oct 11, 2023
5d20320
fix: link in sidebar
Rafael-Martins Oct 16, 2023
4ad4f95
test: fix sidebar test
Rafael-Martins Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/helpers/sidebar_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ def menu_item(label:, path:, visible: false)
link_to label, path, class: "list-group-item #{active_class(path)}" if visible
end

def get_case_contact_link(casa_case)
case_contacts_path(casa_case_id: casa_case.id)
end

private # private doesn't work in modules. It's here for semantic purposes

def active_class(link_path)
Expand Down
54 changes: 33 additions & 21 deletions app/views/layouts/_sidebar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,35 @@
<% if current_user.casa_admin? || current_user.supervisor? %>
<%= render partial: "layouts/other_duties_nav_item" %>
<% end %>
<li class="<%= active_class(casa_cases_path) %> nav-item">
<%= link_to casa_cases_path do %>
<i class="lni lni-folder mr-10"></i>
<%= cases_index_title %>
<% end %>
</li>

<% if !policy(Volunteer).index? %>
Copy link
Contributor

@chahmedejaz chahmedejaz Oct 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Rafael-Martins - That's a good catch. Please leverage the user's role checking methods here i.e.
<% if current_user.volunteer? %>:

casa/app/models/user.rb

Lines 60 to 70 in 8f08a6a

def casa_admin?
is_a?(CasaAdmin)
end
def supervisor?
is_a?(Supervisor)
end
def volunteer?
is_a?(Volunteer)
end

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I was thinking in something like this, thanks!

<li class="nav-item nav-item-has-children">
<a
href="#0"
class="collapsed"
data-bs-toggle="collapse"
data-bs-target="#ddmenu_cases"
aria-controls="ddmenu_cases"
aria-expanded="true"
aria-label="Toggle navigation">
<span class="icon">
<i class="lni lni-folder mr-10"></i>
</span>
<span class="text"><%= cases_index_title %></span>
</a>
<%= render partial: 'shared/sidebar_dropdown', locals: { all_link_path: casa_cases_path, dropdown_id: "ddmenu_cases", link_generator: method(:edit_casa_case_path) } %>
</li>
<% end %>

<% if policy(Volunteer).index? %>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same can be applied here accordingly

<li class="<%= active_class(casa_cases_path) %> nav-item">
<%= link_to casa_cases_path do %>
<i class="lni lni-folder mr-10"></i>
<%= cases_index_title %>
<% end %>
</li>
<% end %>

<% if policy(CasaAdmin).index? %>
<li class="<%= active_class(casa_admins_path) %> nav-item">
<%= link_to casa_admins_path do %>
Expand All @@ -61,7 +84,7 @@
<li class="nav-item nav-item-has-children">
<a
href="#0"
class=""
class="collapsed"
data-bs-toggle="collapse"
data-bs-target="#ddmenu_case_contacts"
aria-controls="ddmenu_case_contacts"
Expand All @@ -72,18 +95,7 @@
</span>
<span class="text">Case Contacts</span>
</a>
<ul id="ddmenu_case_contacts" class="collapse dropdown-nav">
<li>
<%= link_to 'All', case_contacts_path %>
</li>
<% current_user.casa_cases.each do |casa_case| %>
<li>
<%= link_to case_contacts_path(casa_case_id: casa_case.id) do %>
<%= casa_case.case_number %>
<% end %>
</li>
<% end %>
</ul>
<%= render partial: 'shared/sidebar_dropdown', locals: { all_link_path: case_contacts_path, dropdown_id: "ddmenu_case_contacts", link_generator: method(:get_case_contact_link) } %>
</li>
<li class="<%= active_class(volunteer_learning_hours_path(volunteer_id: current_user.id || 0)) %> nav-item">
<%= link_to volunteer_learning_hours_path(volunteer_id: current_user.id || 0) do %>
Expand All @@ -104,7 +116,7 @@
<%= render partial: "layouts/other_duties_nav_item" %>
<% end %>

<% if policy(:application).see_banner_page? %>
<% if policy(:application).see_banner_page? %>
<li class="<%= active_class(casa_admins_path) %> nav-item">
<%= link_to banners_path, class: "#{active_class(banners_path)}" do %>
<i class="lni lni-flag mr-10"></i>
Expand All @@ -116,6 +128,7 @@
<li class="nav-item nav-item-has-children">
<a
href="#0"
class="collapsed"
class="group-actions"
data-bs-toggle="collapse"
data-bs-target="#ddmenu_55"
Expand Down Expand Up @@ -181,7 +194,6 @@
<% end %>
</li>
<% end %>

</ul>
</li>
<li>
Expand Down
12 changes: 12 additions & 0 deletions app/views/shared/_sidebar_dropdown.html.erb
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This name could be more specific, since it's not for all dropdowns in the sidebar, but instead for the my_cases dropdown. That being said, don't change this; it will go away with the merge of PR 5086.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<ul id="<%= dropdown_id %>" class="collapse dropdown-nav">
<li>
<%= link_to 'All', all_link_path %>
</li>
<% current_user.casa_cases.each do |casa_case| %>
<li>
<%= link_to link_generator.call(casa_case) do %>
<%= casa_case.case_number %>
<% end %>
</li>
<% end %>
</ul>
21 changes: 20 additions & 1 deletion spec/system/casa_cases/index_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
require "rails_helper"

RSpec.describe "casa_cases/index", type: :system do
let(:organization) { create(:casa_org) }
let(:volunteer) { build(:volunteer, display_name: "Bob Loblaw", casa_org: organization) }
let(:case_number) { "CINA-1" }

it "is filterable and linkable", :js do
organization = build(:casa_org)
admin = build(:casa_admin, casa_org: organization)
volunteer = build(:volunteer, display_name: "Cool Volunteer", casa_org: organization)
cina = build(:casa_case, active: true, casa_org: organization, case_number: "CINA-1")
cina = build(:casa_case, active: true, casa_org: organization, case_number: case_number)
tpr = create(:casa_case, active: true, casa_org: organization, case_number: "TPR-100")
no_prefix = create(:casa_case, active: true, casa_org: organization, case_number: "123-12-123")
create(:case_assignment, volunteer: volunteer, casa_case: cina)
Expand All @@ -24,4 +28,19 @@
click_on "Assigned to Transition Aged Youth"
click_on "Casa Case Prefix"
end

it "has a usable dropdown in sidebar" do
cina = build(:casa_case, active: true, casa_org: organization, case_number: case_number)
create(:case_assignment, volunteer: volunteer, casa_case: cina)

sign_in volunteer

visit root_path
click_on "My Cases"
within "#ddmenu_cases" do
click_on case_number
end

expect(page).to have_text("Editing CINA-1")
end
end
2 changes: 1 addition & 1 deletion spec/views/layouts/sidebar.html.erb_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def true_user

render partial: "layouts/sidebar"

expect(rendered).to have_link("My Cases", href: "/casa_cases")
expect(rendered).to have_link("All", href: "/casa_cases")
expect(rendered).to have_link("All", href: "/case_contacts")
expect(rendered).to have_link("Generate Court Report", href: "/case_court_reports")
expect(rendered).to_not have_link("Export Data", href: "/reports")
Expand Down
Loading