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 strict null errors that resulted from search (#25950)

Browse Source
This commit is contained in:
Ivana Huckova 2020-06-30 18:55:31 +02:00 committed by GitHub
parent 4bb3f66569
commit 46540f3146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/core/utils/richHistory.ts
View File

@ -346,7 +346,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 => Object.values(_.omit(query, ['datasource', 'key', 'refId', 'hide', 'queryType'])).some((value: any) =>
value.toString().includes(searchFilter) value.toString().includes(searchFilter)
) )
); );
@ -356,7 +356,7 @@ export function filterQueriesBySearchFilter(queries: RichHistoryQuery[], searchF
} }
export function filterQueriesByDataSource(queries: RichHistoryQuery[], listOfDatasourceFilters: string[] | null) { export function filterQueriesByDataSource(queries: RichHistoryQuery[], listOfDatasourceFilters: string[] | null) {
return listOfDatasourceFilters?.length > 0 return listOfDatasourceFilters && listOfDatasourceFilters.length > 0
? queries.filter(q => listOfDatasourceFilters.includes(q.datasourceName)) ? queries.filter(q => listOfDatasourceFilters.includes(q.datasourceName))
: queries; : queries;
} }

6
public/app/features/explore/RichHistory/RichHistoryQueriesTab.tsx
View File

@ -138,7 +138,7 @@ export function RichHistoryQueriesTab(props: Props) {
} = props; } = props;
const [timeFilter, setTimeFilter] = useState<[number, number]>([0, retentionPeriod]); const [timeFilter, setTimeFilter] = useState<[number, number]>([0, retentionPeriod]);
const [filteredQueries, setFilteredQueries] = useState([]); const [filteredQueries, setFilteredQueries] = useState<RichHistoryQuery[]>([]);
const [searchInput, setSearchInput] = useState(''); const [searchInput, setSearchInput] = useState('');
const theme = useTheme(); const theme = useTheme();
@ -153,7 +153,7 @@ export function RichHistoryQueriesTab(props: Props) {
filterAndSortQueries( filterAndSortQueries(
queries, queries,
sortOrder, sortOrder,
datasourceFilters?.map(d => d.value), datasourceFilters?.map(d => d.value) as string[] | null,
searchValue, searchValue,
timeFilter timeFilter
) )
@ -167,7 +167,7 @@ export function RichHistoryQueriesTab(props: Props) {
filterAndSortQueries( filterAndSortQueries(
queries, queries,
sortOrder, sortOrder,
datasourceFilters?.map(d => d.value), datasourceFilters?.map(d => d.value) as string[] | null,
searchInput, searchInput,
timeFilter timeFilter
) )

6
public/app/features/explore/RichHistory/RichHistoryStarredTab.tsx
View File

@ -83,7 +83,7 @@ export function RichHistoryStarredTab(props: Props) {
exploreId, exploreId,
} = props; } = props;
const [filteredQueries, setFilteredQueries] = useState([]); const [filteredQueries, setFilteredQueries] = useState<RichHistoryQuery[]>([]);
const [searchInput, setSearchInput] = useState(''); const [searchInput, setSearchInput] = useState('');
const theme = useTheme(); const theme = useTheme();
@ -99,7 +99,7 @@ export function RichHistoryStarredTab(props: Props) {
filterAndSortQueries( filterAndSortQueries(
starredQueries, starredQueries,
sortOrder, sortOrder,
datasourceFilters?.map(d => d.value), datasourceFilters?.map(d => d.value) as string[] | null,
searchValue searchValue
) )
); );
@ -112,7 +112,7 @@ export function RichHistoryStarredTab(props: Props) {
filterAndSortQueries( filterAndSortQueries(
starredQueries, starredQueries,
sortOrder, sortOrder,
datasourceFilters?.map(d => d.value), datasourceFilters?.map(d => d.value) as string[] | null,
searchInput searchInput
) )
); );