Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[APM] Fix trace sample double pagination summary #57558

Merged
merged 6 commits into from
Feb 19, 2020
Merged

[APM] Fix trace sample double pagination summary #57558

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33a7fb2
[APM] Remove PaginationContainer
formgeist Feb 13, 2020
1942e07
[APM] Removing PaginationContainer component ref
formgeist Feb 13, 2020
fef513d
[APM] Change the vertical alignment to center
formgeist Feb 13, 2020
25fdb5c
[APM] Leaving the EuiPagination component in place
formgeist Feb 13, 2020
1aac9d3
Merge branch 'master' into apm/fix-trace-sample-pagination
elasticmachine Feb 17, 2020
51ff87b
Merge branch 'master' into apm/fix-trace-sample-pagination
elasticmachine Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 7 additions & 27 deletions ...gacy/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ import {
import { i18n } from '@kbn/i18n';
import { Location } from 'history';
import React, { useEffect, useState } from 'react';
import styled from 'styled-components';
import { IBucket } from '../../../../../server/lib/transactions/distribution/get_buckets/transform';
import { IUrlParams } from '../../../../context/UrlParamsContext/types';
import { px, units } from '../../../../style/variables';
import { history } from '../../../../utils/history';
import { fromQuery, toQuery } from '../../../shared/Links/url_helpers';
import { LoadingStatePrompt } from '../../../shared/LoadingStatePrompt';
Expand All @@ -29,20 +27,6 @@ import { MaybeViewTraceLink } from './MaybeViewTraceLink';
import { TransactionTabs } from './TransactionTabs';
import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers';

const PaginationContainer = styled.div`
margin-left: ${px(units.quarter)};
display: flex;
align-items: center;

> span:first-of-type {
font-weight: 600;
}

> span:last-of-type {
margin-right: ${px(units.half)};
}
`;

interface Props {
urlParams: IUrlParams;
location: Location;
Expand Down Expand Up @@ -102,7 +86,7 @@ export const WaterfallWithSummmary: React.FC<Props> = ({
return (
<EuiPanel paddingSize="m">
<EuiFlexGroup>
<EuiFlexItem style={{ flexDirection: 'row', alignItems: 'baseLine' }}>
<EuiFlexItem style={{ flexDirection: 'row', alignItems: 'center' }}>
<EuiTitle size="xs">
<h5>
{i18n.translate('xpack.apm.transactionDetails.traceSampleTitle', {
Expand All @@ -111,16 +95,12 @@ export const WaterfallWithSummmary: React.FC<Props> = ({
</h5>
</EuiTitle>
{traceSamples && (
<PaginationContainer>
<span>{sampleActivePage + 1}</span>
<span>/{traceSamples.length}</span>
<EuiPagination
pageCount={traceSamples.length}
activePage={sampleActivePage}
onPageClick={goToSample}
compressed
/>
</PaginationContainer>
<EuiPagination
pageCount={traceSamples.length}
activePage={sampleActivePage}
onPageClick={goToSample}
compressed
/>
)}
</EuiFlexItem>
<EuiFlexItem>
Expand Down