#434

backend/app/controllers/counts_tables_controller.rb

@@ -1,12 +1,14 @@
 class CountsTablesController < ApplicationController
   def definition
-    resolve_locale!
+    locale = resolve_locale!
     definition = CountsResourceDefinition.new(params[:resource])
     render json: { fields: definition.metadata,
                    output_fields: definition.output_fields,
                    filter_fields: definition.filter_metadata,
                    axes: { latest: definition.axes(false), history: definition.axes(true) },
-                   grains: CountsAxes::GRAINS, defaults: CountsDefaults.metadata(params[:resource]) }
+                   name_columns: definition.name_columns,
+                   grains: CountsAxes::GRAINS,
+                   defaults: CountsDefaults.metadata(params[:resource], locale: locale.code) }
   rescue ArgumentError
     head :bad_request
   end
@@ -17,6 +19,9 @@ class CountsTablesController < ApplicationController
   rescue CountsTableQuery::TooManyColumns
     render json: { error: 'too_many_columns', max_columns: CountsTableQuery::MAX_COLUMNS },
            status: :unprocessable_entity
+  rescue ActiveRecord::StatementTimeout => error
+    Rails.logger.warn("counts_query_timeout: #{ error.class }")
+    render json: { error: 'counts_query_timeout' }, status: :service_unavailable
   rescue ArgumentError, TypeError, KeyError, JSON::ParserError
     head :bad_request
   end