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

[6.7] Preserve x-axis order in vislib. (#31533) #31944

Merged
merged 2 commits into from
Feb 26, 2019
Merged

[6.7] Preserve x-axis order in vislib. (#31533) #31944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de566e8
Preserve x-axis order in vislib. (#31533)
lukeelmers Feb 25, 2019
d369749
Fix tests
lukeelmers Feb 26, 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
33 changes: 33 additions & 0 deletions src/fixtures/vislib/mock_data/date_histogram/_columns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,5 +263,38 @@ export default {
]
}
],
'xAxisOrderedValues': [
1415826600000,
1415826630000,
1415826660000,
1415826690000,
1415826720000,
1415826750000,
1415826780000,
1415826810000,
1415826840000,
1415826870000,
1415826900000,
1415826930000,
1415826960000,
1415826990000,
1415827020000,
1415827050000,
1415827080000,
1415827110000,
1415827140000,
1415827170000,
1415827200000,
1415827230000,
1415827260000,
1415827290000,
1415827320000,
1415827350000,
1415827380000,
1415827410000,
1415827440000,
1415827470000,
1415827500000,
],
'hits': 225
};
33 changes: 33 additions & 0 deletions src/fixtures/vislib/mock_data/date_histogram/_rows.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,5 +1641,38 @@ export default {
]
}
],
'xAxisOrderedValues': [
1415826240000,
1415826270000,
1415826300000,
1415826330000,
1415826360000,
1415826390000,
1415826420000,
1415826450000,
1415826480000,
1415826510000,
1415826540000,
1415826570000,
1415826600000,
1415826630000,
1415826660000,
1415826690000,
1415826720000,
1415826750000,
1415826780000,
1415826810000,
1415826840000,
1415826870000,
1415826900000,
1415826930000,
1415826960000,
1415826990000,
1415827020000,
1415827050000,
1415827080000,
1415827110000,
1415827140000,
],
'hits': 236
};
22 changes: 21 additions & 1 deletion src/fixtures/vislib/mock_data/date_histogram/_rows_series_with_holes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,25 @@ export const rowsSeriesWithHoles = {
return d;
}
}
]
],
'xAxisOrderedValues': [
1411761450000,
1411761510000,
1411761540000,
1411761840000,
1411761870000,
1411761900000,
1411761930000,
1411761960000,
1411761990000,
1411762020000,
1411762050000,
1411762080000,
1411762110000,
1411762140000,
1411762170000,
1411762200000,
1411762320000,
1411762350000,
],
};
33 changes: 33 additions & 0 deletions src/fixtures/vislib/mock_data/date_histogram/_series.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,39 @@ export default {
}
],
'hits': 533,
'xAxisOrderedValues': [
1411761450000,
1411761480000,
1411761510000,
1411761540000,
1411761570000,
1411761600000,
1411761630000,
1411761660000,
1411761690000,
1411761720000,
1411761750000,
1411761780000,
1411761810000,
1411761840000,
1411761870000,
1411761900000,
1411761930000,
1411761960000,
1411761990000,
1411762020000,
1411762050000,
1411762080000,
1411762110000,
1411762140000,
1411762170000,
1411762200000,
1411762230000,
1411762260000,
1411762290000,
1411762320000,
1411762350000,
],
'xAxisFormatter': function (thing) {
return moment(thing);
},
Expand Down
14 changes: 14 additions & 0 deletions src/fixtures/vislib/mock_data/date_histogram/_series_monthly_interval.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,20 @@ export const seriesMonthlyInterval = {
}
],
'hits': 533,
'xAxisOrderedValues': [
1451631600000,
1454310000000,
1456815600000,
1459490400000,
1462082400000,
1464760800000,
1467352800000,
1470031200000,
1472709600000,
1475301600000,
1477980000000,
1480575600000,
],
'xAxisFormatter': function (thing) {
return moment(thing);
},
Expand Down
33 changes: 33 additions & 0 deletions src/fixtures/vislib/mock_data/date_histogram/_series_neg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,39 @@ export default {
}
],
'hits': 533,
'xAxisOrderedValues': [
1411761450000,
1411761480000,
1411761510000,
1411761540000,
1411761570000,
1411761600000,
1411761630000,
1411761660000,
1411761690000,
1411761720000,
1411761750000,
1411761780000,
1411761810000,
1411761840000,
1411761870000,
1411761900000,
1411761930000,
1411761960000,
1411761990000,
1411762020000,
1411762050000,
1411762080000,
1411762110000,
1411762140000,
1411762170000,
1411762200000,
1411762230000,
1411762260000,
1411762290000,
1411762320000,
1411762350000,
],
'xAxisFormatter': function (thing) {
return moment(thing);
},
Expand Down
33 changes: 33 additions & 0 deletions src/fixtures/vislib/mock_data/date_histogram/_series_pos_neg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,39 @@ export default {
}
],
'hits': 533,
'xAxisOrderedValues': [
1411761450000,
1411761480000,
1411761510000,
1411761540000,
1411761570000,
1411761600000,
1411761630000,
1411761660000,
1411761690000,
1411761720000,
1411761750000,
1411761780000,
1411761810000,
1411761840000,
1411761870000,
1411761900000,
1411761930000,
1411761960000,
1411761990000,
1411762020000,
1411762050000,
1411762080000,
1411762110000,
1411762140000,
1411762170000,
1411762200000,
1411762230000,
1411762260000,
1411762290000,
1411762320000,
1411762350000,
],
'xAxisFormatter': function (thing) {
return moment(thing);
},
Expand Down
74 changes: 74 additions & 0 deletions src/fixtures/vislib/mock_data/date_histogram/_stacked_series.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1474,6 +1474,80 @@ export default {
}
],
'hits': 108970,
'xAxisOrderedValues': [
1413543600000,
1413544200000,
1413544800000,
1413545400000,
1413546000000,
1413546600000,
1413547200000,
1413547800000,
1413548400000,
1413549000000,
1413549600000,
1413550200000,
1413550800000,
1413551400000,
1413552000000,
1413552600000,
1413553200000,
1413553800000,
1413554400000,
1413555000000,
1413555600000,
1413556200000,
1413556800000,
1413557400000,
1413558000000,
1413558600000,
1413559200000,
1413559800000,
1413560400000,
1413561000000,
1413561600000,
1413562200000,
1413562800000,
1413563400000,
1413564000000,
1413564600000,
1413565200000,
1413565800000,
1413566400000,
1413567000000,
1413567600000,
1413568200000,
1413568800000,
1413569400000,
1413570000000,
1413570600000,
1413571200000,
1413571800000,
1413572400000,
1413573600000,
1413574200000,
1413574800000,
1413575400000,
1413576000000,
1413576600000,
1413577200000,
1413577800000,
1413578400000,
1413579000000,
1413579600000,
1413580200000,
1413580800000,
1413581400000,
1413582000000,
1413582600000,
1413583200000,
1413583800000,
1413584400000,
1413585000000,
1413585600000,
1413586200000,
1413586800000,
],
'xAxisFormatter': function (thing) {
return moment(thing);
},
Expand Down
3 changes: 3 additions & 0 deletions src/fixtures/vislib/mock_data/filters/_columns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default {
]
}
],
'xAxisOrderedValues': ['css', 'png'],
'xAxisFormatter': function (val) {
if (_.isObject(val)) {
return JSON.stringify(val);
Expand Down Expand Up @@ -55,6 +56,7 @@ export default {
]
}
],
'xAxisOrderedValues': ['css', 'png'],
'xAxisFormatter': function (val) {
if (_.isObject(val)) {
return JSON.stringify(val);
Expand Down Expand Up @@ -89,6 +91,7 @@ export default {
]
}
],
'xAxisOrderedValues': ['css', 'png'],
'xAxisFormatter': function (val) {
if (_.isObject(val)) {
return JSON.stringify(val);
Expand Down
1 change: 1 addition & 0 deletions src/fixtures/vislib/mock_data/filters/_series.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default {
}
],
'hits': 171454,
'xAxisOrderedValues': ['css', 'html', 'png'],
'xAxisFormatter': function (val) {
if (_.isObject(val)) {
return JSON.stringify(val);
Expand Down
19 changes: 19 additions & 0 deletions src/fixtures/vislib/mock_data/histogram/_columns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,5 +345,24 @@ export default {
}
}
],
'xAxisOrderedValues': [
2147483600,
3221225400,
4294967200,
5368709100,
6442450900,
7516192700,
8589934500,
10737418200,
11811160000,
12884901800,
13958643700,
15032385500,
16106127300,
18253611000,
19327352800,
20401094600,
21474836400,
],
'hits': 40
};
Loading