From faf538369d5cbe81d60e46f389bc1daff7b5117a Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Tue, 25 Sep 2018 13:37:10 +0100
Subject: [PATCH] [ML] Fixing missing field when cloning a distinct count job
 (#23439) (#23454)

---
 .../simple/components/utils/prepopulate_job_settings.js      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/x-pack/plugins/ml/public/jobs/new_job/simple/components/utils/prepopulate_job_settings.js b/x-pack/plugins/ml/public/jobs/new_job/simple/components/utils/prepopulate_job_settings.js
index 482b6195cd4853..122ea69fb18635 100644
--- a/x-pack/plugins/ml/public/jobs/new_job/simple/components/utils/prepopulate_job_settings.js
+++ b/x-pack/plugins/ml/public/jobs/new_job/simple/components/utils/prepopulate_job_settings.js
@@ -58,6 +58,11 @@ export function jobSettingsFromJob(job, aggTypeOptions) {
     const field = { agg: getKibanaAggName(func) };
     if (d.field_name) {
       field.fieldName = d.field_name;
+    } else if (func === 'distinct_count' && job.analysis_config.summary_count_field_name !== undefined) {
+      const fieldMatch = job.analysis_config.summary_count_field_name.match(/^dc_(.+)/);
+      if (fieldMatch[1] !== undefined) {
+        field.fieldName = fieldMatch[1];
+      }
     }
 
     jobSettings.fields = [field];