-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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.
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
[Maps] Add filter actions to tooltips #33635
Merged
thomasneirynck
merged 29 commits into
elastic:master
from
thomasneirynck:maps/tooltip_filter
Apr 8, 2019
Merged
[Maps] Add filter actions to tooltips #33635
thomasneirynck
merged 29 commits into
elastic:master
from
thomasneirynck:maps/tooltip_filter
Apr 8, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thomasneirynck
added
WIP
Work in progress
[Deprecated-Use Team:Presentation]Team:Geo
Former Team Label for Geo Team. Now use Team:Presentation
v8.0.0
v7.2.0
labels
Mar 21, 2019
Pinging @elastic/kibana-gis |
💔 Build Failed |
nreese
reviewed
Mar 28, 2019
nreese
reviewed
Mar 28, 2019
x-pack/plugins/maps/public/shared/layers/sources/es_join_source.js
Outdated
Show resolved
Hide resolved
nreese
reviewed
Mar 28, 2019
x-pack/plugins/maps/public/shared/layers/util/tooltip_property.js
Outdated
Show resolved
Hide resolved
💚 Build Succeeded |
💚 Build Succeeded |
nreese
reviewed
Apr 3, 2019
x-pack/plugins/maps/public/components/map/feature_tooltip.test.js
Outdated
Show resolved
Hide resolved
nreese
reviewed
Apr 3, 2019
💔 Build Failed |
💚 Build Succeeded |
nreese
reviewed
Apr 8, 2019
x-pack/plugins/maps/public/shared/layers/sources/es_join_source.js
Outdated
Show resolved
Hide resolved
nreese
reviewed
Apr 8, 2019
x-pack/plugins/maps/public/shared/layers/sources/vector_source.js
Outdated
Show resolved
Hide resolved
nreese
reviewed
Apr 8, 2019
x-pack/plugins/maps/public/shared/layers/tooltips/es_tooltip_property.js
Outdated
Show resolved
Hide resolved
💚 Build Succeeded |
nreese
reviewed
Apr 8, 2019
for (let i = 0; i < this._joins.length; i++) { | ||
const propsFromJoin = await this._joins[i].filterAndFormatPropertiesForTooltip(properties); | ||
Object.assign(tooltipsFromSource, propsFromJoin); | ||
allTooltips = [...allTooltips, ...propsFromJoin]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of recreating the array on each iteration, how about something more like this?
async getPropertiesForTooltip(properties) {
const sourceTooltipProperties = await this._source.filterAndFormatPropertiesToHtml(properties);
this._addJoinsToSourceTooltips(sourceTooltipProperties);
// tooltip properties added by joins. For example, aggregation metrics
const joinTooltipProperties = [];
for (let i = 0; i < this._joins.length; i++) {
const propsFromJoin = await this._joins[i].filterAndFormatPropertiesForTooltip(properties);
joinTooltipProperties.push(...propsFromJoin);
}
return [...sourceTooltipProperties, ...joinTooltipProperties];
}
nreese
approved these changes
Apr 8, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
code review, tested in chrome
thomasneirynck
added a commit
to thomasneirynck/kibana
that referenced
this pull request
Apr 8, 2019
thomasneirynck
added a commit
that referenced
this pull request
Apr 8, 2019
chandlerprall
pushed a commit
to chandlerprall/kibana
that referenced
this pull request
Apr 15, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
[Deprecated-Use Team:Presentation]Team:Geo
Former Team Label for Geo Team. Now use Team:Presentation
release_note:enhancement
v7.2.0
v8.0.0
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #32736
This PR contains:
Refactors
Changes/additions
Known issues:
Other todos:
add functional tests for tooltipsuse jest tests for contentsdetect presence of filter-bar iso using isReadOnlyembeddables are always filterable right nowDiscuss:
should the map take "ownership" of filters (similar to the input controls visualization) (?)NO. maybe in another phaseshould tooltips remain on the map after filtering (?) if so, what would be the best mechanism to introduce this (e.g. track doc-ids across data-updates. (?)NO. tackle this as separate improvement. right now, tooltips are removed after filtering