public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explore: do not show default suggestions after expressions

Browse Source 
- an expression ends on closing braces
- exclude expressions from the default/empty suggestions
This commit is contained in:
David Kaltschmidt
2018-10-05 18:51:49 +02:00
parent f6d332562a
commit 6260a6d2f3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/explore/PromQueryField.tsx
+4 -4
View File
@@ -308,10 +308,10 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
} else if (_.includes(wrapperClasses, 'context-aggregation')) { } else if (_.includes(wrapperClasses, 'context-aggregation')) {
return this.getAggregationTypeahead.apply(this, arguments); return this.getAggregationTypeahead.apply(this, arguments);
} else if ( } else if (
// Non-empty but not inside known token // Show default suggestions in a couple of scenarios
(prefix && !tokenRecognized) || (prefix && !tokenRecognized) || // Non-empty prefix, but not inside known token
(prefix === '' && !text.match(/^[)\s]+$/)) || // Empty context or after ')' (prefix === '' && !text.match(/^[\]})\s]+$/)) || // Empty prefix, but not following a closing brace
text.match(/[+\-*/^%]/) // After binary operator text.match(/[+\-*/^%]/) // Anything after binary operator
) { ) {
return this.getEmptyTypeahead(); return this.getEmptyTypeahead();
} }