[Maps] Separate layer wizards for Clusters and heatmap #60870

nreese · 2020-03-22T15:08:09Z

This PR decouples sources from layer creation wizard by removing ALL_SOURCES and replacing it with source_registry and layer_wizard_registry. This will enable the following longer term goals:

Allow layer creation to be based on user task and not source implementation. For example, having a layer creation wizard for choropleth maps or ECS use case.
Allow 3rd party plugins to registry sources and layer creation wizards
licensed sources
hierarchical ordering of Add layer so users do not see all options in ever growing unmanageable list.

This PR tried to limit the scope of the changes and did not refactor things like SourceSelect and SourceEditor which should be refactored to accomplish the above goals. This PR only tried to establish the basic registries.

…urces

jsanz

tested locally on Chromium and Firefox, all layers work as expected.

A very much needed change in the UI; this is a great!! 🌈

nreese · 2020-03-23T20:23:08Z

@elasticmachine merge upstream

thomasneirynck

Splitting out heatmap is perfect. It will surface this functionality so much easier.

Most of the feedback is around scope. Ping to discuss.

x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js

x-pack/legacy/plugins/maps/public/layers/layer_wizard_registry.ts

thomasneirynck · 2020-03-26T15:30:28Z

x-pack/legacy/plugins/maps/public/layers/sources/source_registry.ts

