Skip to content

[7.x] [Canvas] Fix map embeddables not showing up on PDF reports (#61149) #61345

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

Merged
poffdeluxe merged 1 commit into from
Mar 25, 2020
Merged

[7.x] [Canvas] Fix map embeddables not showing up on PDF reports (#61149) #61345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion x-pack/legacy/plugins/canvas/public/apps/export/export/export_app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export class ExportApp extends React.PureComponent {
const { workpad, selectedPageId } = this.props;
const { pages, height, width } = workpad;
const activePage = pages.find(page => page.id === selectedPageId);
const pageElementCount = activePage.elements.length;

return (
<div className="canvasExport">
Expand All @@ -39,7 +40,7 @@ export class ExportApp extends React.PureComponent {
</div>
{Style.it(
workpad.css,
<div className="canvasExport__stageContent">
<div className="canvasExport__stageContent" data-shared-items-count={pageElementCount}>
<WorkpadPage
isSelected
key={activePage.id}
Expand Down
8 changes: 6 additions & 2 deletions ...egacy/plugins/canvas/public/components/element_share_container/element_share_container.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,15 @@ export class ElementShareContainer extends React.PureComponent {
};

render() {
const shouldTrackComplete = this.props.functionName !== 'embeddable';

// NOTE: the data-shared-item and data-render-complete attributes are used for reporting
// Embeddables should be setting data-shared-item and data-render-complete on themselves
// so we should not be tracking them here.
return (
<div
data-shared-item
data-render-complete={this.state.renderComplete}
data-shared-item={shouldTrackComplete ? this.state.renderComplete : undefined}
data-render-complete={shouldTrackComplete ? this.state.renderComplete : undefined}
className={this.props.className}
ref={ref => (this.sharedItemRef = ref)}
>
Expand Down