From 3b523c13a7cd0110823e970d6dca97072b0553aa Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 8 Mar 2023 01:02:26 +0200
Subject: [PATCH] [v9.4.x] OpenTSDB: Allow metric autocomplete to use suggest
 api on every input (#64361)

OpenTSDB: Allow metric autocomplete to use suggest api on every input (#62045)

* allow metric autocomplete by suggest api

* debounce sugggest metrics

* debounce sugggest metrics with debounce-promise

* commit for tests

(cherry picked from commit 70c18508887f50185fbdbb5032aaede070a355c1)

Co-authored-by: Brendan O'Handley <brendan.ohandley@grafana.com>
---
 .../opentsdb/components/MetricSection.tsx     | 37 +++++--------------
 .../components/OpenTsdbQueryEditor.tsx        |  6 +--
 2 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/public/app/plugins/datasource/opentsdb/components/MetricSection.tsx b/public/app/plugins/datasource/opentsdb/components/MetricSection.tsx
index e90b7c8e96d..edb3adad010 100644
--- a/public/app/plugins/datasource/opentsdb/components/MetricSection.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/MetricSection.tsx
@@ -1,7 +1,8 @@
-import React, { useCallback, useState } from 'react';
+import debounce from 'debounce-promise';
+import React from 'react';
 
 import { SelectableValue, toOption } from '@grafana/data';
-import { Select, Input, InlineFormLabel } from '@grafana/ui';
+import { Select, Input, InlineFormLabel, AsyncSelect } from '@grafana/ui';
 
 import { OpenTsdbQuery } from '../types';
 
@@ -9,26 +10,13 @@ export interface MetricSectionProps {
   query: OpenTsdbQuery;
   onChange: (query: OpenTsdbQuery) => void;
   onRunQuery: () => void;
-  suggestMetrics: () => Promise<SelectableValue[]>;
+  suggestMetrics: (value: string) => Promise<SelectableValue[]>;
   aggregators: string[];
 }
 
 export function MetricSection({ query, onChange, onRunQuery, suggestMetrics, aggregators }: MetricSectionProps) {
-  const [state, setState] = useState<{
-    metrics?: Array<SelectableValue<string>>;
-    isLoading?: boolean;
-  }>({});
-
-  // We are matching words split with space
-  const splitSeparator = ' ';
-  const customFilterOption = useCallback((option: SelectableValue<string>, searchQuery: string) => {
-    const label = option.value ?? '';
-
-    const searchWords = searchQuery.split(splitSeparator);
-    return searchWords.reduce((acc, cur) => acc && label.toLowerCase().includes(cur.toLowerCase()), true);
-  }, []);
-
   const aggregatorOptions = aggregators.map((value: string) => toOption(value));
+  const metricSearch = debounce((query: string) => suggestMetrics(query), 350);
 
   return (
     <div className="gf-form-inline" data-testid={testIds.section}>
@@ -36,23 +24,16 @@ export function MetricSection({ query, onChange, onRunQuery, suggestMetrics, agg
         <InlineFormLabel width={8} className="query-keyword">
           Metric
         </InlineFormLabel>
-        <Select
+        {/* metric async select: autocomplete calls opentsdb suggest API */}
+        <AsyncSelect
           width={25}
           inputId="opentsdb-metric-select"
           className="gf-form-input"
           value={query.metric ? toOption(query.metric) : undefined}
           placeholder="Metric name"
           allowCustomValue
-          filterOption={customFilterOption}
-          onOpenMenu={async () => {
-            if (!state.metrics) {
-              setState({ isLoading: true });
-              const metrics = await suggestMetrics();
-              setState({ metrics, isLoading: undefined });
-            }
-          }}
-          isLoading={state.isLoading}
-          options={state.metrics}
+          loadOptions={metricSearch}
+          defaultOptions={[]}
           onChange={({ value }) => {
             if (value) {
               onChange({ ...query, metric: value });
diff --git a/public/app/plugins/datasource/opentsdb/components/OpenTsdbQueryEditor.tsx b/public/app/plugins/datasource/opentsdb/components/OpenTsdbQueryEditor.tsx
index cfb504f9946..f3336614426 100644
--- a/public/app/plugins/datasource/opentsdb/components/OpenTsdbQueryEditor.tsx
+++ b/public/app/plugins/datasource/opentsdb/components/OpenTsdbQueryEditor.tsx
@@ -74,10 +74,8 @@ export function OpenTsdbQueryEditor({
     }
   });
 
-  // previously called as an autocomplete on every input,
-  // in this we call it once on init and filter in the MetricSection component
-  async function suggestMetrics(): Promise<Array<{ value: string; description: string }>> {
-    return datasource.metricFindQuery('metrics()').then(getTextValues);
+  async function suggestMetrics(value: string): Promise<Array<{ value: string; description: string }>> {
+    return datasource.metricFindQuery(`metrics(${value})`).then(getTextValues);
   }
 
   // previously called as an autocomplete on every input,