[NP] Inline buildPointSeriesData and buildHierarchicalData dependencies

src/legacy/core_plugins/kibana/public/discover/kibana_services.ts

@@ -78,5 +78,3 @@ export {
   EsQuerySortValue,
   SortDirection,
 } from '../../../../../plugins/data/public';
-// @ts-ignore
-export { buildPointSeriesData } from 'ui/agg_response/point_series/point_series';

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/directives/histogram.tsx

@@ -46,9 +46,10 @@ import { IUiSettingsClient } from 'kibana/public';
 import { EuiChartThemeType } from '@elastic/eui/dist/eui_charts_theme';
 import { Subscription } from 'rxjs';
 import { getServices } from '../../../kibana_services';
+import { Chart as IChart } from '../helpers/point_series';
 
 export interface DiscoverHistogramProps {
-  chartData: any;
+  chartData: IChart;
   timefilterUpdateHandler: (ranges: { from: number; to: number }) => void;
 }
 
@@ -163,7 +164,7 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
   };
 
   public formatXValue = (val: string) => {
-    const xAxisFormat = this.props.chartData.xAxisFormat.params.pattern;
+    const xAxisFormat = this.props.chartData.xAxisFormat.params!.pattern;
 
     return moment(val).format(xAxisFormat);
   };
@@ -219,14 +220,15 @@ export class DiscoverHistogram extends Component<DiscoverHistogramProps, Discove
      * see https://github.com/elastic/kibana/issues/27410
      * TODO: Once the Discover query has been update, we should change the below to use the new field
      */
-    const { intervalESValue, intervalESUnit, interval: xInterval } = chartData.ordered;
+    const { intervalESValue, intervalESUnit, interval } = chartData.ordered;
+    const xInterval = interval as number;
 
     const xValues = chartData.xAxisOrderedValues;
     const lastXValue = xValues[xValues.length - 1];
 
     const domain = chartData.ordered;
-    const domainStart = domain.min.valueOf();
-    const domainEnd = domain.max.valueOf();
+    const domainStart = domain.min!.valueOf();
+    const domainEnd = domain.max!.valueOf();
 
     const domainMin = data[0].x > domainStart ? domainStart : data[0].x;
     const domainMax = domainEnd - xInterval > lastXValue ? domainEnd - xInterval : lastXValue;

src/legacy/ui/public/agg_response/point_series/_add_to_siri.js → src/legacy/core_plugins/kibana/public/discover/np_ready/angular/helpers/_add_to_siri.ts

@@ -17,22 +17,23 @@
  * under the License.
  */
 
-export function addToSiri(series, point, id, yLabel, yFormat, zFormat, zLabel) {
+import { Point } from './_get_point';
+
+export interface Serie {
+  id: string;
+  values: Point[];
+}
+
+export function addToSiri(series: Map<string, Serie>, point: Point, id: string) {
   id = id == null ? '' : id + '';
 
   if (series.has(id)) {
-    series.get(id).values.push(point);
+    (series.get(id) as Serie).values.push(point);
     return;
   }
 
   series.set(id, {
-    id: id.split('-').pop(),
-    rawId: id,
-    label: yLabel == null ? id : yLabel,
-    count: 0,
+    id: id.split('-').pop() as string,
     values: [point],
-    format: yFormat,
-    zLabel,
-    zFormat,
   });
 }

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/helpers/_get_aspects.ts

@@ -0,0 +1,49 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Table, Dimensions, Aspects } from './point_series';
+
+/**
+ * Identify and group the columns based on the aspect of the pointSeries
+ * they represent.
+ *
+ * @return {object} - an object with a key for each aspect (see map). The values
+ *                    may be undefined or an array of aspects.
+ */
+export function getAspects(table: Table, dimensions: Dimensions) {
+  const aspects: Aspects = {} as Aspects;
+  (Object.keys(dimensions) as Array<keyof Dimensions>).forEach(name => {
+    const d = dimensions[name];
+    const column = table.columns[d.accessor];
+    if (!column) {
+      return;
+    }
+    aspects[name] = [
+      {
+        accessor: column.id,
+        column: d.accessor,
+        title: column.name,
+        format: d.format,
+        params: d.params,
+      },
+    ];
+  });
+
+  return aspects;
+}

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/helpers/_get_point.ts

