diff --git a/app/components/bulk_upload_error_row_component.rb b/app/components/bulk_upload_error_row_component.rb index f4f129cbc..887eef10c 100644 --- a/app/components/bulk_upload_error_row_component.rb +++ b/app/components/bulk_upload_error_row_component.rb @@ -2,7 +2,7 @@ class BulkUploadErrorRowComponent < ViewComponent::Base attr_reader :bulk_upload_errors def initialize(bulk_upload_errors:) - @bulk_upload_errors = sorted_errors(bulk_upload_errors) + @bulk_upload_errors = bulk_upload_errors super end @@ -62,10 +62,4 @@ class BulkUploadErrorRowComponent < ViewComponent::Base def sales? bulk_upload.log_type == "sales" end - -private - - def sorted_errors(errors) - errors.sort_by { |e| e.cell.rjust(3, "0") } - end end diff --git a/app/components/bulk_upload_error_summary_table_component.rb b/app/components/bulk_upload_error_summary_table_component.rb index 7b483077f..d15d5280e 100644 --- a/app/components/bulk_upload_error_summary_table_component.rb +++ b/app/components/bulk_upload_error_summary_table_component.rb @@ -16,8 +16,8 @@ class BulkUploadErrorSummaryTableComponent < ViewComponent::Base .bulk_upload_errors .group(:col, :field, :error) .having("count(*) >= ?", display_threshold) + .order_by_col .count - .sort_by { |el| el[0][0].rjust(3, "0") } end def errors? @@ -39,8 +39,8 @@ private .bulk_upload_errors .where(category: "setup") .group(:col, :field, :error) + .order_by_col .count - .sort_by { |el| el[0][0].rjust(3, "0") } end def display_threshold diff --git a/app/models/bulk_upload_error.rb b/app/models/bulk_upload_error.rb index df584b63e..0c298ddf8 100644 --- a/app/models/bulk_upload_error.rb +++ b/app/models/bulk_upload_error.rb @@ -1,3 +1,6 @@ class BulkUploadError < ApplicationRecord belongs_to :bulk_upload + + scope :order_by_cell, -> { order(Arel.sql("LPAD(cell, 10, '0')")) } + scope :order_by_col, -> { order(Arel.sql("LPAD(col, 10, '0')")) } end diff --git a/app/views/bulk_upload_lettings_results/show.html.erb b/app/views/bulk_upload_lettings_results/show.html.erb index 67b01ff9d..dea114e63 100644 --- a/app/views/bulk_upload_lettings_results/show.html.erb +++ b/app/views/bulk_upload_lettings_results/show.html.erb @@ -13,7 +13,7 @@