From a7571b152dd017da81ee4011be5550688b7cfa05 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Tue, 30 Jan 2024 12:46:32 +1100 Subject: [PATCH] Simplify report rendering * DRY rendering_options calls. * Remove unneeded parameter from method. * Choose better name for background rendering method. --- app/controllers/admin/reports_controller.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index 70fa0a7b7b..14dbad7dd8 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -21,11 +21,10 @@ module Admin def show @report = report_class.new(spree_current_user, params, render: render_data?) + @rendering_options = rendering_options # also stores user preferences if render_data? - rendering_options # stores user preferences - - background(report_format) + render_in_background else show_report end @@ -43,7 +42,6 @@ module Admin @report_subtypes = report_subtypes @report_subtype = report_subtype @report_title = report_title - @rendering_options = rendering_options @data = Reporting::FrontendData.new(spree_current_user) variant_id_in = params[:variant_id_in]&.compact_blank @@ -60,7 +58,7 @@ module Admin request.post? end - def background(format) + def render_in_background cable_ready[ScopedChannel.for_id(params[:uuid])] .inner_html( selector: "#report-table", @@ -72,7 +70,8 @@ module Admin ReportJob.perform_later( report_class:, user: spree_current_user, params:, - format:, filename: report_filename, + format: report_format, + filename: report_filename, channel: ScopedChannel.for_id(params[:uuid]), )