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

Jump to bottom

[Maps] fix unable to edit cluster vector styles styled by count when switching to super fine grid resolution #81525

Merged
merged 6 commits into from
Oct 27, 2020
Merged

[Maps] fix unable to edit cluster vector styles styled by count when switching to super fine grid resolution #81525

merged 6 commits into from
Oct 27, 2020

Conversation

nreese
Copy link
Contributor

@nreese nreese commented Oct 22, 2020

fixes #81348

This PR moves style field filtering logic out of VectorStyleEditor and into StyleFieldsCustodian. That way, the same logic can be used in getDescriptorWithMissingStylePropsRemoved and VectorStyleEditor so dynamic styling can cleaned up when there are no fields for style property

@nreese nreese requested a review from a team as a code owner October 22, 2020 18:49
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-gis (Team:Geo)

thomasneirynck
thomasneirynck approved these changes Oct 26, 2020
View reviewed changes
Copy link
Contributor

@thomasneirynck thomasneirynck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only have nits around naming :)

+1 on the approach:

  • typing of StyleField-data object
  • reuse of the logic in both the vector-tyle editor and the style-class

x-pack/plugins/maps/public/classes/styles/vector/style_fields_custodian.ts Outdated Show resolved Hide resolved
x-pack/plugins/maps/public/classes/styles/vector/style_fields_custodian.ts Outdated Show resolved Hide resolved
x-pack/plugins/maps/public/classes/styles/vector/style_fields_custodian.ts Outdated Show resolved Hide resolved
@thomasneirynck
Copy link
Contributor

also, +1 on backport to 7.10, given the timing is fairly open still

@thomasneirynck
Copy link
Contributor

thomasneirynck commented Oct 26, 2020 •
edited
Loading

Added skip-label, as this fixes a bug introduced in 7.10.

@thomasneirynck thomasneirynck added the release_note:skip Skip the PR/issue when compiling release notes label Oct 26, 2020
@nreese
Copy link
Contributor Author

nreese commented Oct 26, 2020

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

@kbn/optimizer bundle module count

id before after diff
maps 618 619 +1

async chunks size

id before after diff
maps 3.2MB 3.3MB +3.5KB

History

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

@nreese nreese merged commit 0592938 into elastic:master Oct 27, 2020
nreese added a commit to nreese/kibana that referenced this pull request Oct 27, 2020
@nreese @kibanamachine
[Maps] fix unable to edit cluster vector styles styled by count when …
86fe8e1 
…switching to super fine grid resolution (elastic#81525)

* [Maps] fix unable to edit cluster vector styles styled by count when switching to super fine grid resolution

* fix typo

* tslint fixes

* review feedback

* more renames

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
@nreese nreese mentioned this pull request Oct 27, 2020
Merged
nreese added a commit to nreese/kibana that referenced this pull request Oct 27, 2020
@nreese @kibanamachine
[Maps] fix unable to edit cluster vector styles styled by count when …
3253c12 
…switching to super fine grid resolution (elastic#81525)

* [Maps] fix unable to edit cluster vector styles styled by count when switching to super fine grid resolution

* fix typo

* tslint fixes

* review feedback

* more renames

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
@nreese nreese mentioned this pull request Oct 27, 2020
Merged
nreese added a commit that referenced this pull request Oct 27, 2020
@nreese @kibanamachine
[Maps] fix unable to edit cluster vector styles styled by count when …
859b063 
…switching to super fine grid resolution (#81525) (#81702)

* [Maps] fix unable to edit cluster vector styles styled by count when switching to super fine grid resolution

* fix typo

* tslint fixes

* review feedback

* more renames

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
nreese added a commit that referenced this pull request Oct 27, 2020
@nreese @kibanamachine
[Maps] fix unable to edit cluster vector styles styled by count when …
6f1d902 
…switching to super fine grid resolution (#81525) (#81701)

* [Maps] fix unable to edit cluster vector styles styled by count when switching to super fine grid resolution

* fix typo

* tslint fixes

* review feedback

* more renames

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
gmmorris added a commit to gmmorris/kibana that referenced this pull request Oct 27, 2020
@gmmorris
Merge branch 'master' into task-manager/health
314f3bc 
* master: (37 commits)
  [ILM] Migrate Warm phase to Form Lib (elastic#81323)
  [Security Solutions][Detection Engine] Fixes critical bug with error reporting that was doing a throw (elastic#81549)
  [Detection Rules] Add 7.10 rules (elastic#81676)
  [kbn/optimizer] ignore missing metrics when updating limits with --focus (elastic#81696)
  [SECURITY SOLUTIONS] Bugs overview page + investigate eql in timeline (elastic#81550)
  [Maps] fix unable to edit cluster vector styles styled by count when switching to super fine grid resolution (elastic#81525)
  Fixed migration issue for case specific actions, by extending email action migrator checks (elastic#81673)
  [CI] Preparation for APM tracking on CI (elastic#80399)
  [Home] Fixes Kibana app description order on home page and updates Canvas copy (elastic#80057)
  Make sure `to` is 'now' and not the same as `from` (elastic#81524)
  Nitpicking the 8.0 Breaking Change issue template (elastic#81678)
  [SECURITY_SOLUTION] Fix text on onboarding screen (elastic#81672)
  [data.search] Skip async search tests in build candidates and production builds (elastic#81547)
  Fix previousStartedAt by not changing when execution fails (elastic#81388)
  [Monitoring] Fix a couple of issues with the cpu usage alert (elastic#80737)
  Telemetry collection xpack to ts project references (elastic#81269)
  Elasticsearch: don't use url authentication for new client (elastic#81564)
  [App Search] Credentials: implement working flyout form (elastic#81541)
  Properly encode links to edit user page (elastic#81562)
  [Alerting UI] Don't wait for health check before showing Create Alert flyout (elastic#80996)
  ...
@nreese nreese mentioned this pull request Dec 17, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thomasneirynck thomasneirynck thomasneirynck approved these changes

Assignees
No one assigned
Labels
[Deprecated-Use Team:Presentation]Team:Geo Former Team Label for Geo Team. Now use Team:Presentation release_note:fix release_note:skip Skip the PR/issue when compiling release notes v7.10.0 v7.11.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Maps] unable to edit cluster vector styles styled by count when switching to super fine grid resolution
4 participants
@nreese @elasticmachine @thomasneirynck @kibanamachine