From 72268bb896e09a73b77987e9259810596d5f5619 Mon Sep 17 00:00:00 2001
From: Jenny <32821331+jenny-s51@users.noreply.github.com>
Date: Wed, 23 Feb 2022 12:46:52 -0500
Subject: [PATCH] Fix associated roles table (#2136)

---
 .../admin_console/manage/realm_settings/RealmSettingsPage.ts  | 2 +-
 src/realm-roles/AssociatedRolesTab.tsx                        | 2 +-
 src/realm-roles/messages.ts                                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cypress/support/pages/admin_console/manage/realm_settings/RealmSettingsPage.ts b/cypress/support/pages/admin_console/manage/realm_settings/RealmSettingsPage.ts
index f8fbf45dea..dcf6655c10 100644
--- a/cypress/support/pages/admin_console/manage/realm_settings/RealmSettingsPage.ts
+++ b/cypress/support/pages/admin_console/manage/realm_settings/RealmSettingsPage.ts
@@ -554,7 +554,7 @@ export default class RealmSettingsPage {
   }
 
   shouldRemoveEventFromEventListener() {
-    cy.get(this.eventListenerRemove).last().click();
+    cy.get(this.eventListenerRemove).last().click({ force: true });
     cy.findByTestId(this.eventListenersSaveBtn).click({ force: true });
     cy.get(this.alertMessage).should(
       "be.visible",
diff --git a/src/realm-roles/AssociatedRolesTab.tsx b/src/realm-roles/AssociatedRolesTab.tsx
index a29279dbef..aa05167d73 100644
--- a/src/realm-roles/AssociatedRolesTab.tsx
+++ b/src/realm-roles/AssociatedRolesTab.tsx
@@ -234,7 +234,7 @@ export const AssociatedRolesTab = ({
         ariaLabelKey="roles:roleList"
         searchPlaceholderKey="roles:searchFor"
         canSelectAll
-        isPaginated={isInheritedHidden}
+        isPaginated
         onSelect={(rows) => {
           setSelectedRows([
             ...rows.map((r) => {
diff --git a/src/realm-roles/messages.ts b/src/realm-roles/messages.ts
index b267a5e7c7..f7accb0ca4 100644
--- a/src/realm-roles/messages.ts
+++ b/src/realm-roles/messages.ts
@@ -79,8 +79,8 @@ export default {
     lastName: "Last name",
     firstName: "First name",
     clearAllFilters: "Clear all filters",
-    noRolesAssociated: "No roles where associated",
+    noRolesAssociated: "No associated roles",
     noRolesAssociatedInstructions:
-      "To add roles to the this role press that 'Add role' button",
+      "To add roles to this role press the 'Add role' button",
   },
 };