@@ -0,0 +1,90 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Aspect, Table, Row } from './point_series';
+
+type RowValue = number | 'NaN';
+interface Raw {
+  table: Table;
+  column: number;
+  row: number;
+  value: RowValue;
+}
+export interface Point {
+  x: RowValue;
+  y: RowValue;
+  extraMetrics: [];
+  xRaw: Raw;
+  yRaw: Raw;
+  tableRaw?: {
+    table: Table;
+    column: number;
+    row: number;
+    value: number;
+    title: string;
+  };
+  parent: null;
+  series?: string;
+  seriesId?: string;
+}
+
+export function getPoint(table: Table, x: Aspect, row: Row, rowIndex: number, y: Aspect) {
+  const xRow = row[x.accessor];
+  const yRow = row[y.accessor];
+
+  const point = {
+    x: xRow,
+    y: yRow,
+    extraMetrics: [],
+    xRaw: {
+      table,
+      column: x.column,
+      row: rowIndex,
+      value: xRow,
+    },
+    yRaw: {
+      table,
+      column: y.column,
+      row: rowIndex,
+      value: yRow,
+    },
+    tableRaw: table.$parent && {
+      table: table.$parent.table,
+      column: table.$parent.column,
+      row: table.$parent.row,
+      value: table.$parent.key,
+      title: table.$parent.name,
+    },
+    parent: null,
+  } as Point;
+
+  if (point.y === 'NaN') {
+    // filter out NaN from stats
+    // from metrics that are not based at zero
+    return;
+  }
+
+  if (y) {
+    // If the data is not split up with a series aspect, then
+    // each point's "series" becomes the y-agg that produced it
+    point.series = y.title;
+  }
+
+  return point;
+}

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/helpers/_get_series.ts

@@ -0,0 +1,43 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+import { getPoint, Point } from './_get_point';
+import { addToSiri, Serie } from './_add_to_siri';
+import { Chart, Table } from './point_series';
+
+export function getSeries(table: Table, chart: Chart) {
+  const aspects = chart.aspects;
+  const xAspect = aspects.x[0];
+  const yAspect = aspects.y[0];
+
+  const partGetPoint = _.partial(getPoint, table, xAspect);
+
+  return _(table.rows)
+    .transform((series: any, row, rowIndex) => {
+      const point: Point = partGetPoint(row, rowIndex, yAspect);
+      if (point) {
+        const id = `${point.series}-${yAspect.accessor}`;
+        point.seriesId = id;
+        addToSiri(series as Map<string, Serie>, point, id);
+      }
+    }, new Map<string, Serie>() as any)
+    .thru(series => [...series.values()])
+    .value() as Serie[];
+}

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/helpers/point_series.ts

@@ -0,0 +1,133 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { uniq } from 'lodash';
+import moment, { Duration } from 'moment';
+import { Unit } from '@elastic/datemath';
+
+import { SerializedFieldFormat } from '../../../../../../../../plugins/expressions/common/types';
+import { getSeries } from './_get_series';
+import { getAspects } from './_get_aspects';
+import { Serie } from './_add_to_siri';
+
+export interface Column {
+  id: string;
+  name: string;
+}
+
+export interface Row {
+  [key: string]: number;
+}
+
+export interface Table {
+  columns: Column[];
+  rows: Row[];
+  $parent: {
+    table: Table;
+    column: number;
+    row: number;
+    key: number;
+    name: string;
+  };
+}
+
+interface HistogramParams {
+  date: true;
+  interval: Duration;
+  intervalESValue: number;
+  intervalESUnit: Unit;
+  format: string;
+  bounds?: {
+    min: string | number;
+    max: string | number;
+  };
+}
+export interface Dimension {
+  accessor: 0 | 1;
+  format: SerializedFieldFormat<{ pattern: string }>;
+  params?: HistogramParams;
+}
+
+export interface Dimensions {
+  x: Dimension;
+  y: Dimension;
+}
+export interface Aspect {
+  accessor: Column['id'];
+  column?: Dimension['accessor'];
+  title: Column['name'];
+  format: Dimension['format'];
+  params: Dimension['params'];
+}
+export interface Aspects {
+  x: Aspect[];
+  y: Aspect[];
+}
+interface Ordered {
+  date: true;
+  interval: Duration | number;
+  intervalESUnit: string;
+  intervalESValue: number;
+  min?: number;
+  max?: number;
+}
+export interface Chart {
+  aspects: Aspects;
+  series: Serie[];
+  xAxisOrderedValues: number[];
+  xAxisFormat: Dimension['format'];
+  xAxisLabel: Column['name'];
+  yAxisLabel?: Column['name'];
+  ordered: Ordered;
+}
+
+export const buildPointSeriesData = (table: Table, dimensions: Dimensions) => {
+  const chart: Chart = {
+    aspects: getAspects(table, dimensions),
+  } as Chart;
+
+  const { format, title, params, accessor } = chart.aspects.x[0];
+  chart.xAxisOrderedValues = uniq(table.rows.map(r => r[accessor]));
+  chart.xAxisFormat = format;
+  chart.xAxisLabel = title;
+
+  const { intervalESUnit, intervalESValue, interval, bounds } = params as HistogramParams;
+  chart.ordered = {
+    date: true,
+    interval: moment.duration(interval),
+    intervalESUnit,
+    intervalESValue,
+  };
+
+  if (bounds) {
+    chart.ordered.min = isNaN(bounds.min as number)
+      ? Date.parse(bounds.min as string)
+      : (bounds.min as number);
+    chart.ordered.max = isNaN(bounds.max as number)
+      ? Date.parse(bounds.max as string)
+      : (bounds.max as number);
+  }
+
+  chart.yAxisLabel = chart.aspects.y && chart.aspects.y[0].title;
+
+  chart.series = getSeries(table, chart);
+
+  delete chart.aspects;
+  return chart;
+};