Commit 6a86e66d by Ivana Huckova Committed by GitHub

Query history: Fix search filtering if null value (#26768)

* Fix filtering if null value

* Add test coverage
parent 353b3822
...@@ -20,7 +20,7 @@ const mock: any = { ...@@ -20,7 +20,7 @@ const mock: any = {
datasourceId: 'datasource historyId', datasourceId: 'datasource historyId',
datasourceName: 'datasource history name', datasourceName: 'datasource history name',
queries: [ queries: [
{ expr: 'query1', refId: '1' }, { expr: 'query1', maxLines: null, refId: '1' },
{ expr: 'query2', refId: '2' }, { expr: 'query2', refId: '2' },
], ],
sessionName: '', sessionName: '',
...@@ -96,7 +96,7 @@ describe('addToRichHistory', () => { ...@@ -96,7 +96,7 @@ describe('addToRichHistory', () => {
mock.storedHistory, mock.storedHistory,
mock.storedHistory[0].datasourceId, mock.storedHistory[0].datasourceId,
mock.storedHistory[0].datasourceName, mock.storedHistory[0].datasourceName,
[{ expr: 'query1', refId: 'A' } as DataQuery, { expr: 'query2', refId: 'B' } as DataQuery], [{ expr: 'query1', maxLines: null, refId: 'A' } as DataQuery, { expr: 'query2', refId: 'B' } as DataQuery],
mock.testStarred, mock.testStarred,
mock.testComment, mock.testComment,
mock.testSessionName mock.testSessionName
...@@ -110,7 +110,7 @@ describe('addToRichHistory', () => { ...@@ -110,7 +110,7 @@ describe('addToRichHistory', () => {
mock.storedHistory, mock.storedHistory,
mock.storedHistory[0].datasourceId, mock.storedHistory[0].datasourceId,
mock.storedHistory[0].datasourceName, mock.storedHistory[0].datasourceName,
[{ expr: 'query1', refId: 'A' } as DataQuery, { expr: 'query2', refId: 'B' } as DataQuery], [{ expr: 'query1', maxLines: null, refId: 'A' } as DataQuery, { expr: 'query2', refId: 'B' } as DataQuery],
mock.testStarred, mock.testStarred,
mock.testComment, mock.testComment,
mock.testSessionName mock.testSessionName
......
...@@ -330,7 +330,7 @@ export function filterQueriesBySearchFilter(queries: RichHistoryQuery[], searchF ...@@ -330,7 +330,7 @@ export function filterQueriesBySearchFilter(queries: RichHistoryQuery[], searchF
const listOfMatchingQueries = query.queries.filter(query => const listOfMatchingQueries = query.queries.filter(query =>
// Remove fields in which we don't want to be searching // Remove fields in which we don't want to be searching
Object.values(_.omit(query, ['datasource', 'key', 'refId', 'hide', 'queryType'])).some((value: any) => Object.values(_.omit(query, ['datasource', 'key', 'refId', 'hide', 'queryType'])).some((value: any) =>
value.toString().includes(searchFilter) value?.toString().includes(searchFilter)
) )
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment