From f5a52c8f0e3461014877b27c394653541cd105d7 Mon Sep 17 00:00:00 2001
From: Sven Grossmann <sven.grossmann@grafana.com>
Date: Wed, 18 Jan 2023 10:32:11 +0100
Subject: [PATCH] [9.3.x] Loki: Use queries `maxLines` if configured, even if
 it is zero (#61652) (#61657)

Loki: Use queries `maxLines` if configured, even if it is zero (#61652)

* user `query.maxLines` even if it is zero

* remove unnecessary comment

(cherry picked from commit 6c566a391d97b7f5b41c37eb4313fff629706ac7)
---
 public/app/plugins/datasource/loki/datasource.test.ts | 4 ++++
 public/app/plugins/datasource/loki/datasource.ts      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts
index 0b9046ce348..daff6a661f2 100644
--- a/public/app/plugins/datasource/loki/datasource.test.ts
+++ b/public/app/plugins/datasource/loki/datasource.test.ts
@@ -156,6 +156,10 @@ describe('LokiDatasource', () => {
     it('should use query max lines, if both exist, even if it is higher than ds max lines', async () => {
       await runTest(80, '40', 80);
     });
+
+    it('should use query max lines, if both exist, even if it is 0', async () => {
+      await runTest(0, '40', 0);
+    });
   });
 
   describe('When using adhoc filters', () => {
diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts
index c323694fa5d..59350898fec 100644
--- a/public/app/plugins/datasource/loki/datasource.ts
+++ b/public/app/plugins/datasource/loki/datasource.ts
@@ -162,7 +162,7 @@ export class LokiDatasource
   query(request: DataQueryRequest<LokiQuery>): Observable<DataQueryResponse> {
     const queries = request.targets
       .map(getNormalizedLokiQuery) // "fix" the `.queryType` prop
-      .map((q) => ({ ...q, maxLines: q.maxLines || this.maxLines })); // set maxLines if not set
+      .map((q) => ({ ...q, maxLines: q.maxLines ?? this.maxLines }));
 
     const fixedRequest = {
       ...request,