-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Canvas] Add Lens embeddables (#57499)
* Added lens embeddables to embed flyout Fixed import embedded panel styles (#58654) Merging to WIP draft branch * Added i18n strings for savedLens * Added tests for lens embeddables * Updated tests * Updated tests * Added style overrides for lens table * DDisables triggers on lens emebeddable * Updated test * Sets embeddable view mode according to app state * Fix embeddable component * Removed embeddable view mode logic * Removed unused import
- Loading branch information
Showing
15 changed files
with
282 additions
and
7 deletions.
There are no files selected for viewing
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
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/saved_lens.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 { savedLens } from './saved_lens'; | ||
import { getQueryFilters } from '../../../public/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('savedLens', () => { | ||
const fn = savedLens().fn; | ||
const args = { | ||
id: 'some-id', | ||
title: null, | ||
timerange: null, | ||
}; | ||
|
||
it('accepts null context', () => { | ||
const expression = fn(null, args, {} as any); | ||
|
||
expect(expression.input.filters).toEqual([]); | ||
}); | ||
|
||
it('accepts filter context', () => { | ||
const expression = fn(filterContext, args, {} as any); | ||
const embeddableFilters = getQueryFilters(filterContext.and); | ||
|
||
expect(expression.input.filters).toEqual(embeddableFilters); | ||
}); | ||
}); |
83 changes: 83 additions & 0 deletions
83
x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.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,83 @@ | ||
/* | ||
* 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 { ExpressionFunctionDefinition } from 'src/plugins/expressions/common'; | ||
import { TimeRange } from 'src/plugins/data/public'; | ||
import { EmbeddableInput } from 'src/legacy/core_plugins/embeddable_api/public/np_ready/public'; | ||
import { getQueryFilters } from '../../../public/lib/build_embeddable_filters'; | ||
import { Filter, TimeRange as TimeRangeArg } from '../../../types'; | ||
import { | ||
EmbeddableTypes, | ||
EmbeddableExpressionType, | ||
EmbeddableExpression, | ||
} from '../../expression_types'; | ||
import { getFunctionHelp } from '../../../i18n'; | ||
import { Filter as DataFilter } from '../../../../../../../src/plugins/data/public'; | ||
|
||
interface Arguments { | ||
id: string; | ||
title: string | null; | ||
timerange: TimeRangeArg | null; | ||
} | ||
|
||
export type SavedLensInput = EmbeddableInput & { | ||
id: string; | ||
timeRange?: TimeRange; | ||
filters: DataFilter[]; | ||
}; | ||
|
||
const defaultTimeRange = { | ||
from: 'now-15m', | ||
to: 'now', | ||
}; | ||
|
||
type Return = EmbeddableExpression<SavedLensInput>; | ||
|
||
export function savedLens(): ExpressionFunctionDefinition< | ||
'savedLens', | ||
Filter | null, | ||
Arguments, | ||
Return | ||
> { | ||
const { help, args: argHelp } = getFunctionHelp().savedLens; | ||
return { | ||
name: 'savedLens', | ||
help, | ||
args: { | ||
id: { | ||
types: ['string'], | ||
required: false, | ||
help: argHelp.id, | ||
}, | ||
timerange: { | ||
types: ['timerange'], | ||
help: argHelp.timerange, | ||
required: false, | ||
}, | ||
title: { | ||
types: ['string'], | ||
help: argHelp.title, | ||
required: false, | ||
}, | ||
}, | ||
type: EmbeddableExpressionType, | ||
fn: (context, args) => { | ||
const filters = context ? context.and : []; | ||
|
||
return { | ||
type: EmbeddableExpressionType, | ||
input: { | ||
id: args.id, | ||
filters: getQueryFilters(filters), | ||
timeRange: args.timerange || defaultTimeRange, | ||
title: args.title ? args.title : undefined, | ||
disableTriggers: true, | ||
}, | ||
embeddableType: EmbeddableTypes.lens, | ||
}; | ||
}, | ||
}; | ||
} |
33 changes: 33 additions & 0 deletions
33
x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.scss
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,33 @@ | ||
.canvasEmbeddable { | ||
.embPanel { | ||
border: none; | ||
background: none; | ||
|
||
.embPanel__title { | ||
margin-bottom: $euiSizeXS; | ||
} | ||
|
||
.embPanel__optionsMenuButton { | ||
border-radius: $euiBorderRadius; | ||
} | ||
|
||
.canvas-isFullscreen & { | ||
.embPanel__optionsMenuButton { | ||
opacity: 0; | ||
} | ||
|
||
&:focus .embPanel__optionsMenuButton, | ||
&:hover .embPanel__optionsMenuButton { | ||
opacity: 1; | ||
} | ||
} | ||
} | ||
|
||
.euiTable { | ||
background: none; | ||
} | ||
|
||
.lnsExpressionRenderer { | ||
@include euiScrollBar; | ||
} | ||
} |
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
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
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
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
27 changes: 27 additions & 0 deletions
27
x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_lens.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,27 @@ | ||
/* | ||
* 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 { i18n } from '@kbn/i18n'; | ||
import { savedLens } from '../../../canvas_plugin_src/functions/common/saved_lens'; | ||
import { FunctionHelp } from '../function_help'; | ||
import { FunctionFactory } from '../../../types'; | ||
|
||
export const help: FunctionHelp<FunctionFactory<typeof savedLens>> = { | ||
help: i18n.translate('xpack.canvas.functions.savedLensHelpText', { | ||
defaultMessage: `Returns an embeddable for a saved lens object`, | ||
}), | ||
args: { | ||
id: i18n.translate('xpack.canvas.functions.savedLens.args.idHelpText', { | ||
defaultMessage: `The ID of the Saved Lens Object`, | ||
}), | ||
timerange: i18n.translate('xpack.canvas.functions.savedLens.args.timerangeHelpText', { | ||
defaultMessage: `The timerange of data that should be included`, | ||
}), | ||
title: i18n.translate('xpack.canvas.functions.savedLens.args.titleHelpText', { | ||
defaultMessage: `The title for the lens emebeddable`, | ||
}), | ||
}, | ||
}; |
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
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
Oops, something went wrong.