Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
export const LayoutTypes = {
PRESERVE_LAYOUT: 'preserve_layout',
PRINT: 'print',
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { pdf } from './pdf';
import { groupBy } from 'lodash';
import { oncePerServer } from '../../../../server/lib/once_per_server';
import { screenshotsObservableFactory } from './screenshots';
import { getLayoutFactory } from './layouts';
import { createLayout } from './layouts';

const getTimeRange = (urlScreenshots) => {
const grouped = groupBy(urlScreenshots.map(u => u.timeRange));
Expand All @@ -31,7 +31,6 @@ const formatDate = (date, timezone) => {
function generatePdfObservableFn(server) {
const screenshotsObservable = screenshotsObservableFactory(server);
const captureConcurrency = 1;
const getLayout = getLayoutFactory(server);

const urlScreenshotsObservable = (urls, headers, layout) => {
return Rx.from(urls).pipe(
Expand Down Expand Up @@ -68,7 +67,9 @@ function generatePdfObservableFn(server) {


return function generatePdfObservable(title, urls, browserTimezone, headers, layoutParams, logo) {
const layout = getLayout(layoutParams);

const layout = createLayout(server, layoutParams);

const screenshots$ = urlScreenshotsObservable(urls, headers, layout);

return screenshots$.pipe(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import { KbnServer, Size } from '../../../../../types';
import { LayoutTypes } from '../../../common/constants';
import { Layout } from './layout';
import { PreserveLayout } from './preserve_layout';
import { PrintLayout } from './print_layout';

interface LayoutParams {
id: string;
dimensions: Size;
}

export function createLayout(server: KbnServer, layoutParams: LayoutParams): Layout {
if (layoutParams && layoutParams.id === LayoutTypes.PRESERVE_LAYOUT) {
return new PreserveLayout(layoutParams.id, layoutParams.dimensions);
}

// this is the default because some jobs won't have anything specified
return new PrintLayout(server, layoutParams.id);
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/

export { createLayout } from './create_layout';
export { PrintLayout } from './print_layout';
export { PreserveLayout } from './preserve_layout';
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import { Size } from '../../../../../types';
import { ViewZoomWidthHeight } from './types';

export interface PageSizeParams {
pageMarginTop: number;
pageMarginBottom: number;
pageMarginWidth: number;
tableBorderWidth: number;
headingHeight: number;
subheadingHeight: number;
}

export interface PdfImageSize {
width: number;
height?: number;
}

export abstract class Layout {
public id: string = '';

constructor(id: string) {
this.id = id;
}

public abstract getPdfImageSize(): PdfImageSize;

public abstract getPdfPageOrientation(): string | undefined;

public abstract getPdfPageSize(pageSizeParams: PageSizeParams): string | Size;

public abstract getViewport(itemsCount: number): ViewZoomWidthHeight;

public abstract getBrowserZoom(): number;

public abstract getBrowserViewport(): Size;

public abstract getCssOverridesPath(): string;
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License;
* you may not use this file except in compliance with the Elastic License.
*/
import path from 'path';
import { Size } from '../../../../../types';
import { Layout, PageSizeParams } from './layout';

const ZOOM: number = 2;

export class PreserveLayout extends Layout {
public readonly selectors = {
screenshot: '[data-shared-items-container]',
renderComplete: '[data-shared-item]',
itemsCountAttribute: 'data-shared-items-count',
timefilterFromAttribute: 'data-shared-timefilter-from',
timefilterToAttribute: 'data-shared-timefilter-to',
};

public readonly groupCount = 1;
private readonly height: number;
private readonly width: number;
private readonly scaledHeight: number;
private readonly scaledWidth: number;

constructor(id: string, size: Size) {
super(id);
this.height = size.height;
this.width = size.width;
this.scaledHeight = size.height * ZOOM;
this.scaledWidth = size.width * ZOOM;
}

public getCssOverridesPath() {
return path.join(__dirname, 'preserve_layout.css');
}

public getBrowserViewport() {
return {
height: this.scaledHeight,
width: this.scaledWidth,
};
}

public getBrowserZoom() {
return ZOOM;
}

public getViewport() {
return {
height: this.scaledHeight,
width: this.scaledWidth,
zoom: ZOOM,
};
}

public getPdfImageSize() {
return {
height: this.height,
width: this.width,
};
}

public getPdfPageOrientation() {
return undefined;
}

public getPdfPageSize(pageSizeParams: PageSizeParams) {
return {
height:
this.height +
pageSizeParams.pageMarginTop +
pageSizeParams.pageMarginBottom +
pageSizeParams.tableBorderWidth * 2 +
pageSizeParams.headingHeight +
pageSizeParams.subheadingHeight,
width: this.width + pageSizeParams.pageMarginWidth * 2 + pageSizeParams.tableBorderWidth * 2,
};
}
}

This file was deleted.

Loading