#434

backend/app/services/query_state.rb

@@ -1,7 +1,8 @@
 # Public query grammar shared with frontend/src/lib/queryState.ts.
 class QueryState
   SCHEMAS = {
-      'conditions' => ['field', 'operator', 'value', 'end', 'blank'],
+      'conditions' => ['field', 'operator', 'value', 'end', 'blank', 'input', 'values'],
+      'condition_values' => ['condition', 'value', 'value_type'],
       'drill' => ['field', 'grain', 'value', 'value_type'],
       'tag_refs' => ['name', 'tag_id', 'external_tag_id', 'negative', 'missing'],
       'column_order' => ['value', 'value_type'],
@@ -40,11 +41,11 @@ class QueryState
 
       _root, index, field = name.split('.')
       record = records[index.to_i] ||= {}
-      if ['blank', 'negative', 'missing'].include?(field)
+      if ['blank', 'negative', 'missing', 'values'].include?(field)
         raise ArgumentError unless ['0', '1'].include?(value)
 
         value = value == '1'
-      elsif ['tag_id', 'external_tag_id', 'axis'].include?(field)
+      elsif ['tag_id', 'external_tag_id', 'axis', 'condition'].include?(field)
         raise ArgumentError unless value.match?(/\A[0-9]{1,18}\z/)
 
         value = value.to_i
@@ -56,7 +57,7 @@ class QueryState
 
     records.sort.map do |_index, record|
       type = record.delete('value_type')
-      if ['drill', 'measures', 'column_order'].include?(key)
+      if ['drill', 'measures', 'column_order', 'condition_values'].include?(key)
         raise ArgumentError unless ['null', 'string', 'number', 'boolean'].include?(type)
 
         raise ArgumentError unless type == 'null' || record.key?('value')