Skip to content

Commit

Permalink
[Cloud Security] [Vulnerabilities] Remove flyout pagination (#169301)
Browse files Browse the repository at this point in the history
  • Loading branch information
opauloh authored Oct 19, 2023
1 parent 47cea09 commit 8b54eed
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -268,22 +268,6 @@ const VulnerabilitiesDataGrid = ({
isFetching,
]);

const onPaginateFlyout = useCallback(
(nextVulnerabilityIndex: number) => {
// the index of the vulnerability in the current page
const newVulnerabilityIndex = nextVulnerabilityIndex % pageSize;

// if the vulnerability is not in the current page, we need to change the page
const flyoutPageIndex = Math.floor(nextVulnerabilityIndex / pageSize);

setUrlQuery({
pageIndex: flyoutPageIndex,
vulnerabilityIndex: newVulnerabilityIndex,
});
},
[pageSize, setUrlQuery]
);

const showVulnerabilityFlyout = flyoutVulnerabilityIndex > invalidIndex;

if (data?.page.length === 0) {
Expand Down Expand Up @@ -372,7 +356,6 @@ const VulnerabilitiesDataGrid = ({
flyoutIndex={selectedVulnerabilityIndex}
vulnerabilityRecord={selectedVulnerability}
totalVulnerabilitiesCount={limitedTotalItemCount}
onPaginate={onPaginateFlyout}
closeFlyout={onCloseFlyout}
isLoading={isFetching}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const VulnerabilityFindingFlyout = ({
isLoading,
}: {
closeFlyout: () => void;
onPaginate: (pageIndex: number) => void;
onPaginate?: (pageIndex: number) => void;
totalVulnerabilitiesCount: number;
flyoutIndex?: number;
vulnerabilityRecord: CspVulnerabilityFinding;
Expand Down Expand Up @@ -236,15 +236,21 @@ export const VulnerabilityFindingFlyout = ({
</EuiSkeletonText>
</EuiFlyoutBody>
<EuiFlyoutFooter>
<EuiFlexGroup gutterSize="none" alignItems="center" justifyContent="spaceBetween">
<EuiFlexItem grow={false}>
<EuiPagination
pageCount={totalVulnerabilitiesCount}
activePage={flyoutIndex}
onPageClick={onPaginate}
compressed
/>
</EuiFlexItem>
<EuiFlexGroup
gutterSize="none"
alignItems="center"
justifyContent={onPaginate ? 'spaceBetween' : 'flexEnd'}
>
{onPaginate && (
<EuiFlexItem grow={false}>
<EuiPagination
pageCount={totalVulnerabilitiesCount}
activePage={flyoutIndex}
onPageClick={onPaginate}
compressed
/>
</EuiFlexItem>
)}
<EuiFlexItem grow={false}>
<TakeAction createRuleFn={createVulnerabilityRuleFn} />
</EuiFlexItem>
Expand Down

0 comments on commit 8b54eed

Please sign in to comment.