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.

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

TypeScript Reporting Layouts #22454

Merged
merged 13 commits into from
Sep 4, 2018
Merged
12 changes: 12 additions & 0 deletions src/server/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* 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 interface KbnServer {
config: () => configObject;
}

export interface configObject {
Copy link
Contributor

Choose a reason for hiding this comment

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

configObject => ConfigObject

get: (path: string) => any;
}
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/layout_factory';

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,17 @@
/*
* 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';

export interface CaptureConfig {
zoom: number;
viewport: Size;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

-2 spaces for the }


export interface ViewZoomWidthHeight {
zoom: number;
width: number;
height: number;
}

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 './layout_factory';
Copy link
Contributor

Choose a reason for hiding this comment

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

createlayout => createLayout

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 './index.d';
Copy link
Contributor

Choose a reason for hiding this comment

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

shouldn't need the .d in the name, and I don't think you need to specify index too. Try:

import { ViewZoomWidthHeight } from '.';

Copy link
Contributor

Choose a reason for hiding this comment

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

For the record, this doesn't work because it resolves it to index.js which exists in the same location, so have to be explicit with index.d.ts. Maybe the file should just be named types.d.ts in that case. Which also matches our other types.d.ts file.


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;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* 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 } from '../../../../../../../../src/server/index';
import { 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 {
Copy link
Member

Choose a reason for hiding this comment

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

let's call this file create_layout.ts to name it after what its primary export is.

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,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;
Copy link
Member

Choose a reason for hiding this comment

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

Zoom used to be a param that could be passed in from a caller, but 2 was the default. This makes it completely hardcoded.

Also, you've removed the explanatory comments: https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/export_types/printable_pdf/server/lib/layouts/preserve_layout.js#L9-L12

Copy link
Contributor

Choose a reason for hiding this comment

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

Intentional. This setting was never exposed to the user as configurable - #20091

I don't think we ever will expose it. The only reason we use it is to make sure the resolution is a little bigger on the screenshots.

From Brandon in that above issue:

The zoom is an undocumented setting that I intended to remove, but never got around to it.


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,
};
}
}
Loading