From 68197a18254848587ea5d48f6fa21a492a114e06 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <ivana.huckova@gmail.com>
Date: Mon, 28 Aug 2023 15:03:21 +0200
Subject: [PATCH] Update defaultPrecisionString and move

---
 public/app/plugins/datasource/elasticsearch/QueryBuilder.ts   | 4 ++--
 .../BucketAggregationsEditor/SettingsEditor/useDescription.ts | 4 +++-
 .../components/QueryEditor/BucketAggregationsEditor/utils.ts  | 2 +-
 public/app/plugins/datasource/elasticsearch/queryDef.ts       | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/QueryBuilder.ts b/public/app/plugins/datasource/elasticsearch/QueryBuilder.ts
index b55be456509..f4d3b211daa 100644
--- a/public/app/plugins/datasource/elasticsearch/QueryBuilder.ts
+++ b/public/app/plugins/datasource/elasticsearch/QueryBuilder.ts
@@ -7,7 +7,7 @@ import {
   isPipelineAggregation,
   isPipelineAggregationWithMultipleBucketPaths,
 } from './components/QueryEditor/MetricAggregationsEditor/aggregations';
-import { defaultBucketAgg, defaultMetricAgg, findMetricById, highlightTags } from './queryDef';
+import { defaultBucketAgg, defaultMetricAgg, findMetricById, highlightTags, defaultPrecisionString } from './queryDef';
 import {
   ElasticsearchQuery,
   TermsQuery,
@@ -231,7 +231,7 @@ export class ElasticQueryBuilder {
         case 'geohash_grid': {
           esAgg['geohash_grid'] = {
             field: aggDef.field,
-            precision: aggDef.settings?.precision,
+            precision: aggDef.settings?.precision || defaultPrecisionString,
           };
           break;
         }
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/useDescription.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/useDescription.ts
index 7e58dcf32ce..e13257099fb 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/useDescription.ts
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/SettingsEditor/useDescription.ts
@@ -1,7 +1,9 @@
+import { defaultPrecisionString } from 'app/plugins/datasource/elasticsearch/queryDef';
+
 import { BucketAggregation } from '../../../../types';
 import { describeMetric, convertOrderByToMetricId } from '../../../../utils';
 import { useQuery } from '../../ElasticsearchQueryContext';
-import { bucketAggregationConfig, orderByOptions, orderOptions, defaultPrecisionString } from '../utils';
+import { bucketAggregationConfig, orderByOptions, orderOptions } from '../utils';
 
 const hasValue = (value: string) => (object: { value?: string }) => object.value === value;
 
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/utils.ts b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/utils.ts
index e1e46986fad..d5d93da1568 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/utils.ts
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/BucketAggregationsEditor/utils.ts
@@ -1,9 +1,9 @@
 import { InternalTimeZones, SelectableValue } from '@grafana/data';
 
+import { defaultPrecisionString } from '../../../queryDef';
 import { BucketsConfiguration } from '../../../types';
 
 import { defaultFilter } from './SettingsEditor/FiltersSettingsEditor/utils';
-export const defaultPrecisionString = '3';
 
 export const bucketAggregationConfig: BucketsConfiguration = {
   terms: {
diff --git a/public/app/plugins/datasource/elasticsearch/queryDef.ts b/public/app/plugins/datasource/elasticsearch/queryDef.ts
index 5ae125269dd..160c0a0078e 100644
--- a/public/app/plugins/datasource/elasticsearch/queryDef.ts
+++ b/public/app/plugins/datasource/elasticsearch/queryDef.ts
@@ -32,6 +32,8 @@ export const highlightTags = {
   post: '@/HIGHLIGHT@',
 };
 
+export const defaultPrecisionString = '3';
+
 export function defaultMetricAgg(id = '1'): MetricAggregation {
   return { type: 'count', id };
 }