From 43cbac7d175136e36fd247a4b439477754597029 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 14 Apr 2023 11:20:50 +1000
Subject: [PATCH] Simplify report filename generation

---
 app/controllers/admin/reports_controller.rb | 6 ++----
 app/controllers/concerns/reports_actions.rb | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 198f687bbc..57bf771db5 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -22,7 +22,7 @@ module Admin
     def show
       @report = report_class.new(spree_current_user, params, render: render_data?)
 
-      if report_format.present?
+      if params[:report_format].present?
         export_report
       else
         show_report
@@ -58,9 +58,7 @@ module Admin
 
     def render_report_as(format)
       if OpenFoodNetwork::FeatureToggle.enabled?(:background_reports, spree_current_user)
-        filename = report_filename
-        filename = "#{filename}html" if report_format.blank?
-        @blob = ReportBlob.create_for_upload_later!(filename)
+        @blob = ReportBlob.create_for_upload_later!(report_filename)
         ReportJob.perform_later(
           report_class, spree_current_user, params, format, @blob
         )
diff --git a/app/controllers/concerns/reports_actions.rb b/app/controllers/concerns/reports_actions.rb
index 7fa6615733..51cc439b3d 100644
--- a/app/controllers/concerns/reports_actions.rb
+++ b/app/controllers/concerns/reports_actions.rb
@@ -56,7 +56,7 @@ module ReportsActions
   end
 
   def report_format
-    params[:report_format]
+    params[:report_format].presence || "html"
   end
 
   def report_filename