@@ -0,0 +1,35 @@
+/*


There is forward-thinking reasoning behind introducing the source-registry, that this could serve as an extension for 3rd party plugins to register custom sources.

But this isn't strictly necessary to achieve what we need in the short term:

in this PR, to enable the split between clusters/heatmaps

going forward to the more generic "curated layers" concept

I'm thinking we could drop this introduction from this PR as it just introduces additional abstractions.

source_registry is needed because layer_wizard_registry does not correlate one-to-one with sources. For example, there are 2 wizards that return geo_grid source.

all_sources is clunky and will not support or future needs.

thomasneirynck · 2020-03-26T15:31:49Z

x-pack/legacy/plugins/maps/public/selectors/map_selectors.js

@@ -48,16 +48,6 @@ function createLayerInstance(layerDescriptor, inspectorAdapters) {
  }
 }

-function createSourceInstance(sourceDescriptor, inspectorAdapters) {


see other comment. This source-registry isn't strictly necessary. We'd just have a very long switch-case statement here to instantiate the right source.

…map2

nreese · 2020-03-30T14:17:44Z

@elasticmachine merge upstream

thomasneirynck

As discussed offline:

keep source-registry. It's an extention-path we will want to introduce later anyway.
remove ordering-param and replace it with module that registers source in desired order.
- this does not distribute ordering-info across multiple modules.
- we're not 100% sure yet how to evolve ordering-mechanism anyway, especially in context of upcoming hierarchical layer-wizards. Also, 3rd party extension likely will not be able to interject their own source into the default offerings anyway, and will need to use a different mechanism.

thomasneirynck

Really neat. This cluster/heatmap split is better than what there is now, and it will only get better as this concept of curated wizards evolves.

Most of my comments are suggestions to reduce the footprint of new boilerplate when it's not strictly necessary.

x-pack/legacy/plugins/maps/public/layers/sources/source_registry.ts

x-pack/plugins/maps/common/constants.ts

x-pack/legacy/plugins/maps/public/layers/layer_wizard_registry.ts

x-pack/legacy/plugins/maps/public/layers/sources/source_registry.ts

...egacy/plugins/maps/public/connected_components/layer_addpanel/source_select/source_select.js

x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/source_editor/view.js

x-pack/legacy/plugins/maps/public/layers/layer_wizard_registry.ts

…map2

thomasneirynck

🎩

nreese · 2020-04-02T00:27:32Z

@elasticmachine merge upstream

kibanamachine · 2020-04-02T02:10:02Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: 8f1e608

History

💛 Build #38007 was flaky 0d4390f
💔 Build #37999 failed c3e723c
💔 Build #37333 failed ea74cc0
💔 Build #37286 failed 6106868
💛 Build #37145 was flaky 36b256d

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

* [Maps] source registry and register seperate clusters and heat map sources * split into to registries * add EMS file source * add geojson upload layer * register rest of sources * i18n changes * ts lint errors * fix jest test * fix pew-pew source * review feedback * import registires in plugin so they exist in embeddable * remove order parameter and move all layer registies into single file * fix functionalt est * pass constructor to sourceREgistry instead of factory * review feedback Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

* master: [HomeApp] Set breadcrumbs when coming back from add data dir (elastic#62186) [Lens] fix error for minInterval>computedInterval for XYChart (elastic#61931) ci: remove AppArch label from ProBot path-labeler (elastic#62211) [Uptime] Optimize get latest monitor API (elastic#61820) [Maps] Separate layer wizards for Clusters and heatmap (elastic#60870) Remove polling delay (elastic#62099) accessibility tests for dashboard panel ( OSS) (elastic#62055) rename README.md to readme, avoiding issues with case change [SIEM] [Detection Engine] Fixes all rules sorting (elastic#62039) [SIEM] CASES Bugs BC2 (elastic#62170) Revert "Endpoint: Add ts-node dev dependency (elastic#61884)" (elastic#62197) Closes elastic#60173 by turning off client caching for the main service map API call (elastic#62111) [SIEM] Restores the _External alert count_ widget's subtitle (elastic#62094) [Maps] Update ems client dependency to 7.8.0 (elastic#62181) [Metrics Alerts] Fix action variables, default message, and EU… (elastic#62061) Update CODEOWNERS with ES-UI apps, including grok debugger. (elastic#62045) Update ILM node attributes blacklist. (elastic#62093)

* [Maps] source registry and register seperate clusters and heat map sources * split into to registries * add EMS file source * add geojson upload layer * register rest of sources * i18n changes * ts lint errors * fix jest test * fix pew-pew source * review feedback * import registires in plugin so they exist in embeddable * remove order parameter and move all layer registies into single file * fix functionalt est * pass constructor to sourceREgistry instead of factory * review feedback Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

nreese added 6 commits March 22, 2020 08:32

[Maps] source registry and register seperate clusters and heat map so…

126a8d3

…urces

split into to registries

a82118e

add EMS file source

b8f93f1

add geojson upload layer

3b4e24a

register rest of sources

ebf80e6

i18n changes

e17c890

nreese added release_note:enhancement [Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v8.0.0 v7.7.0 labels Mar 22, 2020

nreese requested review from jsanz and thomasneirynck March 22, 2020 15:08

nreese requested a review from a team as a code owner March 22, 2020 15:08

nreese added 3 commits March 22, 2020 09:56

ts lint errors

984d59a

fix jest test

e3c9c45

fix pew-pew source

6036151

jsanz reviewed Mar 23, 2020

View reviewed changes

Merge branch 'master' into clusters_heatmap2

59718c7

nreese mentioned this pull request Mar 23, 2020

[Maps] Define and document a public maps plugin API for creating custom sources and layers #60918

Closed

thomasneirynck added v7.8.0 and removed v7.7.0 labels Mar 25, 2020

thomasneirynck reviewed Mar 26, 2020

View reviewed changes

nreese added 4 commits March 27, 2020 08:28

Merge branch 'master' of github.com:elastic/kibana into clusters_heat…

f40184d

…map2

Merge branch 'master' of github.com:elastic/kibana into clusters_heat…

6c19cdd

…map2

review feedback

26c19ce

import registires in plugin so they exist in embeddable

903c682

nreese requested a review from thomasneirynck March 27, 2020 23:20

Merge branch 'master' into clusters_heatmap2

36b256d

thomasneirynck reviewed Mar 30, 2020

View reviewed changes

remove order parameter and move all layer registies into single file

6106868

nreese requested a review from thomasneirynck March 30, 2020 20:12

thomasneirynck reviewed Mar 30, 2020

View reviewed changes

nreese added 4 commits March 30, 2020 15:59

fix functionalt est

819003a

pass constructor to sourceREgistry instead of factory

ea74cc0

Merge branch 'master' of github.com:elastic/kibana into clusters_heat…

c3e723c

…map2

review feedback

0d4390f

nreese requested a review from thomasneirynck April 1, 2020 21:37

thomasneirynck approved these changes Apr 1, 2020

View reviewed changes

Merge branch 'master' into clusters_heatmap2

8f1e608

nreese merged commit 467f27b into elastic:master Apr 2, 2020

nreese mentioned this pull request Apr 2, 2020

[7.x] [Maps] Separate layer wizards for Clusters and heatmap (#60870) #62254

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Maps] Separate layer wizards for Clusters and heatmap #60870

[Maps] Separate layer wizards for Clusters and heatmap #60870

nreese commented Mar 22, 2020 •

edited

Loading

jsanz left a comment

nreese commented Mar 23, 2020

thomasneirynck left a comment

thomasneirynck Mar 26, 2020

nreese Mar 26, 2020

thomasneirynck Mar 26, 2020

nreese commented Mar 30, 2020

thomasneirynck left a comment

thomasneirynck left a comment

thomasneirynck left a comment

nreese commented Apr 2, 2020

kibanamachine commented Apr 2, 2020

[Maps] Separate layer wizards for Clusters and heatmap #60870

[Maps] Separate layer wizards for Clusters and heatmap #60870

Conversation

nreese commented Mar 22, 2020 • edited Loading

jsanz left a comment

Choose a reason for hiding this comment

nreese commented Mar 23, 2020

thomasneirynck left a comment

Choose a reason for hiding this comment

thomasneirynck Mar 26, 2020

Choose a reason for hiding this comment

nreese Mar 26, 2020

Choose a reason for hiding this comment

thomasneirynck Mar 26, 2020

Choose a reason for hiding this comment

nreese commented Mar 30, 2020

thomasneirynck left a comment

Choose a reason for hiding this comment

thomasneirynck left a comment

Choose a reason for hiding this comment

thomasneirynck left a comment

Choose a reason for hiding this comment

nreese commented Apr 2, 2020

kibanamachine commented Apr 2, 2020

💚 Build Succeeded

History

nreese commented Mar 22, 2020 •

edited

Loading