From b346c9b283445159cb4a6ff2dcb3c632ef716e51 Mon Sep 17 00:00:00 2001
From: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
Date: Sat, 15 Jul 2023 11:13:12 +0200
Subject: [PATCH] Loki: Fix duplicated rendering of resolution (#71670)

---
 .../querybuilder/components/LokiQueryBuilderOptions.test.tsx  | 3 ++-
 .../loki/querybuilder/components/LokiQueryBuilderOptions.tsx  | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx
index ab194e91d43..3c7a81833a8 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.test.tsx
@@ -94,10 +94,11 @@ describe('LokiQueryBuilderOptions', () => {
   });
 
   it('shows correct options for metric query', async () => {
-    setup({ expr: 'rate({foo="bar"}[5m]', step: '1m' });
+    setup({ expr: 'rate({foo="bar"}[5m]', step: '1m', resolution: 2 });
     expect(screen.queryByText('Line limit: 20')).not.toBeInTheDocument();
     expect(screen.getByText('Type: Range')).toBeInTheDocument();
     expect(screen.getByText('Step: 1m')).toBeInTheDocument();
+    expect(screen.getByText('Resolution: 1/2')).toBeInTheDocument();
   });
 
   it('does not shows resolution field if resolution is not set', async () => {
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
index 684aab8615f..b8bf5626cc4 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilderOptions.tsx
@@ -186,10 +186,6 @@ function getCollapsedInfo(
     items.push(`Legend: ${query.legendFormat}`);
   }
 
-  if (query.resolution) {
-    items.push(`Resolution: ${resolutionLabel?.label}`);
-  }
-
   items.push(`Type: ${queryTypeLabel?.label}`);
 
   if (isLogQuery) {