[ML] Reordering aggregation options in wizards (#43445)

* [ML] Reordering aggregation options in wizards * fixing tests
elastic · Aug 16, 2019 · ca393e6 · ca393e6
1 parent 5088548
commit ca393e6
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 40 deletions.
diff --git a/x-pack/legacy/plugins/ml/public/services/new_job_capabilities_service.ts b/x-pack/legacy/plugins/ml/public/services/new_job_capabilities_service.ts
@@ -88,7 +88,7 @@ class NewJobCapsService {
       if (this._includeCountAgg === true) {
         const { countField, countAggs } = createCountFieldAndAggs();
 
-        fields.push(countField);
+        fields.splice(0, 0, countField);
         aggs.push(...countAggs);
       }
 

diff --git a/.../server/models/job_service/new_job_caps/__mocks__/results/cloudwatch_rollup_job_caps.json b/.../server/models/job_service/new_job_caps/__mocks__/results/cloudwatch_rollup_job_caps.json
@@ -12,10 +12,10 @@
           "min": "avg"
         },
         "fieldIds": [
-          "DiskReadBytes",
-          "NetworkOut",
           "CPUUtilization",
-          "NetworkIn"
+          "DiskReadBytes",
+          "NetworkIn",
+          "NetworkOut"
         ]
       },
       {
@@ -29,10 +29,10 @@
           "min": "avg"
         },
         "fieldIds": [
-          "DiskReadBytes",
-          "NetworkOut",
           "CPUUtilization",
-          "NetworkIn"
+          "DiskReadBytes",
+          "NetworkIn",
+          "NetworkOut"
         ]
       },
       {
@@ -46,10 +46,10 @@
           "min": "avg"
         },
         "fieldIds": [
-          "DiskReadBytes",
-          "NetworkOut",
           "CPUUtilization",
-          "NetworkIn"
+          "DiskReadBytes",
+          "NetworkIn",
+          "NetworkOut"
         ]
       },
       {
@@ -108,8 +108,8 @@
           "min": "min"
         },
         "fieldIds": [
-          "NetworkOut",
-          "NetworkIn"
+          "NetworkIn",
+          "NetworkOut"
         ]
       },
       {
@@ -123,12 +123,24 @@
           "min": "max"
         },
         "fieldIds": [
-          "DiskReadBytes",
-          "CPUUtilization"
+          "CPUUtilization",
+          "DiskReadBytes"
         ]
       }
     ],
     "fields": [
+      {
+        "id": "CPUUtilization",
+        "name": "CPUUtilization",
+        "type": "double",
+        "aggregatable": true,
+        "aggIds": [
+          "mean",
+          "high_mean",
+          "low_mean",
+          "max"
+        ]
+      },
       {
         "id": "DiskReadBytes",
         "name": "DiskReadBytes",
@@ -156,8 +168,8 @@
         ]
       },
       {
-        "id": "NetworkOut",
-        "name": "NetworkOut",
+        "id": "NetworkIn",
+        "name": "NetworkIn",
         "type": "double",
         "aggregatable": true,
         "aggIds": [
@@ -168,20 +180,8 @@
         ]
       },
       {
-        "id": "CPUUtilization",
-        "name": "CPUUtilization",
-        "type": "double",
-        "aggregatable": true,
-        "aggIds": [
-          "mean",
-          "high_mean",
-          "low_mean",
-          "max"
-        ]
-      },
-      {
-        "id": "NetworkIn",
-        "name": "NetworkIn",
+        "id": "NetworkOut",
+        "name": "NetworkOut",
         "type": "double",
         "aggregatable": true,
         "aggIds": [

diff --git a/...ugins/ml/server/models/job_service/new_job_caps/__mocks__/results/farequote_job_caps.json b/...ugins/ml/server/models/job_service/new_job_caps/__mocks__/results/farequote_job_caps.json
@@ -172,6 +172,15 @@
       }
     ],
     "fields": [
+      {
+        "id": "airline",
+        "name": "airline",
+        "type": "keyword",
+        "aggregatable": true,
+        "aggIds": [
+          "distinct_count"
+        ]
+      },
       {
         "id": "responsetime",
         "name": "responsetime",
@@ -191,15 +200,6 @@
           "max",
           "distinct_count"
         ]
-      },
-      {
-        "id": "airline",
-        "name": "airline",
-        "type": "keyword",
-        "aggregatable": true,
-        "aggIds": [
-          "distinct_count"
-        ]
       }
     ]
   }

diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/new_job_caps/field_service.ts b/x-pack/legacy/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
@@ -79,7 +79,7 @@ class FieldsService {
         }
       });
     }
-    return fields;
+    return fields.sort((a, b) => a.id.localeCompare(b.id));
   }
 
   // public function to load fields from _field_caps and create a list
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,7 +79,7 @@ class FieldsService { @@
             }
           });
         }
-        return fields;
+        return fields.sort((a, b) => a.id.localeCompare(b.id));
       }
       // public function to load fields from _field_caps and create a list
@@ Expand Down @@