Skip to content

[7.x] [Maps] Blended layer that switches between documents and clusters (#57879)#60550

Merged
nreese merged 1 commit intoelastic:7.xfrom
nreese:backport/7.x/pr-57879
Mar 18, 2020
Merged

[7.x] [Maps] Blended layer that switches between documents and clusters (#57879)#60550
nreese merged 1 commit intoelastic:7.xfrom
nreese:backport/7.x/pr-57879

Conversation

@nreese
Copy link
Copy Markdown
Contributor

@nreese nreese commented Mar 18, 2020

Backports the following commits to 7.x:

…astic#57879)

* [Maps] Blended layer that switches between documents and clusters

* change layer type when scalingType changes

* getSource

* use cluster source when count exceeds value

* ensure doc source stays in editor

* start creating cluster style

* pass all parts of style descriptor

* get toggling between sources working

* derive cluster style from document style

* remove references to METRIC_TYPE

* fix import

* start typescripting blended_vector_layer

* more typescript work

* last of the TS errors

* add migration to convert useTopTerm to scalingType

* clean up

* remove MapSavedObject work since its in a seperate PR now

* fix EsSearchSource update editor jest test

* fix map_selector jest test

* move mutable state out of BlendedVectorLayer

* one more change for removing mutable BlendedVectorLayer state

* integrate newly merged MapSavedObjectAttributes type

* review feedback

* use data request for fetching feature count

* add functional test

* fix functional test

* review feedback

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@nreese nreese added the backport This PR is a backport of another PR label Mar 18, 2020
@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

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

@nreese nreese added backport:skip This PR does not require backporting release_note:enhancement and removed backport:skip This PR does not require backporting labels Mar 18, 2020
@nreese nreese merged commit 20396c1 into elastic:7.x Mar 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR release_note:enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants