From b47b8798d3a8baa1db0e86b738f17c7bd1e05997 Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Wed, 19 Apr 2023 11:03:45 +0200 Subject: [PATCH] Logs Context: Always display context toggle (#66379) * Loki search words: process negative expressions as negative search words * Revert "Loki search words: process negative expressions as negative search words" This reverts commit d875b25049b2f58f5ad382824cf68c375582aff7. * Logs Context: always display --- public/app/plugins/datasource/loki/datasource.test.ts | 8 ++++++++ public/app/plugins/datasource/loki/datasource.ts | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/loki/datasource.test.ts b/public/app/plugins/datasource/loki/datasource.test.ts index ad3e48e7944..e9c275581aa 100644 --- a/public/app/plugins/datasource/loki/datasource.test.ts +++ b/public/app/plugins/datasource/loki/datasource.test.ts @@ -1142,6 +1142,14 @@ describe('Variable support', () => { }); }); +describe('showContextToggle()', () => { + it('always displays logs context', () => { + const ds = createLokiDatasource(templateSrvStub); + + expect(ds.showContextToggle()).toBe(true); + }); +}); + function assertAdHocFilters(query: string, expectedResults: string, ds: LokiDatasource) { const lokiQuery: LokiQuery = { refId: 'A', expr: query }; const result = ds.addAdHocFilters(lokiQuery.expr); diff --git a/public/app/plugins/datasource/loki/datasource.ts b/public/app/plugins/datasource/loki/datasource.ts index f615db3e723..cd4dba02ca8 100644 --- a/public/app/plugins/datasource/loki/datasource.ts +++ b/public/app/plugins/datasource/loki/datasource.ts @@ -755,7 +755,7 @@ export class LokiDatasource } showContextToggle(row?: LogRowModel): boolean { - return (row && row.searchWords && row.searchWords.length > 0) === true; + return true; } processError(err: FetchError, target: LokiQuery) {