From 28756ee8eb0d47ae31c777179c36e150fcc5efea Mon Sep 17 00:00:00 2001
From: nofaralfasi <nalfassi@redhat.com>
Date: Sun, 21 Aug 2022 18:34:00 +0300
Subject: [PATCH] Fixes #36368 - fix ansible roles pagination on host edit page

(cherry picked from commit 2a952856b06f303e028f7cc7fbd8c44430900db1)
---
 .../AnsibleRolesSwitcher/AnsibleRolesSwitcher.js       |  1 -
 .../components/AvailableRolesList.js                   |  4 +++-
 .../__snapshots__/AvailableRolesList.test.js.snap      | 10 ++--------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js b/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js
index 0601be68d..e79bffefe 100644
--- a/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js
+++ b/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js
@@ -26,7 +26,6 @@ class AnsibleRolesSwitcher extends React.Component {
       inheritedRoleIds,
       resourceId,
       resourceName,
-      { page: 1, perPage: 10 },
       excludeAssignedRolesSearch(initialAssignedRoles)
     );
   }
diff --git a/webpack/components/AnsibleRolesSwitcher/components/AvailableRolesList.js b/webpack/components/AnsibleRolesSwitcher/components/AvailableRolesList.js
index 3d8f24941..f4a872cc7 100644
--- a/webpack/components/AnsibleRolesSwitcher/components/AvailableRolesList.js
+++ b/webpack/components/AnsibleRolesSwitcher/components/AvailableRolesList.js
@@ -19,7 +19,9 @@ const AvailableRolesList = ({
       <Pagination
         viewType="list"
         itemCount={itemCount}
-        pagination={pagination}
+        updateParamsByUrl={false}
+        page={pagination.page}
+        perPage={pagination.perPage}
         onChange={onListingChange}
         dropdownButtonId="available-ansible-roles-pagination-row-dropdown"
       />
diff --git a/webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AvailableRolesList.test.js.snap b/webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AvailableRolesList.test.js.snap
index 51ab887eb..1ff5acdd8 100644
--- a/webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AvailableRolesList.test.js.snap
+++ b/webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AvailableRolesList.test.js.snap
@@ -16,14 +16,8 @@ exports[`AvailableRolesList should render 1`] = `
       onPerPageSelect={null}
       onSetPage={null}
       page={1}
-      pagination={
-        Object {
-          "page": 1,
-          "perPage": 25,
-        }
-      }
-      perPage={null}
-      updateParamsByUrl={true}
+      perPage={25}
+      updateParamsByUrl={false}
       variant="bottom"
       viewType="list"
     />