Skip to content

Commit

Permalink
[Lens] revert Select line chart by default if the x-axis contains a t…
Browse files Browse the repository at this point in the history
…imestamp (elastic#198555)

Reverts https://github.com/elastic/kibana/pull/190786/files

---------

Co-authored-by: Marco Vettorello <[email protected]>
  • Loading branch information
mbondyra and markov00 authored Nov 4, 2024
1 parent 5721de7 commit d117141
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ describe('xy_suggestions', () => {
expect((suggestions[0].state.layers[0] as XYDataLayerConfig).seriesType).toEqual('line');
});

test('suggests line if changeType is initial and date column is involved', () => {
test('suggests bar if changeType is initial and date column is involved', () => {
const currentState: XYState = {
legend: { isVisible: true, position: 'bottom' },
valueLabels: 'hide',
Expand Down Expand Up @@ -885,8 +885,8 @@ describe('xy_suggestions', () => {
expect(suggestions).toHaveLength(1);

expect(suggestions[0].hide).toEqual(false);
expect(suggestions[0].state.preferredSeriesType).toEqual('line');
expect((suggestions[0].state.layers[0] as XYDataLayerConfig).seriesType).toEqual('line');
expect(suggestions[0].state.preferredSeriesType).toEqual('bar_stacked');
expect((suggestions[0].state.layers[0] as XYDataLayerConfig).seriesType).toEqual('bar_stacked');
});

test('makes a visible seriesType suggestion for unchanged table without split', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,6 @@ function getSuggestionsForLayer({
allowMixed,
};

if (changeType === 'initial' && xValue?.operation.dataType === 'date') {
return buildSuggestion({ ...options, seriesType: 'line' });
}
// handles the simplest cases, acting as a chart switcher
if (!currentState && changeType === 'unchanged') {
// Chart switcher needs to include every chart type
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
await testSubjects.click('fieldToggle-DistanceKilometers');

const data = await lens.getCurrentChartDebugState('xyVisChart');
assertMatchesExpectedData(data, [expectedLogstashData, expectedFlightsData], 'lines');
assertMatchesExpectedData(data, [expectedLogstashData, expectedFlightsData]);
});

it('ignores global filters on layers using a data view without the filter field', async () => {
await filterBar.addFilter({ field: 'Carrier', operation: 'exists' });
const data = await lens.getCurrentChartDebugState('xyVisChart');
assertMatchesExpectedData(data, [expectedLogstashData, expectedFlightsData], 'lines');
assertMatchesExpectedData(data, [expectedLogstashData, expectedFlightsData]);
await lens.save(visTitle);
});

Expand All @@ -120,7 +120,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {

await visualize.openSavedVisualization(visTitle);
const data = await lens.getCurrentChartDebugState('xyVisChart');
assertMatchesExpectedData(data, [expectedFlightsData], 'lines');
assertMatchesExpectedData(data, [expectedFlightsData]);
});
});
}

0 comments on commit d117141

Please sign in to comment.