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

Fixes data points on maps not showing up in reports #31949

Merged
merged 3 commits into from
Feb 26, 2019
Merged

Fixes data points on maps not showing up in reports #31949

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
271b699
Fixes data points on maps not showing up in reports
Feb 25, 2019
e3f8e96
Better method for rendering maps with coordinates
Feb 25, 2019
e29f83b
Quick note on the movement of CSS injection (helps rendering of leafl…
Feb 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions x-pack/plugins/reporting/export_types/common/lib/screenshots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,11 +266,6 @@ export function screenshotsObservableFactory(server) {
browser => openUrl(browser, url, conditionalHeaders),
browser => browser
),
tap(() => logger.debug('injecting custom css')),
mergeMap(
browser => injectCustomCss(browser, layout),
browser => browser
),
tap(() => logger.debug('waiting for elements or items count attribute; or not found to interrupt')),
mergeMap(
browser => Rx.race(
Expand All @@ -294,6 +289,13 @@ export function screenshotsObservableFactory(server) {
({ browser, itemsCount }) => waitForElementsToBeInDOM(browser, itemsCount, layout),
({ browser, itemsCount }) => ({ browser, itemsCount })
),
// Waiting till _after_ elements have rendered before injecting our CSS
// allows for them to be displayed properly in many cases
tap(() => logger.debug('injecting custom css')),
mergeMap(
({ browser }) => injectCustomCss(browser, layout),
({ browser }) => ({ browser })
),
tap(() => logger.debug('positioning elements')),
mergeMap(
({ browser }) => positionElements(browser, layout),
Expand Down