-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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.
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
[Canvas] Canvas embeddable #39839
Merged
+862
−10
Merged
[Canvas] Canvas embeddable #39839
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
740454a
Adds embeddable objects to canvas
6b410d6
Merge branch 'master' into canvas-embeddable
2b10147
Merge branch 'master' into canvas-embeddable
ffb9566
Handle embeddable_api -> NewPlatform changes
c2594b9
Addressing PR feedback
16ec2c8
Merge branch 'master' into canvas-embeddable
b189037
Properly mock new platform
03c2b82
Merge branch 'master' into canvas-embeddable
fb41eb4
Snake case filenames{
93668bf
Switch relative paths to src/
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { ExpressionType } from '../../../../../../src/plugins/data/common/expressions'; | ||
import { EmbeddableInput } from '../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public'; | ||
import { EmbeddableTypes } from './embeddable_types'; | ||
|
||
export const EmbeddableExpressionType = 'embeddable'; | ||
export { EmbeddableTypes }; | ||
|
||
export interface EmbeddableExpression<Input extends EmbeddableInput> { | ||
type: typeof EmbeddableExpressionType; | ||
input: Input; | ||
embeddableType: string; | ||
} | ||
|
||
export const embeddableType = (): ExpressionType< | ||
typeof EmbeddableExpressionType, | ||
EmbeddableExpression<any> | ||
> => ({ | ||
name: EmbeddableExpressionType, | ||
to: { | ||
render: (embeddableExpression: EmbeddableExpression<any>) => { | ||
return { | ||
type: 'render', | ||
as: EmbeddableExpressionType, | ||
value: embeddableExpression, | ||
}; | ||
}, | ||
}, | ||
}); |
16 changes: 16 additions & 0 deletions
16
x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
// @ts-ignore | ||
import { MAP_SAVED_OBJECT_TYPE } from '../../../maps/common/constants'; | ||
import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable'; | ||
import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../../src/legacy/core_plugins/kibana/public/visualize/embeddable'; | ||
|
||
export const EmbeddableTypes = { | ||
map: MAP_SAVED_OBJECT_TYPE, | ||
search: SEARCH_EMBEDDABLE_TYPE, | ||
visualization: VISUALIZE_EMBEDDABLE_TYPE, | ||
}; |
11 changes: 11 additions & 0 deletions
11
x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { embeddableType } from './embeddable'; | ||
|
||
export * from './embeddable'; | ||
|
||
export const typeFunctions = [embeddableType]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/savedMap.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
jest.mock('ui/new_platform'); | ||
import { savedMap } from './savedMap'; | ||
import { buildEmbeddableFilters } from '../../../server/lib/build_embeddable_filters'; | ||
|
||
const filterContext = { | ||
and: [ | ||
{ and: [], value: 'filter-value', column: 'filter-column', type: 'exactly' }, | ||
{ | ||
and: [], | ||
column: 'time-column', | ||
type: 'time', | ||
from: '2019-06-04T04:00:00.000Z', | ||
to: '2019-06-05T04:00:00.000Z', | ||
}, | ||
], | ||
}; | ||
|
||
describe('savedMap', () => { | ||
const fn = savedMap().fn; | ||
const args = { | ||
id: 'some-id', | ||
}; | ||
|
||
it('accepts null context', () => { | ||
const expression = fn(null, args, {}); | ||
|
||
expect(expression.input.filters).toEqual([]); | ||
expect(expression.input.timeRange).toBeUndefined(); | ||
}); | ||
|
||
it('accepts filter context', () => { | ||
const expression = fn(filterContext, args, {}); | ||
const embeddableFilters = buildEmbeddableFilters(filterContext.and); | ||
|
||
expect(expression.input.filters).toEqual(embeddableFilters.filters); | ||
expect(expression.input.timeRange).toEqual(embeddableFilters.timeRange); | ||
}); | ||
}); |
68 changes: 68 additions & 0 deletions
68
x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/savedMap.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
/* | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: I'd name all these files with snake case to be consistent with the rest of the code base (looks like a mix in this folder). There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. +1 |
||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
import { Filter as ESFilterType } from '@kbn/es-query'; | ||
import { ExpressionFunction } from 'src/legacy/core_plugins/interpreter/public'; | ||
import { TimeRange } from 'ui/timefilter/time_history'; | ||
import { EmbeddableInput } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public'; | ||
import { buildEmbeddableFilters } from '../../../server/lib/build_embeddable_filters'; | ||
import { Filter } from '../../../types'; | ||
import { | ||
EmbeddableTypes, | ||
EmbeddableExpressionType, | ||
EmbeddableExpression, | ||
} from '../../expression_types'; | ||
import { getFunctionHelp } from '../../strings'; | ||
|
||
interface Arguments { | ||
id: string; | ||
} | ||
|
||
// Map embeddable is missing proper typings, so type is just to document what we | ||
// are expecting to pass to the embeddable | ||
interface SavedMapInput extends EmbeddableInput { | ||
id: string; | ||
timeRange?: TimeRange; | ||
refreshConfig: { | ||
isPaused: boolean; | ||
interval: number; | ||
}; | ||
filters: ESFilterType[]; | ||
} | ||
|
||
type Return = EmbeddableExpression<SavedMapInput>; | ||
|
||
export function savedMap(): ExpressionFunction<'savedMap', Filter | null, Arguments, Return> { | ||
const { help, args: argHelp } = getFunctionHelp().savedMap; | ||
return { | ||
name: 'savedMap', | ||
help, | ||
args: { | ||
id: { | ||
types: ['string'], | ||
required: false, | ||
help: argHelp.id, | ||
}, | ||
}, | ||
type: EmbeddableExpressionType, | ||
fn: (context, { id }) => { | ||
const filters = context ? context.and : []; | ||
|
||
return { | ||
type: EmbeddableExpressionType, | ||
input: { | ||
id, | ||
...buildEmbeddableFilters(filters), | ||
|
||
refreshConfig: { | ||
isPaused: false, | ||
interval: 0, | ||
}, | ||
}, | ||
embeddableType: EmbeddableTypes.map, | ||
}; | ||
}, | ||
}; | ||
} |
43 changes: 43 additions & 0 deletions
43
x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/savedSearch.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
jest.mock('ui/new_platform'); | ||
import { savedSearch } from './savedSearch'; | ||
import { buildEmbeddableFilters } from '../../../server/lib/build_embeddable_filters'; | ||
|
||
const filterContext = { | ||
and: [ | ||
{ and: [], value: 'filter-value', column: 'filter-column', type: 'exactly' }, | ||
{ | ||
and: [], | ||
column: 'time-column', | ||
type: 'time', | ||
from: '2019-06-04T04:00:00.000Z', | ||
to: '2019-06-05T04:00:00.000Z', | ||
}, | ||
], | ||
}; | ||
|
||
describe('savedSearch', () => { | ||
const fn = savedSearch().fn; | ||
const args = { | ||
id: 'some-id', | ||
}; | ||
|
||
it('accepts null context', () => { | ||
const expression = fn(null, args, {}); | ||
|
||
expect(expression.input.filters).toEqual([]); | ||
expect(expression.input.timeRange).toBeUndefined(); | ||
}); | ||
|
||
it('accepts filter context', () => { | ||
const expression = fn(filterContext, args, {}); | ||
const embeddableFilters = buildEmbeddableFilters(filterContext.and); | ||
|
||
expect(expression.input.filters).toEqual(embeddableFilters.filters); | ||
expect(expression.input.timeRange).toEqual(embeddableFilters.timeRange); | ||
}); | ||
}); |
50 changes: 50 additions & 0 deletions
50
x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/savedSearch.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { ExpressionFunction } from 'src/legacy/core_plugins/interpreter/public'; | ||
import { | ||
EmbeddableTypes, | ||
EmbeddableExpressionType, | ||
EmbeddableExpression, | ||
} from '../../expression_types'; | ||
|
||
import { SearchInput } from '../../../../../../../src/legacy/core_plugins/kibana/public/discover/embeddable'; | ||
import { buildEmbeddableFilters } from '../../../server/lib/build_embeddable_filters'; | ||
import { Filter } from '../../../types'; | ||
import { getFunctionHelp } from '../../strings'; | ||
|
||
interface Arguments { | ||
id: string; | ||
} | ||
|
||
type Return = EmbeddableExpression<Partial<SearchInput> & { id: SearchInput['id'] }>; | ||
|
||
export function savedSearch(): ExpressionFunction<'savedSearch', Filter | null, Arguments, Return> { | ||
const { help, args: argHelp } = getFunctionHelp().savedSearch; | ||
return { | ||
name: 'savedSearch', | ||
help, | ||
args: { | ||
id: { | ||
types: ['string'], | ||
required: false, | ||
help: argHelp.id, | ||
}, | ||
}, | ||
type: EmbeddableExpressionType, | ||
fn: (context, { id }) => { | ||
const filters = context ? context.and : []; | ||
return { | ||
type: EmbeddableExpressionType, | ||
input: { | ||
id, | ||
...buildEmbeddableFilters(filters), | ||
}, | ||
embeddableType: EmbeddableTypes.search, | ||
}; | ||
}, | ||
}; | ||
} |
43 changes: 43 additions & 0 deletions
43
x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/savedVisualization.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
jest.mock('ui/new_platform'); | ||
import { savedVisualization } from './savedVisualization'; | ||
import { buildEmbeddableFilters } from '../../../server/lib/build_embeddable_filters'; | ||
|
||
const filterContext = { | ||
and: [ | ||
{ and: [], value: 'filter-value', column: 'filter-column', type: 'exactly' }, | ||
{ | ||
and: [], | ||
column: 'time-column', | ||
type: 'time', | ||
from: '2019-06-04T04:00:00.000Z', | ||
to: '2019-06-05T04:00:00.000Z', | ||
}, | ||
], | ||
}; | ||
|
||
describe('savedVisualization', () => { | ||
const fn = savedVisualization().fn; | ||
const args = { | ||
id: 'some-id', | ||
}; | ||
|
||
it('accepts null context', () => { | ||
const expression = fn(null, args, {}); | ||
|
||
expect(expression.input.filters).toEqual([]); | ||
expect(expression.input.timeRange).toBeUndefined(); | ||
}); | ||
|
||
it('accepts filter context', () => { | ||
const expression = fn(filterContext, args, {}); | ||
const embeddableFilters = buildEmbeddableFilters(filterContext.and); | ||
|
||
expect(expression.input.filters).toEqual(embeddableFilters.filters); | ||
expect(expression.input.timeRange).toEqual(embeddableFilters.timeRange); | ||
}); | ||
}); |
54 changes: 54 additions & 0 deletions
54
x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/savedVisualization.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
import { ExpressionFunction } from 'src/legacy/core_plugins/interpreter/public'; | ||
import { | ||
EmbeddableTypes, | ||
EmbeddableExpressionType, | ||
EmbeddableExpression, | ||
} from '../../expression_types'; | ||
import { VisualizeInput } from '../../../../../../../src/legacy/core_plugins/kibana/public/visualize/embeddable'; | ||
import { buildEmbeddableFilters } from '../../../server/lib/build_embeddable_filters'; | ||
import { Filter } from '../../../types'; | ||
import { getFunctionHelp } from '../../strings'; | ||
|
||
interface Arguments { | ||
id: string; | ||
} | ||
|
||
type Return = EmbeddableExpression<VisualizeInput>; | ||
|
||
export function savedVisualization(): ExpressionFunction< | ||
'savedVisualization', | ||
Filter | null, | ||
Arguments, | ||
Return | ||
> { | ||
const { help, args: argHelp } = getFunctionHelp().savedVisualization; | ||
return { | ||
name: 'savedVisualization', | ||
help, | ||
args: { | ||
id: { | ||
types: ['string'], | ||
required: false, | ||
help: argHelp.id, | ||
}, | ||
}, | ||
type: EmbeddableExpressionType, | ||
fn: (context, { id }) => { | ||
const filters = context ? context.and : []; | ||
|
||
return { | ||
type: EmbeddableExpressionType, | ||
input: { | ||
id, | ||
...buildEmbeddableFilters(filters), | ||
}, | ||
embeddableType: EmbeddableTypes.visualization, | ||
}; | ||
}, | ||
}; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Webpack creates an alias for these that allow you to remove the leading
../
. For example:https://github.com/elastic/kibana/blob/master/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/location.ts#L7
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did changing this to
src/plugins/data/common/expressions
not work for you?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, the alias works here, but there are some other files where it does not appear to work, the
embeddable_types
file that is in the same directory as this file for instance gives module not found errors when using thesrc/legacy/...
path instead of the full relative path. So I'm just unsure when and when to not do relative paths. I've fixed all the paths that don't cause errors when changing them to use the alias.