mirror of
https://github.com/elastic/kibana.git
synced 2025-04-23 17:28:26 -04:00
* uptime - handle null duration
* adjust types
* Update x-pack/plugins/uptime/server/lib/synthetics_service/service_api_client.ts
* raise per page of synthetics monitors
* Remove tooltip
(cherry picked from commit 52e9c51d15
)
# Conflicts:
# x-pack/plugins/uptime/public/components/monitor/ping_list/ping_list_table.tsx
# x-pack/plugins/uptime/public/components/overview/monitor_list/monitor_list.tsx
# x-pack/plugins/uptime/server/lib/synthetics_service/synthetics_service.ts
This commit is contained in:
parent
6b8ea28550
commit
bbefaf052e
3 changed files with 16 additions and 8 deletions
|
@ -90,14 +90,14 @@ export type Tls = t.TypeOf<typeof TlsType>;
|
|||
|
||||
export const MonitorType = t.intersection([
|
||||
t.type({
|
||||
duration: t.type({
|
||||
us: t.number,
|
||||
}),
|
||||
id: t.string,
|
||||
status: t.string,
|
||||
type: t.string,
|
||||
}),
|
||||
t.partial({
|
||||
duration: t.type({
|
||||
us: t.number,
|
||||
}),
|
||||
check_group: t.string,
|
||||
ip: t.string,
|
||||
name: t.string,
|
||||
|
|
|
@ -42,7 +42,6 @@ describe('PingList component', () => {
|
|||
type: 'io',
|
||||
},
|
||||
monitor: {
|
||||
duration: { us: 1370 },
|
||||
id: 'auto-tcp-0X81440A68E839814D',
|
||||
ip: '255.255.255.0',
|
||||
name: '',
|
||||
|
@ -161,9 +160,6 @@ describe('PingList component', () => {
|
|||
"type": "io",
|
||||
},
|
||||
"monitor": Object {
|
||||
"duration": Object {
|
||||
"us": 1370,
|
||||
},
|
||||
"id": "auto-tcp-0X81440A68E839814D",
|
||||
"ip": "255.255.255.0",
|
||||
"name": "",
|
||||
|
@ -186,6 +182,13 @@ describe('PingList component', () => {
|
|||
});
|
||||
});
|
||||
|
||||
describe('duration column', () => {
|
||||
it('shows -- when duration is null', () => {
|
||||
const { getByTestId } = render(<PingList />);
|
||||
expect(getByTestId('ping-list-duration-unavailable-tool-tip')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
||||
describe('formatDuration', () => {
|
||||
it('returns zero for < 1 millisecond', () => {
|
||||
expect(formatDuration(984)).toBe('0 ms');
|
||||
|
|
|
@ -172,7 +172,12 @@ export const PingList = () => {
|
|||
name: i18n.translate('xpack.uptime.pingList.durationMsColumnLabel', {
|
||||
defaultMessage: 'Duration',
|
||||
}),
|
||||
render: (duration: number) => formatDuration(duration),
|
||||
render: (duration: number | null) =>
|
||||
duration ? (
|
||||
formatDuration(duration)
|
||||
) : (
|
||||
<span data-test-subj="ping-list-duration-unavailable-tool-tip">{'--'}</span>
|
||||
),
|
||||
},
|
||||
{
|
||||
field: 'error.type',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue