Skip to content

Commit

Permalink
[8.x] Revert "[Fleet][Cloud] Enrollment token table may show an …
Browse files Browse the repository at this point in the history
…empty last page #167663 (#188049)" (#194343) (#194480)

# Backport

This will backport the following commits from `main` to `8.x`:
- [Revert "[Fleet][Cloud] Enrollment token table may show an empty
last page #167663 (#188049)"
(#194343)](#194343)

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

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

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-09-30T19:35:13Z","message":"Revert
\"[Fleet][Cloud] Enrollment token table may show an empty last page
#167663 (#188049)\" (#194343)\n\n## Summary\r\n\r\nResolves
#194339.\r\n\r\nThis PR reverts #188049 as it inadvertently broke
pagination of the\r\nenrollment tokens page. This means that #167663
will need to be\r\nre-opened and fixed in a different
way.","sha":"283f6e64c9656c97fa37be34f3e6fab2e8ad459f","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:prev-major"],"title":"Revert
\"[Fleet][Cloud] Enrollment token table may show an empty last page
#167663
(#188049)\"","number":194343,"url":"https://github.com/elastic/kibana/pull/194343","mergeCommit":{"message":"Revert
\"[Fleet][Cloud] Enrollment token table may show an empty last page
#167663 (#188049)\" (#194343)\n\n## Summary\r\n\r\nResolves
#194339.\r\n\r\nThis PR reverts #188049 as it inadvertently broke
pagination of the\r\nenrollment tokens page. This means that #167663
will need to be\r\nre-opened and fixed in a different
way.","sha":"283f6e64c9656c97fa37be34f3e6fab2e8ad459f"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/194343","number":194343,"mergeCommit":{"message":"Revert
\"[Fleet][Cloud] Enrollment token table may show an empty last page
#167663 (#188049)\" (#194343)\n\n## Summary\r\n\r\nResolves
#194339.\r\n\r\nThis PR reverts #188049 as it inadvertently broke
pagination of the\r\nenrollment tokens page. This means that #167663
will need to be\r\nre-opened and fixed in a different
way.","sha":"283f6e64c9656c97fa37be34f3e6fab2e8ad459f"}}]}] BACKPORT-->

Co-authored-by: Jen Huang <[email protected]>
  • Loading branch information
kibanamachine and jen-huang authored Sep 30, 2024
1 parent 0a4c040 commit 8618d89
Showing 1 changed file with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,6 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
const agentPolicy = agentPoliciesById[enrollmentKey.policy_id];
return !agentPolicy?.is_managed;
}) || [];
const filteredTotal = rowItems.length;

const columns = [
{
Expand Down Expand Up @@ -295,7 +294,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
pagination={{
pageIndex: pagination.currentPage - 1,
pageSize: pagination.pageSize,
totalItemCount: filteredTotal,
totalItemCount: total,
pageSizeOptions,
}}
onChange={({ page }: { page: { index: number; size: number } }) => {
Expand Down

0 comments on commit 8618d89

Please sign in to comment.