From e6d2e4d8fe551ad6e913b40c3a0103a9626c51a9 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 16:11:13 +0100
Subject: [PATCH] [v10.3.x] Logs: Fix toggleable filters to be applied for
 specified query (#81376)

Logs: Fix toggleable filters to be applied for specified query (#81368)

(cherry picked from commit 8c212a19523e29f29bfc2759a663f547d2e84860)

Co-authored-by: Ivana Huckova <30407135+ivanahuckova@users.noreply.github.com>
---
 public/app/features/logs/logsModel.test.ts | 6 ++++++
 public/app/features/logs/logsModel.ts      | 1 +
 2 files changed, 7 insertions(+)

diff --git a/public/app/features/logs/logsModel.test.ts b/public/app/features/logs/logsModel.test.ts
index 58fa2ec512d..9a1f6d1bb04 100644
--- a/public/app/features/logs/logsModel.test.ts
+++ b/public/app/features/logs/logsModel.test.ts
@@ -1549,6 +1549,7 @@ const mockLogRow = {
       },
       { name: 'labels', type: FieldType.other, values: [{ app: 'app01' }, { app: 'app02' }] },
     ],
+    refId: 'Z',
   }),
   rowIndex: 0,
 } as unknown as LogRowModel;
@@ -1587,4 +1588,9 @@ describe('logRowToDataFrame', () => {
 
     expect(result).toBe(null);
   });
+
+  it('should use refId from original DataFrame', () => {
+    const result = logRowToSingleRowDataFrame(mockLogRow);
+    expect(result?.refId).toBe(mockLogRow.dataFrame.refId);
+  });
 });
diff --git a/public/app/features/logs/logsModel.ts b/public/app/features/logs/logsModel.ts
index d49dfd9a414..d2e8fa944b5 100644
--- a/public/app/features/logs/logsModel.ts
+++ b/public/app/features/logs/logsModel.ts
@@ -809,6 +809,7 @@ export function logRowToSingleRowDataFrame(logRow: LogRowModel): DataFrame | nul
   // create a new data frame containing only the single row from `logRow`
   const frame = createDataFrame({
     fields: originFrame.fields.map((field) => ({ ...field, values: [field.values[logRow.rowIndex]] })),
+    refId: originFrame.refId,
   });
 
   return frame;