From 61042e1dd9270a8a31e7dbe3b80ad1e3927632b2 Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Mon, 14 Dec 2020 14:20:52 +0300
Subject: [PATCH] [TSVB] Fields lists do not populate all the times (#85530)

---
 .../application/components/vis_editor.js      | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js b/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js
index 520ad281576cd..89e7a50ab79b0 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js
@@ -74,20 +74,26 @@ export class VisEditor extends Component {
     this.props.eventEmitter.emit('dirtyStateChange', {
       isDirty: false,
     });
+
+    const extractedIndexPatterns = extractIndexPatterns(this.state.model);
+    if (!isEqual(this.state.extractedIndexPatterns, extractedIndexPatterns)) {
+      this.abortableFetchFields(extractedIndexPatterns).then((visFields) => {
+        this.setState({
+          visFields,
+          extractedIndexPatterns,
+        });
+      });
+    }
   }, VIS_STATE_DEBOUNCE_DELAY);
 
-  debouncedFetchFields = debounce(
-    (extractedIndexPatterns) => {
-      if (this.abortControllerFetchFields) {
-        this.abortControllerFetchFields.abort();
-      }
-      this.abortControllerFetchFields = new AbortController();
+  abortableFetchFields = (extractedIndexPatterns) => {
+    if (this.abortControllerFetchFields) {
+      this.abortControllerFetchFields.abort();
+    }
+    this.abortControllerFetchFields = new AbortController();
 
-      return fetchFields(extractedIndexPatterns, this.abortControllerFetchFields.signal);
-    },
-    VIS_STATE_DEBOUNCE_DELAY,
-    { leading: true }
-  );
+    return fetchFields(extractedIndexPatterns, this.abortControllerFetchFields.signal);
+  };
 
   handleChange = (partialModel) => {
     if (isEmpty(partialModel)) {
@@ -105,16 +111,6 @@ export class VisEditor extends Component {
       dirty = false;
     }
 
-    const extractedIndexPatterns = extractIndexPatterns(nextModel);
-    if (!isEqual(this.state.extractedIndexPatterns, extractedIndexPatterns)) {
-      this.debouncedFetchFields(extractedIndexPatterns).then((visFields) =>
-        this.setState({
-          visFields,
-          extractedIndexPatterns,
-        })
-      );
-    }
-
     this.setState({
       dirty,
       model: nextModel,