#434

backend/app/services/counts_table_export.rb

@@ -7,20 +7,20 @@ class CountsTableExport
   attr_reader :format, :resource
 
   def initialize(params)
-    raise ArgumentError if (params.keys - CountsTableQuery::KEYS - EXTRA).any?
+    QueryState.validate!(params, CountsTableQuery::KEYS + EXTRA + ['measures'])
     raise ArgumentError unless params.values.all? { _1.is_a?(String) }
 
     params = CountsDefaults.for(params).merge(params)
     unless params.key?('children')
       params = params.merge('children' => CountsExportProjection.default_children(
-          params.fetch('resource', 'posts')).join(','))
+          params.fetch('resource', 'posts')).join(' '))
     end
     @params = params
     @labels = JSON.parse(params.fetch('labels', '{}'))
     raise ArgumentError unless @labels.is_a?(Hash)
-    @selected = params.key?('children') ? params['children'].split(',') : nil
-    @order = params.fetch('order', '').split(',')
-    @child_sort = params.fetch('child_sort', '').split(',').map { _1.split(':', -1) }
+    @selected = params.key?('children') ? QueryState.list(params['children']) : nil
+    @order = QueryState.list(params.fetch('order', ''))
+    @child_sort = QueryState.list(params.fetch('child_sort', '')).map { _1.split(':', -1) }
     @child_sort.each do |path, direction, *extra|
       raise ArgumentError if extra.any? || !['asc', 'desc'].include?(direction)
       raise ArgumentError unless path&.match?(/\A[a-zA-Z_]+(?:\.[a-zA-Z]+)*\/[a-zA-Z]+\z/)
@@ -29,12 +29,13 @@ class CountsTableExport
     @resource = params.fetch('resource', 'posts')
     raise ArgumentError unless ['json', 'csv'].include?(format)
 
-    @query = CountsTableQuery.new(params.slice(*CountsTableQuery::KEYS)
+    @query = CountsTableQuery.new(params.select { |key, _value| CountsTableQuery::KEYS.include?(key) ||
+        key == 'measures' || QueryState.valid_key?(key) }
         .merge('page' => '1', 'limit' => '100'))
     @summary = @query.mode == 'summary'
     default_columns = @summary ? @query.axes.all.map { _1.fetch('field') } + ['count'] :
         CountsExportProjection.default_columns(resource)
-    @columns = params.fetch('columns', default_columns.join(',')).split(',')
+    @columns = QueryState.list(params.fetch('columns', default_columns.join(' ')))
     default_headers = @columns.map { @labels.fetch(_1, _1) }
     @headers = JSON.parse(params.fetch('headers', default_headers.to_json))
     raise ArgumentError unless @headers.is_a?(Array) && @headers.all? { _1.is_a?(String) }
@@ -66,7 +67,8 @@ class CountsTableExport
           unless started
             metadata = page.except(:versions, :cells, :axis_labels, :column_values,
                 :row_headers, :column_headers, :pivot_totals).merge(
-                resource:, filters: @params.slice(*CountsTableQuery::KEYS),
+                resource:, filters: @params.select { |key, _value| CountsTableQuery::KEYS.include?(key) ||
+        key == 'measures' || QueryState.valid_key?(key) },
                 fields: @query.population.definition.metadata,
                 columns: @columns, column_labels: @headers,
                 order: @params['order'], children: @params['children'],
@@ -138,13 +140,23 @@ class CountsTableExport
   end
 
   def total_label(header)
-    @labels.fetch(header[:kind] == 'grand_total' ? 'grandTotal' : 'subtotal', '')
+    key = header[:kind] == 'grand_total' ?
+        (@query.axes.all.length == 1 ? 'singleTotal' : 'grandTotal') : 'subtotal'
+    @labels.fetch(key, '')
   end
 
   def pivot_row_labels(header, page)
     values = header[:values].each_with_index.map { |value, index|
       summary_value(value, index, page)
     }
+    if header[:kind] == 'data' && @previous_pivot_row&.fetch(:kind) == 'data'
+      values.each_index do |index|
+        if header[:values].first(index + 1) == @previous_pivot_row[:values].first(index + 1)
+          values[index] = ''
+        end
+      end
+    end
+    @previous_pivot_row = header
     values << total_label(header) unless header[:kind] == 'data'
     leading = [@query.axes.rows.length, @query.axes.columns.any? ? 1 : 0].max
     Array.new(leading) { values[_1] || '' }