From 213fcb956d223daa90e0314d8423d5270256a799 Mon Sep 17 00:00:00 2001
From: Suzanne Aitchison <suzanne@forem.com>
Date: Thu, 23 Jun 2022 18:14:41 +0100
Subject: [PATCH] Member index: Show applied org filters (#17977)

* show applied org filters

* correct casing
---
 .../admin/users/index/_applied_filters.html.erb    | 14 +++++++++++++-
 .../adminFlows/users/filterUserIndex.spec.js       |  6 +++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/users/index/_applied_filters.html.erb b/app/views/admin/users/index/_applied_filters.html.erb
index 8710bd5e5..3fa47e744 100644
--- a/app/views/admin/users/index/_applied_filters.html.erb
+++ b/app/views/admin/users/index/_applied_filters.html.erb
@@ -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>
diff --git a/cypress/integration/seededFlows/adminFlows/users/filterUserIndex.spec.js b/cypress/integration/seededFlows/adminFlows/users/filterUserIndex.spec.js
index 3218cf226..e4403b5fb 100644
--- a/cypress/integration/seededFlows/adminFlows/users/filterUserIndex.spec.js
+++ b/cypress/integration/seededFlows/adminFlows/users/filterUserIndex.spec.js
@@ -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();
     });