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

[lens] Improve suggestions for split series #42052

Merged
merged 14 commits into from
Aug 2, 2019
Merged

[lens] Improve suggestions for split series #42052

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2ce3709
improve suggestions
flash1293 Jul 26, 2019
9ae245e
Merge branch 'feature/lens' into lens/splitseries-suggestions
flash1293 Jul 26, 2019
5b2a81a
clean up
flash1293 Jul 29, 2019
e6e4884
Merge branch 'feature/lens' into lens/splitseries-suggestions
flash1293 Jul 29, 2019
04dc964
Merge branch 'feature/lens' into lens/splitseries-suggestions
flash1293 Jul 30, 2019
d67ed9b
Merge branch 'feature/lens' into lens/splitseries-suggestions
flash1293 Jul 30, 2019
4c31031
review fixes and code refactoring
flash1293 Jul 31, 2019
4c091e2
fix type errors
flash1293 Jul 31, 2019
5fc23ed
fix unit test
flash1293 Jul 31, 2019
bbb4f12
pull indexpatternid into the dragging context
flash1293 Aug 1, 2019
fcd8cea
fix tests
flash1293 Aug 1, 2019
b374390
fix metric column building
flash1293 Aug 1, 2019
6148bdf
actually drag new draggedfield object type
flash1293 Aug 1, 2019
66e5ab4
remove comment
flash1293 Aug 2, 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
27 changes: 27 additions & 0 deletions x-pack/legacy/plugins/lens/public/indexpattern_plugin/__mocks__/loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,42 @@ export function getIndexPatterns() {
type: 'date',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'start_date',
type: 'date',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'memory',
type: 'number',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'source',
type: 'string',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'dest',
type: 'string',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
],
},
Expand All @@ -42,18 +66,21 @@ export function getIndexPatterns() {
type: 'date',
aggregatable: true,
searchable: true,
indexPatternId: '2',
},
{
name: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
indexPatternId: '2',
},
{
name: 'source',
type: 'string',
aggregatable: true,
searchable: true,
indexPatternId: '2',
},
],
typeMeta: {
Expand Down
8 changes: 8 additions & 0 deletions x-pack/legacy/plugins/lens/public/indexpattern_plugin/datapanel.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,30 +51,35 @@ const initialState: IndexPatternPrivateState = {
type: 'date',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'memory',
type: 'number',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'unsupported',
type: 'geo',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'source',
type: 'string',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
],
},
Expand All @@ -88,6 +93,7 @@ const initialState: IndexPatternPrivateState = {
type: 'date',
aggregatable: true,
searchable: true,
indexPatternId: '2',
aggregationRestrictions: {
date_histogram: {
agg: 'date_histogram',
Expand All @@ -102,6 +108,7 @@ const initialState: IndexPatternPrivateState = {
type: 'number',
aggregatable: true,
searchable: true,
indexPatternId: '2',
aggregationRestrictions: {
histogram: {
agg: 'histogram',
Expand All @@ -126,6 +133,7 @@ const initialState: IndexPatternPrivateState = {
type: 'string',
aggregatable: true,
searchable: true,
indexPatternId: '2',
aggregationRestrictions: {
terms: {
agg: 'terms',
Expand Down
29 changes: 28 additions & 1 deletion ...k/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,28 @@ const expectedIndexPatterns = {
type: 'date',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'bytes',
type: 'number',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'memory',
type: 'number',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
{
name: 'source',
type: 'string',
aggregatable: true,
searchable: true,
indexPatternId: '1',
},
],
},
Expand Down Expand Up @@ -798,6 +802,7 @@ describe('IndexPatternDimensionPanel', () => {
name: 'bar',
searchable: true,
type: 'number',
indexPatternId: 'foo',
},
],
},
Expand Down Expand Up @@ -889,7 +894,7 @@ describe('IndexPatternDimensionPanel', () => {
{...defaultProps}
dragDropContext={{
...dragDropContext,
dragging: { type: 'number', name: 'bar' },
dragging: { type: 'number', name: 'bar', indexPatternId: 'foo' },
}}
state={dragDropState()}
filterOperations={op => op.dataType === 'number'}
Expand All @@ -905,6 +910,28 @@ describe('IndexPatternDimensionPanel', () => {
).toBeTruthy();
});

it('is notdroppable if the field belongs to another index pattern', () => {
wrapper = shallow(
<IndexPatternDimensionPanel
{...defaultProps}
dragDropContext={{
...dragDropContext,
dragging: { type: 'number', name: 'bar', indexPatternId: 'foo2' },
}}
state={dragDropState()}
filterOperations={op => op.dataType === 'number'}
layerId="myLayer"
/>
);

expect(
wrapper
.find('[data-test-subj="indexPattern-dropTarget"]')
.first()
.prop('droppable')
).toBeFalsy();
});

it('appends the dropped column when a field is dropped', () => {
const dragging = { type: 'number', name: 'bar' };
const testState = dragDropState();
Expand Down
13 changes: 10 additions & 3 deletions x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { getAvailableOperationsByMetadata, buildColumn } from '../operations';
import { PopoverEditor } from './popover_editor';
import { DragContextState, ChildDragDropProvider, DragDrop } from '../../drag_drop';
import { changeColumn, deleteColumn } from '../state_helpers';
import { isIndexPatternField } from '../utils';

export type IndexPatternDimensionPanelProps = DatasourceDimensionPanelProps & {
state: IndexPatternPrivateState;
Expand Down Expand Up @@ -87,9 +88,13 @@ export const IndexPatternDimensionPanel = memo(function IndexPatternDimensionPan

function canHandleDrop() {
const { dragging } = props.dragDropContext;
const field = dragging as IndexPatternField;
const layerIndexPatternId = props.state.layers[props.layerId].indexPatternId;

return !!field && !!field.type && !!hasOperationForField(field as IndexPatternField);
return (
isIndexPatternField(dragging) &&
layerIndexPatternId === dragging.indexPatternId &&
Boolean(hasOperationForField(dragging))
);
}

return (
Expand All @@ -99,7 +104,9 @@ export const IndexPatternDimensionPanel = memo(function IndexPatternDimensionPan
data-test-subj="indexPattern-dropTarget"
droppable={canHandleDrop()}
onDrop={field => {
if (!hasOperationForField(field as IndexPatternField)) {
const column = isIndexPatternField(field) && hasOperationForField(field);

if (!column) {
// TODO: What do we do if we couldn't find a column?
return;
}
Expand Down
Loading