From 4806820b03da0233d28c8868659952c6ae0c45ae Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Thu, 11 Jul 2024 19:31:18 +0200
Subject: [PATCH] [8.15] [Fleet][Cloud] Enrollment token table may show an
 empty last page #167663 (#188049) (#188127)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Backport

This will backport the following commits from `main` to `8.15`:
- [[Fleet][Cloud] Enrollment token table may show an empty last page
#167663 (#188049)](https://github.com/elastic/kibana/pull/188049)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Pratham
Shirbhate","email":"prathamshirbhate1909@gmail.com"},"sourceCommit":{"committedDate":"2024-07-11T09:15:54Z","message":"[Fleet][Cloud]
Enrollment token table may show an empty last page #167663
(#188049)\n\nFixes #167663 \r\n\r\n## Summary\r\n\r\nFixes the creation
of extra empty page at pagination of 5 rows\r\n\r\n\r\n### Video
\r\n\r\n\r\nhttps://github.com/elastic/kibana/assets/140709379/cdac6a22-f239-4b70-b40c-93fc727418a6\r\n\r\nCo-authored-by:
Julien Lind
<julien.lind@elastic.co>","sha":"1f7fdfdfe428525b08bf14321463d091bdad4c79","branchLabelMapping":{"^v8.16.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","💝community","Team:Fleet","backport:prev-minor","v8.15.0","v8.16.0"],"title":"[Fleet][Cloud]
Enrollment token table may show an empty last page
#167663","number":188049,"url":"https://github.com/elastic/kibana/pull/188049","mergeCommit":{"message":"[Fleet][Cloud]
Enrollment token table may show an empty last page #167663
(#188049)\n\nFixes #167663 \r\n\r\n## Summary\r\n\r\nFixes the creation
of extra empty page at pagination of 5 rows\r\n\r\n\r\n### Video
\r\n\r\n\r\nhttps://github.com/elastic/kibana/assets/140709379/cdac6a22-f239-4b70-b40c-93fc727418a6\r\n\r\nCo-authored-by:
Julien Lind
<julien.lind@elastic.co>","sha":"1f7fdfdfe428525b08bf14321463d091bdad4c79"}},"sourceBranch":"main","suggestedTargetBranches":["8.15"],"targetPullRequestStates":[{"branch":"8.15","label":"v8.15.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.16.0","branchLabelMappingKey":"^v8.16.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/188049","number":188049,"mergeCommit":{"message":"[Fleet][Cloud]
Enrollment token table may show an empty last page #167663
(#188049)\n\nFixes #167663 \r\n\r\n## Summary\r\n\r\nFixes the creation
of extra empty page at pagination of 5 rows\r\n\r\n\r\n### Video
\r\n\r\n\r\nhttps://github.com/elastic/kibana/assets/140709379/cdac6a22-f239-4b70-b40c-93fc727418a6\r\n\r\nCo-authored-by:
Julien Lind
<julien.lind@elastic.co>","sha":"1f7fdfdfe428525b08bf14321463d091bdad4c79"}}]}]
BACKPORT-->

Co-authored-by: Pratham Shirbhate <prathamshirbhate1909@gmail.com>
---
 .../fleet/sections/agents/enrollment_token_list_page/index.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
index 3a21103503ae5..a9adc6140c7c5 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
@@ -128,6 +128,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
       const agentPolicy = agentPoliciesById[enrollmentKey.policy_id];
       return !agentPolicy?.is_managed;
     }) || [];
+  const filteredTotal = rowItems.length;
 
   const columns = [
     {
@@ -294,7 +295,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
         pagination={{
           pageIndex: pagination.currentPage - 1,
           pageSize: pagination.pageSize,
-          totalItemCount: total,
+          totalItemCount: filteredTotal,
           pageSizeOptions,
         }}
         onChange={({ page }: { page: { index: number; size: number } }) => {