Don't generate packing reports unnecessarily when displaying the repo…

…rt form
Matt-Yorkley · Mar 24, 2024 · fc1b686 · fc1b686
1 parent 26f3b56
commit fc1b686
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/lib/reporting/report_headers_builder.rb b/lib/reporting/report_headers_builder.rb
@@ -11,13 +11,13 @@ def initialize(report, current_user)
 
     def table_headers
       filter = proc { |key| key.to_sym.in?(fields_to_show) }
-      report.columns.keys.filter { |key| filter.call(key) }.map do |key|
+      report.table_columns.keys.filter { |key| filter.call(key) }.map do |key|
         translate_header(key)
       end
     end
 
     def available_headers
-      report.columns.keys.map { |key| [translate_header(key), key] }
+      report.table_columns.keys.map { |key| [translate_header(key), key] }
     end
 
     def fields_to_hide

diff --git a/lib/reporting/report_template.rb b/lib/reporting/report_template.rb
@@ -54,6 +54,10 @@ def columns
       raise NotImplementedError
     end
 
+    def table_columns
+      columns
+    end
+
     # Exple { total_price: :currency }
     def columns_format
       {}

diff --git a/lib/reporting/reports/packing/customer.rb b/lib/reporting/reports/packing/customer.rb
@@ -4,11 +4,16 @@ module Reporting
   module Reports
     module Packing
       class Customer < Base
+        def table_columns
+          Struct.new(:keys).new(
+            [:hub, :customer_code, :first_name, :last_name, :phone, :supplier, :product,
+             :variant, :weight, :height, :width, :depth, :quantity, :price, :temp_controlled]
+          )
+        end
+
         def columns
           # Reorder default columns
-          super.slice(:hub, :customer_code, :first_name, :last_name, :phone,
-                      :supplier, :product, :variant, :weight, :height, :width, :depth, :quantity,
-                      :price, :temp_controlled)
+          super.slice(*table_columns.keys)
         end
 
         def rules

diff --git a/lib/reporting/reports/packing/product.rb b/lib/reporting/reports/packing/product.rb
@@ -4,11 +4,16 @@ module Reporting
   module Reports
     module Packing
       class Product < Base
+        def table_columns
+          Struct.new(:keys).new(
+            [:hub, :supplier, :product, :variant, :customer_code, :first_name,
+             :last_name, :phone, :quantity, :price, :temp_controlled]
+          )
+        end
+
         def columns
           # Reorder default columns
-          super.slice(:hub, :supplier, :product, :variant,
-                      :customer_code, :first_name, :last_name, :phone,
-                      :quantity, :price, :temp_controlled)
+          super.slice(*table_columns.keys)
         end
 
         def rules

diff --git a/lib/reporting/reports/packing/supplier.rb b/lib/reporting/reports/packing/supplier.rb
@@ -4,10 +4,16 @@ module Reporting
   module Reports
     module Packing
       class Supplier < Base
+        def table_columns
+          Struct.new(:keys).new(
+            [:hub, :supplier, :customer_code, :first_name, :last_name, :phone,
+             :product, :variant, :quantity, :price, :temp_controlled]
+          )
+        end
+
         def columns
           # Reorder default columns
-          super.slice(:hub, :supplier, :customer_code, :first_name, :last_name, :phone,
-                      :product, :variant, :quantity, :price, :temp_controlled)
+          super.slice(*table_columns.keys)
         end
 
         def rules