Trying to upgrade to 6.4.x

datasweet · Oct 15, 2018 · 899df65 · 899df65
1 parent 000968a
commit 899df65
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/build.sh b/build.sh
@@ -17,6 +17,10 @@ if [ -n "$1" ]; then
   exit
 fi
 
+build 6.4.2
+build 6.4.1
+build 6.4.0
+
 build 6.3.2
 build 6.3.1
 build 6.3.0

diff --git a/public/agg_types/formula.js b/public/agg_types/formula.js
@@ -1,12 +1,12 @@
 import { capitalize, map } from 'lodash';
-import { AggTypesMetricsMetricAggTypeProvider } from 'ui/agg_types/metrics/metric_agg_type';
-import * as prov from 'ui/registry/field_formats';
+import * as magprov from 'ui/agg_types/metrics/metric_agg_type';
+import * as ffprov from 'ui/registry/field_formats';
 import formulaEditor from './formula.html';
 import formatterEditor from './formatter.html';
 
 export function AggTypesMetricsFormulaProvider(Private) {
-  const MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
-  const fieldFormats = prov.fieldFormats || Private(prov.RegistryFieldFormatsProvider);
+  const MetricAggType = magprov.MetricAggType || Private(magprov.AggTypesMetricsMetricAggTypeProvider);
+  const fieldFormats = ffprov.fieldFormats || Private(ffprov.RegistryFieldFormatsProvider);
   const defaultValue = null;
   const formatters = map(['number', 'percent', 'boolean', 'bytes', 'numeral'], f => {
     return { id: f, title: capitalize(f) };

diff --git a/public/decorators/agg_types.js b/public/decorators/agg_types.js
@@ -1,8 +1,8 @@
-import { AggTypesIndexProvider } from 'ui/agg_types';
+import * as prov from 'ui/agg_types';
 import { AggTypesMetricsFormulaProvider } from 'plugins/datasweet_formula/agg_types/formula';
 
 export function decorateAggTypes(Private) {
-  const AggTypes = Private(AggTypesIndexProvider);
+  const AggTypes = prov.aggTypes || Private(prov.AggTypesIndexProvider);
   const AggFormula = Private(AggTypesMetricsFormulaProvider);
   AggFormula.type = 'metrics';
   AggTypes.push(AggFormula);