[aggTypes/fieldParam] move orderby back into condition

spalger · spalger · commit 001878663db6 · 2016-10-24T17:22:46.000-07:00
diff --git a/src/ui/public/agg_types/param_types/field.js b/src/ui/public/agg_types/param_types/field.js
@@ -44,9 +44,9 @@ export default function FieldAggParamFactory(Private, $filter) {
 
     if (this.filterFieldTypes) {
       fields = $filter('fieldType')(fields, this.filterFieldTypes);
+      fields = $filter('orderBy')(fields, ['type', 'name']);
     }
 
-    fields = $filter('orderBy')(fields, ['type', 'name']);
 
     return new IndexedArray({
       index: ['name'],

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ export default function FieldAggParamFactory(Private, $filter) {`
`44`	`44`
`45`	`45`	`if (this.filterFieldTypes) {`
`46`	`46`	`fields = $filter('fieldType')(fields, this.filterFieldTypes);`
	`47`	`+ fields = $filter('orderBy')(fields, ['type', 'name']);`
`47`	`48`	`}`
`48`	`49`
`49`		`- fields = $filter('orderBy')(fields, ['type', 'name']);`
`50`	`50`
`51`	`51`	`return new IndexedArray({`
`52`	`52`	`index: ['name'],`