github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixing disabled aggs (#18796) (#19171)

Browse source
This commit is contained in:
Peter Pisljar 2018-05-17 09:30:12 -05:00 • committed by GitHub
parent ef9faaac7c
commit b73f00538f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
View file

@ -78,17 +78,6 @@ uiModules
self.searchSource.size(0);
return self.vis ? self._updateVis() : self._createVis();
})
.then(function () {
self.searchSource.onRequestStart((searchSource, searchRequest) => {
return self.vis.onSearchRequestStart(searchSource, searchRequest);
});
self.searchSource.aggs(function () {
return self.vis.aggs.toDsl();
});
return self;
});
};

1
src/ui/public/vis/editors/default/agg.html
View file

@ -37,6 +37,7 @@
aria-label="Disable aggregation"
tooltip="Disable aggregation"
tooltip-append-to-body="true"
data-test-subj="disableAggregationBtn"
type="button"
class="kuiButton kuiButton--basic kuiButton--small">
<i aria-hidden="true" class="fa fa-toggle-on"></i>

2
src/ui/public/vis/editors/default/agg_group.html
View file

@ -5,7 +5,7 @@
<div ng-class="groupName" draggable-container="group" class="vis-editor-agg-group">
<!-- wrapper needed for nesting-indicator -->
<div ng-repeat="agg in group track by agg.id" draggable-item="agg" class="vis-editor-agg-wrapper">
<div ng-repeat="agg in group track by agg.id" data-test-subj="aggregationEditor{{agg.id}}" draggable-item="agg" class="vis-editor-agg-wrapper">
<!-- agg.html - controls for aggregation -->
<ng-form vis-editor-agg name="aggForm" class="vis-editor-agg"></ng-form>
</div>

12
src/ui/public/vis/request_handlers/courier.js
View file

@ -61,6 +61,14 @@ const CourierRequestHandlerProvider = function (Private, courier, timefilter) {
}
});
requestSearchSource.aggs(function () {
return vis.getAggConfig().toDsl();
});
requestSearchSource.onRequestStart((searchSource, searchRequest) => {
return vis.onSearchRequestStart(searchSource, searchRequest);
});
// Add the explicit passed timeRange as a filter to the requestSearchSource.
requestSearchSource.filter(() => {
return timefilter.get(searchSource.index(), timeRange);
@ -77,7 +85,7 @@ const CourierRequestHandlerProvider = function (Private, courier, timefilter) {
if (!searchSource.lastQuery || vis.reload) return true;
if (!_.isEqual(_.cloneDeep(searchSource.get('filter')), searchSource.lastQuery.filter)) return true;
if (!_.isEqual(_.cloneDeep(searchSource.get('query')), searchSource.lastQuery.query)) return true;
if (!_.isEqual(calculateObjectHash(vis.aggs.getRequestAggs()), searchSource.lastQuery.aggs)) return true;
if (!_.isEqual(calculateObjectHash(vis.getAggConfig()), searchSource.lastQuery.aggs)) return true;
if (!_.isEqual(_.cloneDeep(timeRange), searchSource.lastQuery.timeRange)) return true;
return false;
@ -90,7 +98,7 @@ const CourierRequestHandlerProvider = function (Private, courier, timefilter) {
searchSource.lastQuery = {
filter: _.cloneDeep(searchSource.get('filter')),
query: _.cloneDeep(searchSource.get('query')),
aggs: calculateObjectHash(vis.aggs.getRequestAggs()),
aggs: calculateObjectHash(vis.getAggConfig()),
timeRange: _.cloneDeep(timeRange)
};

23
test/functional/apps/visualize/_vertical_bar_chart.js
View file

@ -9,7 +9,7 @@ export default function ({ getService, getPageObjects }) {
const fromTime = '2015-09-19 06:31:44.000';
const toTime = '2015-09-23 18:31:44.000';
beforeEach(function () {
const initBarChart = () => {
log.debug('navigateToApp visualize');
return PageObjects.common.navigateToUrl('visualize', 'new')
.then(function () {
@ -45,11 +45,13 @@ export default function ({ getService, getPageObjects }) {
.then(function waitForVisualization() {
return PageObjects.visualize.waitForVisualization();
});
});
};
describe('vertical bar chart', function indexPatternCreation() {
const vizName1 = 'Visualization VerticalBarChart';
before(initBarChart);
it('should save and load', function () {
return PageObjects.visualize.saveVisualization(vizName1)
.then(() => {
@ -120,6 +122,8 @@ export default function ({ getService, getPageObjects }) {
});
describe('vertical bar with split series', function () {
before(initBarChart);
it('should show correct series', async function () {
await PageObjects.visualize.toggleOpenEditor(2, 'false');
await PageObjects.visualize.clickAddBucket();
@ -139,6 +143,8 @@ export default function ({ getService, getPageObjects }) {
});
describe('vertical bar with multiple splits', function () {
before(initBarChart);
it('should show correct series', async function () {
await PageObjects.visualize.toggleOpenEditor(2, 'false');
await PageObjects.visualize.clickAddBucket();
@ -166,9 +172,21 @@ export default function ({ getService, getPageObjects }) {
const legendEntries = await PageObjects.visualize.getLegendEntries();
expect(legendEntries).to.eql(expectedEntries);
});
it('should show correct series when disabling first agg', async function () {
await PageObjects.visualize.toggleDisabledAgg(3);
await PageObjects.visualize.clickGo();
await PageObjects.header.waitUntilLoadingHasFinished();
const expectedEntries = [ 'win 8', 'win xp', 'ios', 'osx', 'win 7' ];
const legendEntries = await PageObjects.visualize.getLegendEntries();
expect(legendEntries).to.eql(expectedEntries);
});
});
describe('vertical bar with derivative', function () {
before(initBarChart);
it('should show correct series', async function () {
await PageObjects.visualize.toggleOpenEditor(2, 'false');
await PageObjects.visualize.toggleOpenEditor(1);
@ -186,6 +204,7 @@ export default function ({ getService, getPageObjects }) {
const legendEntries = await PageObjects.visualize.getLegendEntries();
expect(legendEntries).to.eql(expectedEntries);
});
});
});
}

4
test/functional/page_objects/visualize_page.js
View file

@ -520,6 +520,10 @@ export function VisualizePageProvider({ getService, getPageObjects }) {
await input.type(newValue);
}
async toggleDisabledAgg(agg) {
await testSubjects.click(`aggregationEditor${agg} disableAggregationBtn`);
}
async toggleOtherBucket() {
return await find.clickByCssSelector('input[name="showOther"]');
}