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] Add chart switcher #42093

Merged
merged 20 commits into from
Aug 2, 2019
Merged

[lens] Add chart switcher #42093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c9699f2
Add global chart switcher
chrisdavies Jul 26, 2019
f4044b1
Merge upstream
chrisdavies Jul 26, 2019
ed234e0
Remove horizontal bars
chrisdavies Jul 26, 2019
9549e2c
Fix tests
chrisdavies Jul 26, 2019
c780993
Add chart switching confirmation dialog
chrisdavies Jul 26, 2019
a24956f
Fix tests
chrisdavies Jul 26, 2019
14c3a60
Minor tweaks
chrisdavies Jul 26, 2019
b9bf6c1
Add visualization switcher tests
chrisdavies Jul 26, 2019
9ae5966
Merge branch 'feature/lens' into lens/switch-charts
flash1293 Jul 29, 2019
f7a3ef4
remove duplicated imports
flash1293 Jul 29, 2019
87c143f
cleanup WIP
flash1293 Jul 29, 2019
2195b0e
cleanup #2
flash1293 Jul 30, 2019
c519aed
fix tests and add choose behavior
flash1293 Jul 30, 2019
0b5f4e6
Merge branch 'feature/lens' into lens/switch-charts
flash1293 Jul 30, 2019
2f5fdec
change user flow
flash1293 Jul 30, 2019
0f1a324
fix review comments and rename component
flash1293 Jul 31, 2019
5454503
initially focus chart switch popover
flash1293 Aug 1, 2019
36f4d61
improve default series type
flash1293 Aug 2, 2019
74a2edf
Merge remote-tracking branch 'upstream/feature/lens' into lens/switch…
flash1293 Aug 2, 2019
6610ea7
fix type bug
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
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export class AppPlugin {
const editorFrame = editorFrameSetup();

editorFrame.registerDatasource('indexpattern', indexPattern);
editorFrame.registerVisualization('xy', xyVisualization);
editorFrame.registerVisualization('datatable', datatableVisualization);
editorFrame.registerVisualization(xyVisualization);
editorFrame.registerVisualization(datatableVisualization);

this.instance = editorFrame.createInstance({});

Expand Down
8 changes: 4 additions & 4 deletions x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jest.mock('../id_generator');
function mockFrame(): FramePublicAPI {
return {
addNewLayer: () => 'aaa',
removeLayer: () => {},
removeLayers: () => {},
datasourceLayers: {},
};
}
Expand Down Expand Up @@ -77,7 +77,7 @@ describe('Datatable Visualization', () => {
dragDropContext={{ dragging: undefined, setDragging: () => {} }}
frame={{
addNewLayer: jest.fn(),
removeLayer: jest.fn(),
removeLayers: jest.fn(),
datasourceLayers: { a: datasource.publicAPIMock },
}}
layer={layer}
Expand Down Expand Up @@ -115,7 +115,7 @@ describe('Datatable Visualization', () => {
dragDropContext={{ dragging: undefined, setDragging: () => {} }}
frame={{
addNewLayer: jest.fn(),
removeLayer: jest.fn(),
removeLayers: jest.fn(),
datasourceLayers: { a: datasource.publicAPIMock },
}}
layer={layer}
Expand Down Expand Up @@ -151,7 +151,7 @@ describe('Datatable Visualization', () => {
dragDropContext={{ dragging: undefined, setDragging: () => {} }}
frame={{
addNewLayer: jest.fn(),
removeLayer: jest.fn(),
removeLayers: jest.fn(),
datasourceLayers: { a: datasource.publicAPIMock },
}}
layer={layer}
Expand Down
25 changes: 24 additions & 1 deletion x-pack/legacy/plugins/lens/public/datatable_visualization_plugin/visualization.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,29 @@ export const datatableVisualization: Visualization<
DatatableVisualizationState,
DatatableVisualizationState
> = {
id: 'lnsDatatable',

visualizationTypes: [
{
id: 'lnsDatatable',
icon: 'visTable',
label: i18n.translate('xpack.lens.datatable.label', {
defaultMessage: 'Datatable',
}),
},
],

getDescription(state) {
return {
icon: 'empty',
label: i18n.translate('xpack.lens.datatable.label', {
defaultMessage: 'Datatable',
}),
};
},

switchVisualizationType: (_, state) => state,

initialize(frame, state) {
const layerId = Object.keys(frame.datasourceLayers)[0] || frame.addNewLayer();
return (
Expand Down Expand Up @@ -137,7 +160,7 @@ export const datatableVisualization: Visualization<
<I18nProvider>
<EuiForm className="lnsConfigPanel">
{props.state.layers.map(layer => (
<DataTableLayer layer={layer} {...props} />
<DataTableLayer key={layer.layerId} layer={layer} {...props} />
))}
</EuiForm>
</I18nProvider>,
Expand Down
Loading