From 0ff6442e4556793fb7c6981b4900795690012567 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 12:57:14 +0300
Subject: [PATCH] [v11.0.x] Loki: Fix editor history in wrong order (#88669)

Loki: Fix editor history in wrong order (#88666)

(cherry picked from commit 2fb63cd2e61e6075d3d5e66a0a7d8ece0b676d71)

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
---
 .../CompletionDataProvider.test.ts              | 17 ++++++++++++-----
 .../CompletionDataProvider.ts                   |  3 ++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts
index 5b2d1a62eb0..77af2deeaed 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts
@@ -13,21 +13,28 @@ const history: Array<HistoryItem<LokiQuery>> = [
     ts: 12345678,
     query: {
       refId: 'test-1',
-      expr: '{test: unit}',
+      expr: '{test="unit"}',
     },
   },
   {
     ts: 87654321,
     query: {
       refId: 'test-1',
-      expr: '{unit: test}',
+      expr: '{unit="test"}',
     },
   },
   {
     ts: 87654321,
     query: {
       refId: 'test-1',
-      expr: '{unit: test}',
+      expr: '{unit="test"}',
+    },
+  },
+  {
+    ts: 87654325,
+    query: {
+      refId: 'test-2',
+      expr: '{unit="test"} ', // will be trimmed and removed
     },
   },
   {
@@ -83,11 +90,11 @@ describe('CompletionDataProvider', () => {
   });
 
   test('Returns the expected history entries', () => {
-    expect(completionProvider.getHistory()).toEqual(['{test: unit}', '{unit: test}']);
+    expect(completionProvider.getHistory()).toEqual(['{unit="test"}', '{test="unit"}']);
   });
 
   test('Processes updates to the current historyRef value', () => {
-    expect(completionProvider.getHistory()).toEqual(['{test: unit}', '{unit: test}']);
+    expect(completionProvider.getHistory()).toEqual(['{unit="test"}', '{test="unit"}']);
 
     historyRef.current = [
       {
diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.ts
index f982d524855..6940059e57a 100644
--- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.ts
+++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.ts
@@ -32,7 +32,8 @@ export class CompletionDataProvider {
 
   getHistory() {
     return chain(this.historyRef.current)
-      .map((history: HistoryItem<LokiQuery>) => history.query.expr)
+      .orderBy('ts', 'desc')
+      .map((history: HistoryItem<LokiQuery>) => history.query.expr.trim())
       .filter()
       .uniq()
       .value();