IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Prevents crash when searchFilter is non string (#20526)

Browse Source
This commit is contained in:
Hugo Häggmark
2019-11-21 06:21:36 +01:00
committed by GitHub
parent 2079386a7d
commit e03d702d0c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/templating/specs/variable.test.ts
View File

@@ -85,6 +85,14 @@ describe('containsSearchFilter', () => {
}); });
}); });
describe('when called with an object', () => {
it('then it should return false', () => {
const result = containsSearchFilter({});
expect(result).toBe(false);
});
});
describe(`when called with a query without ${SEARCH_FILTER_VARIABLE}`, () => { describe(`when called with a query without ${SEARCH_FILTER_VARIABLE}`, () => {
it('then it should return false', () => { it('then it should return false', () => {
const result = containsSearchFilter('$app.*'); const result = containsSearchFilter('$app.*');

4
public/app/features/templating/variable.ts
View File

@@ -18,8 +18,8 @@ export const variableRegexExec = (variableString: string) => {
export const SEARCH_FILTER_VARIABLE = '__searchFilter'; export const SEARCH_FILTER_VARIABLE = '__searchFilter';
export const containsSearchFilter = (query: string): boolean => export const containsSearchFilter = (query: string | unknown): boolean =>
query ? query.indexOf(SEARCH_FILTER_VARIABLE) !== -1 : false; query && typeof query === 'string' ? query.indexOf(SEARCH_FILTER_VARIABLE) !== -1 : false;
export const getSearchFilterScopedVar = (args: { export const getSearchFilterScopedVar = (args: {
query: string; query: string;