Upgrade lodash 4 vislib (#11)

* replace lodash 3 with lodash 4 on vislib plugin

* Further changes

* further replacement of lodash3 to 4

* further work on upgrading to lodash 4

* final changes to update lodash

src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx

@@ -18,7 +18,7 @@
  */
 
 import React, { useState, useEffect, useCallback, useMemo } from 'react';
-import { cloneDeep, uniq, get } from 'lodash3';
+import { cloneDeep, uniq, get } from 'lodash';
 import { EuiSpacer } from '@elastic/eui';
 
 import { IAggConfig } from 'src/plugins/data/public';

src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { capitalize } from 'lodash3';
+import { upperFirst } from 'lodash';
 
 import { BasicVislibParams, ValueAxis, SeriesParam } from '../../../types';
 import { ChartModes, ChartTypes, InterpolationModes, Positions } from '../../../utils/collections';
@@ -67,7 +67,7 @@ const getUpdatedAxisName = (
   axisPosition: ValueAxis['position'],
   valueAxes: BasicVislibParams['valueAxes']
 ) => {
-  const axisName = capitalize(axisPosition) + AXIS_PREFIX;
+  const axisName = upperFirst(axisPosition) + AXIS_PREFIX;
   const nextAxisNameNumber = valueAxes.reduce(countNextAxisNumber(axisName, 'name'), 1);
 
   return `${axisName}${nextAxisNameNumber}`;

src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_columns.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   columns: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_rows.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   rows: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_series.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   label: '',

src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_columns.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   columns: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_geo_json.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   valueFormatter: _.identity,

src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_rows.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   rows: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   columns: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   rows: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_series.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   label: '',

src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_slices.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   label: '',

src/plugins/vis_type_vislib/public/fixtures/mock_data/not_enough_data/_one_point.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   label: '',

src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_columns.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   columns: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   rows: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_series.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   label: '',

src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_columns.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   columns: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_rows.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   rows: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_series.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   label: '',

src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   columns: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_rows.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   rows: [

src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   label: '',

src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 export default {
   xAxisOrderedValues: ['_all'],

src/plugins/vis_type_vislib/public/vislib/components/labels/data_array.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 import { flattenSeries } from './flatten_series';
 
 /*

src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 /*
  * Accepts a Kibana data object with a rows or columns key
@@ -30,5 +30,5 @@ export function flattenSeries(obj) {
 
   obj = obj.rows ? obj.rows : obj.columns;
 
-  return _.chain(obj).pluck('series').flattenDeep().value();
+  return _.chain(obj).map('series').flattenDeep().value();
 }

src/plugins/vis_type_vislib/public/vislib/components/labels/labels.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 import { dataArray as createArr } from './data_array';
 import { uniqLabels as getArrOfUniqLabels } from './uniq_labels';
 

src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 import { labels } from './labels';
 import { dataArray } from './data_array';
@@ -166,9 +166,9 @@ describe('Vislib Labels Module Test Suite', function () {
       seriesArr = Array.isArray(seriesLabels);
       rowsArr = Array.isArray(rowsLabels);
       uniqSeriesLabels = _.chain(rowsData.rows)
-        .pluck('series')
+        .map('series')
         .flattenDeep()
-        .pluck('label')
+        .map('label')
         .uniq()
         .value();
     });

src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 /*
  * Accepts an array of data objects and a formatter function.
@@ -28,5 +28,5 @@ export function uniqLabels(arr) {
     throw new TypeError('UniqLabelUtil expects an array of objects');
   }
 
-  return _(arr).pluck('label').unique().value();
+  return _(arr).map('label').uniq().value();
 }

src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx

@@ -18,7 +18,7 @@
  */
 import React, { BaseSyntheticEvent, KeyboardEvent, PureComponent } from 'react';
 import classNames from 'classnames';
-import { compact, uniq, map, every, isUndefined } from 'lodash3';
+import { compact, uniqBy, map, every, isUndefined } from 'lodash';
 
 import { i18n } from '@kbn/i18n';
 import { EuiPopoverProps, EuiIcon, keyCodes, htmlIdGenerator } from '@elastic/eui';
@@ -119,7 +119,7 @@ export class VisLegend extends PureComponent<VisLegendProps, VisLegendState> {
   getSeriesLabels = (data: any[]) => {
     const values = data.map((chart) => chart.series).reduce((a, b) => a.concat(b), []);
 
-    return compact(uniq(values, 'label')).map((label: any) => ({
+    return compact(uniqBy(values, 'label')).map((label: any) => ({
       ...label,
       values: [label.values[0].seriesRaw],
     }));

src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 
 /**
  * Returns an array of names ordered by appearance in the nested array
@@ -39,7 +39,7 @@ export function getPieNames(data: any[]): string[] {
     });
   });
 
-  return _.uniq(names, 'label');
+  return _.uniqBy(names, 'label');
 }
 
 /**
@@ -61,7 +61,7 @@ function getNames(data: any, columns: any): string[] {
       .sortBy(function (obj) {
         return obj.index;
       })
-      .unique(function (d) {
+      .uniqBy(function (d) {
         return d.label;
       })
       .value();

src/plugins/vis_type_vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js

@@ -18,7 +18,7 @@
  */
 
 import React from 'react';
-import _ from 'lodash3';
+import _ from 'lodash';
 import numeral from '@elastic/numeral';
 import { renderToStaticMarkup } from 'react-dom/server';
 

src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 import $ from 'jquery';
 
 import { pointSeriesTooltipFormatter } from './_pointseries_tooltip_formatter';

src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import _ from 'lodash3';
+import _ from 'lodash';
 import $ from 'jquery';
 
 const OFFSET = 10;
@@ -110,7 +110,7 @@ function getOverflow(size, pos, containers) {
 }
 
 function mergeOverflows(dest, src) {
-  _.merge(dest, src, function (a, b) {
+  _.mergeWith(dest, src, function (a, b) {
     if (a == null || b == null) return a || b;
     if (a < 0 && b < 0) return Math.min(a, b);
     return Math.max(a, b);
@@ -131,7 +131,7 @@ function pickPlacement(prop, pos, overflow, prev, pref, fallback, placement) {
   const stash = '_' + prop;
 
   // list of directions in order of preference
-  const dirs = _.unique([prev[stash], pref, fallback].filter(Boolean));
+  const dirs = _.uniq([prev[stash], pref, fallback].filter(Boolean));
 
   let dir;
   let value;

src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.test.js

@@ -18,7 +18,7 @@
  */
 
 import $ from 'jquery';
-import _ from 'lodash3';
+import _ from 'lodash';
 import sinon from 'sinon';
 
 import { positionTooltip } from './position_tooltip';