maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Member index: Show applied org filters (#17977)

Browse source 
* show applied org filters

* correct casing
This commit is contained in:
Suzanne Aitchison 2022-06-23 18:14:41 +01:00 • committed by GitHub
parent 2f029fe896
commit 213fcb956d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/views/admin/users/index/_applied_filters.html.erb
View file

@ -11,7 +11,19 @@
<%= crayons_icon_tag("x.svg", class: "c-pill__action-icon", aria_hidden: true) %>
</button>
<% end %>
<% if params[:roles] %>
<% params[:organizations]&.each do |org_id| %>
<% org = @organizations.find_by(id: org_id) %>
<button
data-filter-key="organizations[]"
data-filter-value="<%= org_id %>"
aria-label="Remove filter: <%= org.name %>"
class="c-pill c-pill--action-icon c-pill--action-icon--destructive"
type="button">
<%= org.name %>
<%= crayons_icon_tag("x.svg", class: "c-pill__action-icon", aria_hidden: true) %>
</button>
<% end %>
<% if params[:roles] || params[:organizations] %>
<button class="js-clear-filters-btn c-btn" aria-label="Clear all filters">Clear all</button>
<% end %>
</div>

6
cypress/integration/seededFlows/adminFlows/users/filterUserIndex.spec.js
View file

@ -33,7 +33,11 @@ describe('Filter user index', () => {
cy.findByRole('checkbox', { name: 'Admin' }).check();
cy.findByRole('checkbox', { name: 'Super Admin' }).check();
cy.findByRole('checkbox', { name: 'Tech Admin' }).check();
cy.findAllByText('Organizations').first().click();
cy.findByRole('group', { name: 'Organizations' }).should('be.visible');
cy.findByRole('checkbox', { name: 'Bachmanity' }).check();
cy.findByRole('button', { name: 'Apply filters' }).click();
});