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

Jump to bottom

[Uptime] Add explicit alignments to table columns #40680

Merged
merged 9 commits into from
Jul 17, 2019
Merged

[Uptime] Add explicit alignments to table columns #40680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3944f84
Add explicit alignments to table columns.
justinkambic Jul 9, 2019
d2ac5f3
Merge branch 'master' into uptime_column-alignment
justinkambic Jul 12, 2019
c079148
Merge branch 'master' into uptime_column-alignment
justinkambic Jul 12, 2019
18ae3f8
Fix broken prop and snapshots.
justinkambic Jul 12, 2019
6cd5c8c
Fix pagination item count and update snapshot to match changes.
justinkambic Jul 13, 2019
8faab97
Merge branch 'master' into uptime_column-alignment
justinkambic Jul 13, 2019
a8be262
Merge branch 'master' into uptime_column-alignment
justinkambic Jul 15, 2019
92cd394
Merge branch 'master' into uptime_column-alignment
justinkambic Jul 17, 2019
a1b23cf
Merge branch 'master' into uptime_column-alignment
justinkambic Jul 17, 2019
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
6 changes: 6 additions & 0 deletions ...ugins/uptime/public/components/functional/__tests__/__snapshots__/ping_list.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions ...lic/components/functional/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ export const MonitorListComponent = (props: Props) => {
// sorting={sorting}
columns={[
{
align: 'left',
field: 'monitor_id',
name: '',
sortable: true,
Expand Down Expand Up @@ -165,6 +166,7 @@ export const MonitorListComponent = (props: Props) => {
},
},
{
align: 'left',
field: 'state.monitor.status',
name: i18n.translate('xpack.uptime.monitorList.statusColumnLabel', {
defaultMessage: 'Status',
Expand All @@ -174,6 +176,7 @@ export const MonitorListComponent = (props: Props) => {
},
},
{
align: 'left',
field: 'state.monitor.name',
name: i18n.translate('xpack.uptime.monitorList.nameColumnLabel', {
defaultMessage: 'Name',
Expand All @@ -190,6 +193,7 @@ export const MonitorListComponent = (props: Props) => {
sortable: true,
},
{
align: 'left',
field: 'state.url.full',
name: i18n.translate('xpack.uptime.monitorList.urlColumnLabel', {
defaultMessage: 'URL',
Expand Down
5 changes: 3 additions & 2 deletions x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,10 @@ export interface ExpandedRowMap {
}

export interface Pagination {
hidePerPageOptions?: boolean;
initialPageSize: number;
pageIndex: number;
pageSize: number;
totalItemCount: number;
pageSizeOptions: number[];
hidePerPageOptions: boolean;
totalItemCount: number;
}
35 changes: 25 additions & 10 deletions x-pack/legacy/plugins/uptime/public/components/functional/ping_list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { convertMicrosecondsToMilliseconds as microsToMillis } from '../../lib/h
import { UptimeGraphQLQueryProps, withUptimeGraphQL } from '../higher_order';
import { pingsQuery } from '../../queries';
import { LocationName } from './location_name';
import { Criteria } from './monitor_list';
import { Criteria, Pagination } from './monitor_list';

interface PingListQueryResult {
allPings?: PingResults;
Expand Down Expand Up @@ -117,34 +117,43 @@ export const PingListComponent = ({
),
},
{
field: 'observer.geo.name',
align: 'left',
dataType: 'number',
field: 'observer.geo.name',
name: i18n.translate('xpack.uptime.pingList.locationNameColumnLabel', {
defaultMessage: 'Location',
}),
render: (location: string) => <LocationName location={location} />,
},
{
field: 'monitor.ip',
align: 'left',
dataType: 'number',
field: 'monitor.ip',
name: i18n.translate('xpack.uptime.pingList.ipAddressColumnLabel', {
defaultMessage: 'IP',
}),
},
{
align: 'right',
field: 'monitor.duration.us',
name: i18n.translate('xpack.uptime.pingList.durationMsColumnLabel', {
defaultMessage: 'Duration',
}),
render: (duration: number) => microsToMillis(duration),
render: (duration: number) =>
i18n.translate('xpack.uptime.pingList.durationMsColumnFormatting', {
values: { millis: microsToMillis(duration) },
defaultMessage: '{millis} ms',
}),
},
{
align: 'left',
field: 'error.type',
name: i18n.translate('xpack.uptime.pingList.errorTypeColumnLabel', {
defaultMessage: 'Error type',
}),
},
{
align: 'left',
field: 'error.message',
name: i18n.translate('xpack.uptime.pingList.errorMessageColumnLabel', {
defaultMessage: 'Error message',
Expand Down Expand Up @@ -192,6 +201,17 @@ export const PingListComponent = ({
});
}
}
const pagination: Pagination = {
initialPageSize: 20,
pageIndex: 0,
pageSize,
pageSizeOptions: [5, 10, 20, 50, 100],
/**
* we're not currently supporting pagination in this component
* so the first page is the only page
*/
totalItemCount: pageSize,
};

return (
<Fragment>
Expand Down Expand Up @@ -278,12 +298,7 @@ export const PingListComponent = ({
loading={loading}
columns={columns}
items={pings}
pagination={{
initialPageSize: 20,
pageIndex: 0,
pageSize,
pageSizeOptions: [5, 10, 20, 50, 100],
}}
pagination={pagination}
onChange={({ page: { size } }: Criteria) => onPageCountChange(size)}
/>
</EuiPanel>
Expand Down