Skip to content

[Maps] move apply global filter settting from layer to source#50523

Merged
nreese merged 16 commits intoelastic:masterfrom
nreese:move_apply_global_filter_to_source
Nov 18, 2019
Merged

[Maps] move apply global filter settting from layer to source#50523
nreese merged 16 commits intoelastic:masterfrom
nreese:move_apply_global_filter_to_source

Conversation

@nreese
Copy link
Copy Markdown
Contributor

@nreese nreese commented Nov 13, 2019

fixes #43849

This PR moves applyGlobalQuery from the layer descriptor to the source descriptor. That way, you can enable/disable global query context for the source or each join independently.

This PR also effects GeoJson upload. applyGlobalQuery is no longer defaulted false for GeoJson upload layers.

Screen Shot 2019-11-13 at 2 10 30 PM

To test this PR you need to have a document index in ES that can be joined with another document index in ES. The get-it-done data set along with San Diego council districts provides a good example where you want to filter the join source by get-it-done data set but want to avoid filtering the council district polygons by global search criteria. Follow the instructions at https://github.com/nreese/presentations/tree/master/get_it_done to load get_it_done data set and council district geojson.

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@nreese nreese added release_note:enhancement Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v7.6.0 v8.0.0 labels Nov 14, 2019
@elasticmachine
Copy link
Copy Markdown
Contributor

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

@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-docs (Team:Docs)

@nreese nreese requested a review from spong November 14, 2019 20:38
@nreese
Copy link
Copy Markdown
Contributor Author

nreese commented Nov 14, 2019

@spong I added you as a review since this PR touches the layer definitions in SIEM. Would you mind reviewing the SIEM changes?

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

Copy link
Copy Markdown
Member

@spong spong left a comment

Choose a reason for hiding this comment

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

SIEM changes LGTM -- thanks @nreese!

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Copy link
Copy Markdown
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.

Great PR.

This was flagged during this PR, although not directly related:

wrt

const indexPatternIds = this.props.layer.getIndexPatternIds();

After discussion, we decided to change this to getSourceIndexPatterns. The filter should only apply to the source-data, not any of the term-joins. That is actually the current behavior, and documented like this (https://www.elastic.co/guide/en/kibana/7.x/maps-layer-based-filtering.html). The UX shouldn't include auto-complete for any of the join-indices, as that wouldn't function anyway.

@nreese nreese requested a review from gchaps November 18, 2019 16:17
Copy link
Copy Markdown
Contributor

@gchaps gchaps left a comment

Choose a reason for hiding this comment

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

Docs LGTM

@elasticmachine
Copy link
Copy Markdown
Contributor

💔 Build Failed

@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

@nreese nreese merged commit e2dc921 into elastic:master Nov 18, 2019
nreese added a commit to nreese/kibana that referenced this pull request Nov 18, 2019
…c#50523)

* [Maps] move apply global filter settting from layer to source

* add checkbox to join UI

* update edit UI for grid and pew-pew source

* add migrations

* update docs

* remove setting of applyGlobalQuery from geojson upload

* upgrade SIEM layer descriptors

* fix jest tests and api integration tests

* fix functional tests

* fix functional test

* i18n

* review feedback

* doc re-wording

* i18n fixes
jloleysens added a commit to jloleysens/kibana that referenced this pull request Nov 18, 2019
…-fallback

* 'master' of github.com:elastic/kibana: (116 commits)
  [Maps] move apply global filter settting from layer to source (elastic#50523)
  [SIEM] Fix: Empty `Source` / `Destination` shown when only ports are populated (elastic#50843)
  [Maps] Delay vector tile layer syncing until spritesheet is loaded (elastic#48955)
  [Maps] prevent users from overflowing URL when filtering by shape (elastic#50747)
  [DOCS] Mark Beats central management as discontinued (elastic#49423)
  [page_objects/common_page] convert to ts (elastic#50771)
  [NP Kibana Migrations ] kibana plugin home (elastic#50444)
  [DOCS] Shareables naming convention (elastic#50497)
  [ML] DF Analytics - auto-populate model_memory_limit (elastic#50714)
  Increase alerting test stability and reduce flakiness (elastic#50246)
  [ML] Remaning new_job_new folder (elastic#50917)
  [Telemetry] Show opt-in changes for OSS users (elastic#50831)
  [ML] Fix lat_long anomalies table links menu and value formatting (elastic#50916)
  [Dev] Fix serialising a really big string (elastic#50915)
  Better explanation about the Prettier recommendation (extension vs. NPM module) (elastic#50629)
  [Monitoring] Use a basic monitoring user for tests (elastic#47865)
  [Monitoring] Gracefully handle issue with filebeat indices (elastic#48929)
  [Monitoring] Improve permissions required around setup mode (elastic#50421)
  Additional validation for elasticsearch username (elastic#48247)
  Revert changes to use_kibana_ui_setting (elastic#50877)
  ...

# Conflicts:
#	src/legacy/core_plugins/console/server/request.test.ts
nreese added a commit that referenced this pull request Nov 18, 2019
#50972)

* [Maps] move apply global filter settting from layer to source

* add checkbox to join UI

* update edit UI for grid and pew-pew source

* add migrations

* update docs

* remove setting of applyGlobalQuery from geojson upload

* upgrade SIEM layer descriptors

* fix jest tests and api integration tests

* fix functional tests

* fix functional test

* i18n

* review feedback

* doc re-wording

* i18n fixes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release_note:enhancement Team:Docs Team:Geo Former Team Label for Geo Team. Now use Team:Presentation v7.6.0 v8.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Maps] Ability to have global filter apply only to joined sources, but not to layer-source

5 participants