removing Private (#37847) (#37871)

elastic · Jun 3, 2019 · 8eb3937 · 8eb3937
1 parent 1bbb8e3
commit 8eb3937
Show file tree

Hide file tree

Showing 13 changed files with 1,275 additions and 1,327 deletions.
diff --git a/src/legacy/ui/public/vislib/__tests__/visualizations/time_marker.js b/src/legacy/ui/public/vislib/__tests__/visualizations/time_marker.js
@@ -23,7 +23,7 @@ import ngMock from 'ng_mock';
 import series from 'fixtures/vislib/mock_data/date_histogram/_series';
 import terms from 'fixtures/vislib/mock_data/terms/_columns';
 import $ from 'jquery';
-import { VislibVisualizationsTimeMarkerProvider } from '../../visualizations/time_marker';
+import { TimeMarker } from '../../visualizations/time_marker';
 
 describe('Vislib Time Marker Test Suite', function () {
   const height = 50;
@@ -49,7 +49,6 @@ describe('Vislib Time Marker Test Suite', function () {
     });
   };
   const times = [];
-  let TimeMarker;
   let defaultMarker;
   let customMarker;
   let selection;
@@ -59,8 +58,7 @@ describe('Vislib Time Marker Test Suite', function () {
   let domain;
 
   beforeEach(ngMock.module('kibana'));
-  beforeEach(ngMock.inject(function (Private) {
-    TimeMarker = Private(VislibVisualizationsTimeMarkerProvider);
+  beforeEach(ngMock.inject(function () {
     minDomain = getExtent(series.series, d3.min);
     maxDomain = getExtent(series.series, d3.max);
     domain = [minDomain, maxDomain];

diff --git a/src/legacy/ui/public/vislib/visualizations/_chart.js b/src/legacy/ui/public/vislib/visualizations/_chart.js
@@ -21,15 +21,14 @@ import d3 from 'd3';
 import _ from 'lodash';
 import { dataLabel } from '../lib/_data_label';
 import { VislibLibDispatchProvider } from '../lib/dispatch';
-import { TooltipProvider } from '../../vis/components/tooltip';
+import { Tooltip } from '../../vis/components/tooltip';
 import { getFormat } from '../../visualize/loader/pipeline_helpers/utilities';
 import { HierarchicalTooltipFormatterProvider } from '../../agg_response/hierarchical/_hierarchical_tooltip_formatter';
 import { PointSeriesTooltipFormatter } from '../../agg_response/point_series/_tooltip_formatter';
 
 export function VislibVisualizationsChartProvider(Private) {
 
   const Dispatch = Private(VislibLibDispatchProvider);
-  const Tooltip = Private(TooltipProvider);
   /**
    * The Base Class for all visualizations.
    *

diff --git a/src/legacy/ui/public/vislib/visualizations/gauge_chart.js b/src/legacy/ui/public/vislib/visualizations/gauge_chart.js
@@ -19,11 +19,10 @@
 
 import d3 from 'd3';
 import { VislibVisualizationsChartProvider } from './_chart';
-import { GaugeTypesProvider } from './gauges/gauge_types';
+import { gaugeTypes } from './gauges/gauge_types';
 
 export function GaugeChartProvider(Private) {
   const Chart = Private(VislibVisualizationsChartProvider);
-  const gaugeTypes = Private(GaugeTypesProvider);
 
   class GaugeChart extends Chart {
     constructor(handler, chartEl, chartData) {

diff --git a/src/legacy/ui/public/vislib/visualizations/gauges/gauge_types.js b/src/legacy/ui/public/vislib/visualizations/gauges/gauge_types.js
@@ -17,11 +17,8 @@
  * under the License.
  */
 
-import { MeterGaugeProvider } from './meter';
+import { MeterGauge } from './meter';
 
-export function GaugeTypesProvider(Private) {
-
-  return {
-    meter: Private(MeterGaugeProvider)
-  };
-}
+export const gaugeTypes = {
+  meter: MeterGauge
+};