#434

backend/app/services/counts_export_projection.rb

@@ -21,7 +21,7 @@ class CountsExportProjection
       'tags' => ['id', 'versionNo', 'kind', 'name', 'category', 'sections', 'names'],
       'names' => NAME_FIELDS,
       'aliases' => ['languageCode', 'name', 'scriptCode'],
-      'parents' => ['id'] }.freeze
+      'parents' => ['id', 'name'] }.freeze
 
   def self.default_columns(resource)
     fields = { 'posts' => ['title', 'url', 'tags', 'parents', 'video_ms'],
@@ -56,7 +56,7 @@ class CountsExportProjection
                 CountsQuery::COLUMNS.fetch(resource)
               end
     defaults = summary ? allowed : self.class.default_columns(resource)
-    @columns = params.fetch('columns', defaults.join(',')).split(',')
+    @columns = QueryState.list(params.fetch('columns', defaults.join(' ')))
     raise ArgumentError if (@columns - allowed).any? || @columns.uniq != @columns
 
     @headers = JSON.parse(params.fetch('headers', JSON.generate(@columns)))
@@ -64,8 +64,8 @@ class CountsExportProjection
         @headers.all? { _1.is_a?(String) && _1.length <= 200 })
       raise ArgumentError
     end
-    @order = params.fetch('order', '').split(',')
-    @sorts = params.fetch('child_sort', '').split(',').map do |entry|
+    @order = QueryState.list(params.fetch('order', ''))
+    @sorts = QueryState.list(params.fetch('child_sort', '')).map do |entry|
       parts = entry.split(':', -1)
       raise ArgumentError unless parts.length == 2
 
@@ -74,12 +74,28 @@ class CountsExportProjection
 
       [path, direction]
     end
-    @selected = params.key?('children') ? params['children'].split(',').to_set :
+    @selected = params.key?('children') ? QueryState.list(params['children']).to_set :
         self.class.default_children(resource).to_set
     valid = CHILDREN.flat_map do |key, fields|
       paths(fields, key)
     end
     raise ArgumentError if @selected && (@selected.to_a - valid).any?
+    prune = lambda do |fields, prefix|
+      fields.each do |key|
+        path = "#{ prefix }.#{ key }"
+        children = fields_for(key)
+        next if children.empty?
+
+        prune.call(children, path)
+        @selected.delete(path) unless children.any? { @selected.include?("#{ path }.#{ _1 }") }
+      end
+    end
+    CHILDREN.each { |key, fields| prune.call(fields, key) }
+    pairs = @columns.zip(@headers).select do |key, _header|
+      !CHILDREN.key?(key) || CHILDREN[key].any? { @selected.include?("#{ key }.#{ _1 }") }
+    end
+    @columns = pairs.map(&:first)
+    @headers = pairs.map(&:last)
     allowed_sorts = valid.map do |path|
       parts = path.split('.')
       field = parts.pop