github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[7.x] Lexicographically sort location tags (#54832) (#54867)

Browse source 
* Lexicographically sort location tags (#54832)

Sort location tags lexicographically, fixes skipped test by providing a stable, non-time-based sort order

* Update ping list snapshot
This commit is contained in:
Andrew Cholakian 2020-01-14 22:11:24 -06:00 • committed by GitHub
parent 7fd3e10a0a
commit 7556436796
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/__snapshots__/location_status_tags.test.tsx.snap generated
View file

@ -151,7 +151,7 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
<div
class="c2"
>
Islamabad
Berlin
</div>
</div>
</span>
@ -166,7 +166,7 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
<div
class="euiTextColor euiTextColor--subdued"
>
5s ago
5d ago
</div>
</div>
</span>
@ -190,7 +190,7 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
<div
class="c2"
>
Berlin
Islamabad
</div>
</div>
</span>
@ -205,7 +205,7 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
<div
class="euiTextColor euiTextColor--subdued"
>
5d ago
5s ago
</div>
</div>
</span>

2
x-pack/legacy/plugins/uptime/public/components/functional/location_map/__tests__/location_status_tags.test.tsx
View file

@ -11,7 +11,7 @@ import { MonitorLocation } from '../../../../../common/runtime_types/monitor';
import { LocationStatusTags } from '../';
// Failing: https://github.com/elastic/kibana/issues/54818
describe.skip('LocationStatusTags component', () => {
describe('LocationStatusTags component', () => {
let monitorLocations: MonitorLocation[];
it('renders when there are many location', () => {

4
x-pack/legacy/plugins/uptime/public/components/functional/location_map/location_status_tags.tsx
View file

@ -60,9 +60,9 @@ export const LocationStatusTags = ({ locations }: Props) => {
}
});
// Sort by recent timestamp
// Sort lexicographically by label
upLocations.sort((a, b) => {
return a.timestamp < b.timestamp ? 1 : b.timestamp < a.timestamp ? -1 : 0;
return a.label > b.label ? 1 : b.label > a.label ? -1 : 0;
});
moment.locale('en', {

8
x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap generated
View file

@ -45,10 +45,6 @@ exports[`PingList component renders sorted list without errors 1`] = `
>
<EuiSelect
aria-label="Status"
compressed={false}
fullWidth={false}
hasNoInitialSelection={false}
isLoading={false}
onChange={[Function]}
options={
Array [
@ -83,10 +79,6 @@ exports[`PingList component renders sorted list without errors 1`] = `
>
<EuiSelect
aria-label="Location"
compressed={false}
fullWidth={false}
hasNoInitialSelection={false}
isLoading={false}
onChange={[Function]}
options={
Array [