Merge remote-tracking branch 'upstream/master' into feature/ccr

x-pack/plugins/canvas/canvas_plugin_src/elements/area_chart/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/area_chart/index.ts

@@ -4,16 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const areaChart = () => {
-  return {
-    name: 'areaChart',
-    displayName: 'Area chart',
-    help: 'A line chart with a filled body',
-    image: require('./header.png'),
-    expression: `filters
+import { ElementFactory } from '../types';
+import header from './header.png';
+
+export const areaChart: ElementFactory = () => ({
+  name: 'areaChart',
+  displayName: 'Area chart',
+  help: 'A line chart with a filled body',
+  image: header,
+  expression: `filters
   | demodata
   | pointseries x="time" y="mean(price)"
   | plot defaultStyle={seriesStyle lines=1 fill=1}
   | render`,
-  };
-};
+});

x-pack/plugins/canvas/canvas_plugin_src/elements/bubble_chart/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/bubble_chart/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const bubbleChart = () => ({
+export const bubbleChart: ElementFactory = () => ({
   name: 'bubbleChart',
   displayName: 'Bubble chart',
   help: 'A customizable bubble chart',

x-pack/plugins/canvas/canvas_plugin_src/elements/debug/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/debug/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const debug = () => ({
+export const debug: ElementFactory = () => ({
   name: 'debug',
   displayName: 'Debug',
   help: 'Just dumps the configuration of the element',

x-pack/plugins/canvas/canvas_plugin_src/elements/donut/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/donut/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const donut = () => ({
+export const donut: ElementFactory = () => ({
   name: 'donut',
   displayName: 'Donut chart',
   help: 'A customizable donut chart',

x-pack/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const dropdownFilter = () => ({
+export const dropdownFilter: ElementFactory = () => ({
   name: 'dropdown_filter',
   displayName: 'Dropdown filter',
   help: 'A dropdown from which you can select values for an "exactly" filter',

x-pack/plugins/canvas/canvas_plugin_src/elements/horiz_bar_chart/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const horizontalBarChart = () => ({
+export const horizontalBarChart: ElementFactory = () => ({
   name: 'horizontalBarChart',
   displayName: 'Horizontal bar chart',
   help: 'A customizable horizontal bar chart',

x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.ts

@@ -5,9 +5,10 @@
  */
 
 import { openSans } from '../../../common/lib/fonts';
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const horizontalProgressBar = () => ({
+export const horizontalProgressBar: ElementFactory = () => ({
   name: 'horizontalProgressBar',
   displayName: 'Horizontal progress bar',
   help: 'Displays progress as a portion of a horizontal bar',

x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.ts

@@ -5,9 +5,10 @@
  */
 
 import { openSans } from '../../../common/lib/fonts';
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const horizontalProgressPill = () => ({
+export const horizontalProgressPill: ElementFactory = () => ({
   name: 'horizontalProgressPill',
   displayName: 'Horizontal progress pill',
   help: 'Displays progress as a portion of a horizontal pill',

x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const image = () => ({
+export const image: ElementFactory = () => ({
   name: 'image',
   displayName: 'Image',
   help: 'A static image',

x-pack/plugins/canvas/canvas_plugin_src/elements/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/index.ts

@@ -9,10 +9,10 @@ import { bubbleChart } from './bubble_chart';
 import { debug } from './debug';
 import { donut } from './donut';
 import { dropdownFilter } from './dropdown_filter';
-import { image } from './image';
-import { horizontalBarChart } from './horiz_bar_chart';
+import { horizontalBarChart } from './horizontal_bar_chart';
 import { horizontalProgressBar } from './horizontal_progress_bar';
 import { horizontalProgressPill } from './horizontal_progress_pill';
+import { image } from './image';
 import { lineChart } from './line_chart';
 import { markdown } from './markdown';
 import { metric } from './metric';
@@ -21,8 +21,8 @@ import { plot } from './plot';
 import { progressGauge } from './progress_gauge';
 import { progressSemicircle } from './progress_semicircle';
 import { progressWheel } from './progress_wheel';
-import { repeatImage } from './repeatImage';
-import { revealImage } from './revealImage';
+import { repeatImage } from './repeat_image';
+import { revealImage } from './reveal_image';
 import { shape } from './shape';
 import { table } from './table';
 import { tiltedPie } from './tilted_pie';

x-pack/plugins/canvas/canvas_plugin_src/elements/line_chart/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/line_chart/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const lineChart = () => ({
+export const lineChart: ElementFactory = () => ({
   name: 'lineChart',
   displayName: 'Line chart',
   help: 'A customizable line chart',

x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.ts

@@ -6,7 +6,8 @@
 
 import header from './header.png';
 
-export const markdown = () => ({
+import { ElementFactory } from '../types';
+export const markdown: ElementFactory = () => ({
   name: 'markdown',
   displayName: 'Markdown',
   help: 'Markup from Markdown',

x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts

@@ -7,7 +7,8 @@
 import { openSans } from '../../../common/lib/fonts';
 import header from './header.png';
 
-export const metric = () => ({
+import { ElementFactory } from '../types';
+export const metric: ElementFactory = () => ({
   name: 'metric',
   displayName: 'Metric',
   help: 'A number with a label',

x-pack/plugins/canvas/canvas_plugin_src/elements/pie/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/pie/index.ts

@@ -6,7 +6,8 @@
 
 import header from './header.png';
 
-export const pie = () => ({
+import { ElementFactory } from '../types';
+export const pie: ElementFactory = () => ({
   name: 'pie',
   displayName: 'Pie chart',
   width: 300,

x-pack/plugins/canvas/canvas_plugin_src/elements/plot/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/plot/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const plot = () => ({
+export const plot: ElementFactory = () => ({
   name: 'plot',
   displayName: 'Coordinate plot',
   help: 'Mixed line, bar or dot charts',

x-pack/plugins/canvas/canvas_plugin_src/elements/progress_gauge/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/progress_gauge/index.ts

@@ -5,9 +5,10 @@
  */
 
 import { openSans } from '../../../common/lib/fonts';
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const progressGauge = () => ({
+export const progressGauge: ElementFactory = () => ({
   name: 'progressGauge',
   displayName: 'Progress gauge',
   help: 'Displays progress as a portion of a gauge',

x-pack/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/index.ts

@@ -5,9 +5,10 @@
  */
 
 import { openSans } from '../../../common/lib/fonts';
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const progressSemicircle = () => ({
+export const progressSemicircle: ElementFactory = () => ({
   name: 'progressSemicircle',
   displayName: 'Progress semicircle',
   help: 'Displays progress as a portion of a semicircle',

x-pack/plugins/canvas/canvas_plugin_src/elements/progress_wheel/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/progress_wheel/index.ts

@@ -5,9 +5,10 @@
  */
 
 import { openSans } from '../../../common/lib/fonts';
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const progressWheel = () => ({
+export const progressWheel: ElementFactory = () => ({
   name: 'progressWheel',
   displayName: 'Progress wheel',
   help: 'Displays progress as a portion of a wheel',

x-pack/plugins/canvas/canvas_plugin_src/elements/repeatImage/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/repeat_image/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const repeatImage = () => ({
+export const repeatImage: ElementFactory = () => ({
   name: 'repeatImage',
   displayName: 'Image repeat',
   help: 'Repeats an image N times',

x-pack/plugins/canvas/canvas_plugin_src/elements/revealImage/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/reveal_image/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const revealImage = () => ({
+export const revealImage: ElementFactory = () => ({
   name: 'revealImage',
   displayName: 'Image reveal',
   help: 'Reveals a percentage of an image',

x-pack/plugins/canvas/canvas_plugin_src/elements/shape/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/shape/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const shape = () => ({
+export const shape: ElementFactory = () => ({
   name: 'shape',
   displayName: 'Shape',
   help: 'A customizable shape',

x-pack/plugins/canvas/canvas_plugin_src/elements/table/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/table/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const table = () => ({
+export const table: ElementFactory = () => ({
   name: 'table',
   displayName: 'Data table',
   help: 'A scrollable grid for displaying data in a tabular format',

x-pack/plugins/canvas/canvas_plugin_src/elements/tilted_pie/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/tilted_pie/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const tiltedPie = () => ({
+export const tiltedPie: ElementFactory = () => ({
   name: 'tiltedPie',
   displayName: 'Tilted pie chart',
   width: 500,

x-pack/plugins/canvas/canvas_plugin_src/elements/time_filter/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/time_filter/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const timeFilter = () => ({
+export const timeFilter: ElementFactory = () => ({
   name: 'time_filter',
   displayName: 'Time filter',
   help: 'Set a time window',

x-pack/plugins/canvas/canvas_plugin_src/elements/types.ts

@@ -0,0 +1,18 @@
+/*
+ * 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 ElementSpec {
+  name: string;
+  image: string;
+  expression: string;
+  displayName?: string;
+  help?: string;
+  filter?: string;
+  width?: number;
+  height?: number;
+}
+
+export type ElementFactory = () => ElementSpec;

x-pack/plugins/canvas/canvas_plugin_src/elements/vert_bar_chart/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/vert_bar_chart/index.ts

@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const verticalBarChart = () => ({
+export const verticalBarChart: ElementFactory = () => ({
   name: 'verticalBarChart',
   displayName: 'Vertical bar chart',
   help: 'A customizable vertical bar chart',

x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/index.ts

@@ -5,9 +5,10 @@
  */
 
 import { openSans } from '../../../common/lib/fonts';
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const verticalProgressBar = () => ({
+export const verticalProgressBar: ElementFactory = () => ({
   name: 'verticalProgressBar',
   displayName: 'Vertical progress bar',
   help: 'Displays progress as a portion of a vertical bar',

x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/index.js → x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/index.ts

@@ -5,9 +5,10 @@
  */
 
 import { openSans } from '../../../common/lib/fonts';
+import { ElementFactory } from '../types';
 import header from './header.png';
 
-export const verticalProgressPill = () => ({
+export const verticalProgressPill: ElementFactory = () => ({
   name: 'verticalProgressPill',
   displayName: 'Vertical progress pill',
   help: 'Displays progress as a portion of a vertical pill',