Browse Source

HUE-7062 [dashboard] Always suggest aggregate functions in the formula autocomplete

Johan Ahlen 8 years ago
parent
commit
5a98bc6

+ 12 - 12
desktop/core/src/desktop/static/desktop/js/autocomplete/jison/solrExpressionParser.jison

@@ -100,46 +100,46 @@ NonParenthesizedSolrExpression
 NonParenthesizedSolrExpression_EDIT
  : 'NUMBER' 'CURSOR'                                                 --> { suggestOperators: true }
  | 'IDENTIFIER' 'CURSOR'                                             --> { suggestOperators: true }
- | 'CURSOR' 'NUMBER'                                                 --> { suggestFunctions: true, suggestFields: true }
- | 'CURSOR' 'IDENTIFIER'                                             --> { suggestFunctions: true, suggestFields: true }
+ | 'CURSOR' 'NUMBER'                                                 --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
+ | 'CURSOR' 'IDENTIFIER'                                             --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
  ;
 
 NonParenthesizedSolrExpression_EDIT
- : 'FUNCTION' '(' 'CURSOR' RightParenthesisOrError                   --> { suggestFunctions: true, suggestFields: true }
+ : 'FUNCTION' '(' 'CURSOR' RightParenthesisOrError                   --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
  | 'FUNCTION' '(' ArgumentList_EDIT RightParenthesisOrError          --> $3
  | 'FUNCTION' '(' ArgumentList ')' 'CURSOR'                          --> { suggestOperators: true }
  ;
 
 NonParenthesizedSolrExpression_EDIT
- : SolrExpression '+' 'CURSOR'                                       --> { suggestFunctions: true, suggestFields: true }
- | 'CURSOR' '+' SolrExpression                                       --> { suggestFunctions: true, suggestFields: true }
+ : SolrExpression '+' 'CURSOR'                                       --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
+ | 'CURSOR' '+' SolrExpression                                       --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
  | SolrExpression_EDIT '+' SolrExpression                            --> $1
  | SolrExpression '+' SolrExpression_EDIT                            --> $3
  ;
 
 NonParenthesizedSolrExpression_EDIT
- : SolrExpression '-' 'CURSOR'                                       --> { suggestFunctions: true, suggestFields: true }
- | 'CURSOR' '-' SolrExpression                                       --> { suggestFunctions: true, suggestFields: true }
+ : SolrExpression '-' 'CURSOR'                                       --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
+ | 'CURSOR' '-' SolrExpression                                       --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
  | SolrExpression_EDIT '-' SolrExpression                            --> $1
  | SolrExpression '-' SolrExpression_EDIT                            --> $3
  ;
 
 NonParenthesizedSolrExpression_EDIT
- : SolrExpression '*' 'CURSOR'                                       --> { suggestFunctions: true, suggestFields: true }
- | 'CURSOR' '*' SolrExpression                                       --> { suggestFunctions: true, suggestFields: true }
+ : SolrExpression '*' 'CURSOR'                                       --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
+ | 'CURSOR' '*' SolrExpression                                       --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
  | SolrExpression_EDIT '*' SolrExpression                            --> $1
  | SolrExpression '*' SolrExpression_EDIT                            --> $3
  ;
 
 NonParenthesizedSolrExpression_EDIT
- : SolrExpression '/' 'CURSOR'                                       --> { suggestFunctions: true, suggestFields: true }
- | 'CURSOR' '/' SolrExpression                                       --> { suggestFunctions: true, suggestFields: true }
+ : SolrExpression '/' 'CURSOR'                                       --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
+ | 'CURSOR' '/' SolrExpression                                       --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
  | SolrExpression_EDIT '/' SolrExpression                            --> $1
  | SolrExpression '/' SolrExpression_EDIT                            --> $3
  ;
 
 NonParenthesizedSolrExpression_EDIT
- : '-' 'CURSOR'                                                      --> { suggestFunctions: true, suggestFields: true }
+ : '-' 'CURSOR'                                                      --> { suggestAggregateFunctions: true, suggestFunctions: true, suggestFields: true }
  | '-' SolrExpression_EDIT                                           --> $2
  ;
 

File diff suppressed because it is too large
+ 0 - 0
desktop/core/src/desktop/static/desktop/js/autocomplete/solrExpressionParser.js


+ 4 - 0
desktop/core/src/desktop/static/desktop/spec/autocomplete/solrExpressionParserSpec.js

@@ -33,6 +33,7 @@
 
       it('should suggest functions and fields for "min(|"', function () {
         testAutocomplete('min(', '', {
+          suggestAggregateFunctions: true,
           suggestFunctions: true,
           suggestFields: true,
           locations: [
@@ -43,6 +44,7 @@
 
       it('should suggest functions and fields for "min(boo + |"', function () {
         testAutocomplete('min(boo + ', '', {
+          suggestAggregateFunctions: true,
           suggestFunctions: true,
           suggestFields: true
         });
@@ -50,6 +52,7 @@
 
       it('should suggest functions and fields for "min(boo + | + baa)"', function () {
         testAutocomplete('min(boo + ', ' + baa)', {
+          suggestAggregateFunctions: true,
           suggestFunctions: true,
           suggestFields: true
         });
@@ -57,6 +60,7 @@
 
       it('should suggest functions and fields for "min(1- max(|"', function () {
         testAutocomplete('min(1- max(', '', {
+          suggestAggregateFunctions: true,
           suggestFunctions: true,
           suggestFields: true
         });

Some files were not shown because too many files changed in this diff