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

Explore: make query field suggestions more robust

Browse Source 
- drop invalid history items
- make highlighter more robust by defaulting to empty string on text to highlight
This commit is contained in:
David Kaltschmidt 2018-11-23 12:15:26 +01:00
parent 91d97ab5b5
commit f831836fa7
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/explore/Typeahead.tsx
View File

@ -42,7 +42,7 @@ class TypeaheadItem extends React.PureComponent<TypeaheadItemProps> {
render() { render() {
const { isSelected, item, prefix } = this.props; const { isSelected, item, prefix } = this.props;
const className = isSelected ? 'typeahead-item typeahead-item__selected' : 'typeahead-item'; const className = isSelected ? 'typeahead-item typeahead-item__selected' : 'typeahead-item';
const { label } = item; const label = item.label || '';
return ( return (
<li ref={this.getRef} className={className} onClick={this.onClick}> <li ref={this.getRef} className={className} onClick={this.onClick}>
<Highlighter textToHighlight={label} searchWords={[prefix]} highlightClassName="typeahead-match" /> <Highlighter textToHighlight={label} searchWords={[prefix]} highlightClassName="typeahead-match" />

5
public/app/plugins/datasource/logging/language_provider.ts
View File

@ -97,9 +97,10 @@ export default class LoggingLanguageProvider extends LanguageProvider {
if (history && history.length > 0) { if (history && history.length > 0) {
const historyItems = _.chain(history) const historyItems = _.chain(history)
.uniqBy('query.expr')
.take(HISTORY_ITEM_COUNT)
.map(h => h.query.expr) .map(h => h.query.expr)
.filter()
.uniq()
.take(HISTORY_ITEM_COUNT)
.map(wrapLabel) .map(wrapLabel)
.map(item => addHistoryMetadata(item, history)) .map(item => addHistoryMetadata(item, history))
.value(); .value();

5
public/app/plugins/datasource/prometheus/language_provider.ts
View File

@ -125,9 +125,10 @@ export default class PromQlLanguageProvider extends LanguageProvider {
if (history && history.length > 0) { if (history && history.length > 0) {
const historyItems = _.chain(history) const historyItems = _.chain(history)
.uniqBy('query.expr')
.take(HISTORY_ITEM_COUNT)
.map(h => h.query.expr) .map(h => h.query.expr)
.filter()
.uniq()
.take(HISTORY_ITEM_COUNT)
.map(wrapLabel) .map(wrapLabel)
.map(item => addHistoryMetadata(item, history)) .map(item => addHistoryMetadata(item, history))
.value(); .value();