diff --git a/app/components/bulk_upload_error_row_component.html.erb b/app/components/bulk_upload_error_row_component.html.erb index 0948d0e4b..91ef69732 100644 --- a/app/components/bulk_upload_error_row_component.html.erb +++ b/app/components/bulk_upload_error_row_component.html.erb @@ -1,9 +1,9 @@
<% if lettings? %> -

Row <%= row %> <%= tenant_code_html %> <%= property_ref_html %>

+

Row <%= row %> <%= tenant_code_html %> <%= property_ref_html %>

<% else %> -

Row <%= row %> <%= purchaser_code_html %>

+

Row <%= row %> <%= purchaser_code_html %>

<% end %>
@@ -56,7 +56,7 @@ <% row.with_cell(text: error.cell) %> <% row.with_cell(text: question_for_field(error.field)) %> <% if index == 0 %> - <% row.with_cell(text: error_message, rowspan: errors.size, html_attributes: { class: "govuk-!-font-weight-bold" }) %> + <% row.with_cell(text: error_message, rowspan: errors.size, html_attributes: { class: "govuk-!-font-weight-bold bulk-upload-error-message" }) %> <% end %> <% row.with_cell(text: error.field.humanize) %> <% end %> diff --git a/app/components/bulk_upload_error_row_component.rb b/app/components/bulk_upload_error_row_component.rb index e5ae9087f..887eef10c 100644 --- a/app/components/bulk_upload_error_row_component.rb +++ b/app/components/bulk_upload_error_row_component.rb @@ -18,7 +18,7 @@ class BulkUploadErrorRowComponent < ViewComponent::Base def tenant_code_html return if tenant_code.blank? - content_tag :span, class: "govuk-!-margin-left-3", style: "font-weight: 400;" do + content_tag :span, class: "govuk-!-margin-left-3" do "Tenant code: #{tenant_code}" end end @@ -30,7 +30,7 @@ class BulkUploadErrorRowComponent < ViewComponent::Base def purchaser_code_html return if purchaser_code.blank? - content_tag :span, class: "govuk-!-margin-left-3", style: "font-weight: 400;" do + content_tag :span, class: "govuk-!-margin-left-3" do "Purchaser code: #{purchaser_code}" end end @@ -42,7 +42,7 @@ class BulkUploadErrorRowComponent < ViewComponent::Base def property_ref_html return if property_ref.blank? - content_tag :span, class: "govuk-!-margin-left-3", style: "font-weight: 400;" do + content_tag :span, class: "govuk-!-margin-left-3" do "Property reference: #{property_ref}" end end diff --git a/app/frontend/styles/application.scss b/app/frontend/styles/application.scss index ee4366aa3..b23662536 100644 --- a/app/frontend/styles/application.scss +++ b/app/frontend/styles/application.scss @@ -91,6 +91,6 @@ $govuk-breakpoints: ( border-top: 1px solid #b1b4b6; } -.grouped-rows.last-row td { +.grouped-rows.last-row td, .grouped-rows .bulk-upload-error-message { border-bottom: 1px solid #b1b4b6; } diff --git a/spec/views/bulk_upload_lettings_results/show.html.erb_spec.rb b/spec/views/bulk_upload_lettings_results/show.html.erb_spec.rb index 02942dec7..637dfa3a9 100644 --- a/spec/views/bulk_upload_lettings_results/show.html.erb_spec.rb +++ b/spec/views/bulk_upload_lettings_results/show.html.erb_spec.rb @@ -33,7 +33,7 @@ RSpec.describe "bulk_upload_lettings_results/show.html.erb" do fragment = Capybara::Node::Simple.new(rendered) - expect(fragment.find_css("table tbody td").map(&:inner_text).values_at(0, 3)).to eql(%w[Z100 AA100]) + expect(fragment.find_css("table tbody td").map(&:inner_text).values_at(0, 4)).to eql(%w[Z100 AA100]) end end end diff --git a/spec/views/bulk_upload_lettings_results/summary.html.erb_spec.rb b/spec/views/bulk_upload_lettings_results/summary.html.erb_spec.rb index e8b73a1cb..ac0c1f82d 100644 --- a/spec/views/bulk_upload_lettings_results/summary.html.erb_spec.rb +++ b/spec/views/bulk_upload_lettings_results/summary.html.erb_spec.rb @@ -33,7 +33,7 @@ RSpec.describe "bulk_upload_lettings_results/summary.html.erb" do fragment = Capybara::Node::Simple.new(rendered) - expect(fragment.find_css("table tbody td").map(&:inner_text).values_at(0, 3)).to eql(%w[Z100 AA100]) + expect(fragment.find_css("table tbody td").map(&:inner_text).values_at(0, 4)).to eql(%w[Z100 AA100]) end end end diff --git a/spec/views/bulk_upload_sales_results/show.html.erb_spec.rb b/spec/views/bulk_upload_sales_results/show.html.erb_spec.rb index 2179fc7b3..dc6751dc8 100644 --- a/spec/views/bulk_upload_sales_results/show.html.erb_spec.rb +++ b/spec/views/bulk_upload_sales_results/show.html.erb_spec.rb @@ -32,7 +32,7 @@ RSpec.describe "bulk_upload_sales_results/show.html.erb" do render fragment = Capybara::Node::Simple.new(rendered) - expect(fragment.find_css("table tbody td").map(&:inner_text).values_at(0, 3)).to eql(%w[Z100 AA100]) + expect(fragment.find_css("table tbody td").map(&:inner_text).values_at(0, 4)).to eql(%w[Z100 AA100]) end end end diff --git a/spec/views/bulk_upload_sales_results/summary.html.erb_spec.rb b/spec/views/bulk_upload_sales_results/summary.html.erb_spec.rb index 8b97ec86d..b3d9aa006 100644 --- a/spec/views/bulk_upload_sales_results/summary.html.erb_spec.rb +++ b/spec/views/bulk_upload_sales_results/summary.html.erb_spec.rb @@ -33,7 +33,7 @@ RSpec.describe "bulk_upload_sales_results/summary.html.erb" do fragment = Capybara::Node::Simple.new(rendered) - expect(fragment.find_css("table tbody td").map(&:inner_text).values_at(0, 3)).to eql(%w[Z100 AA100]) + expect(fragment.find_css("table tbody td").map(&:inner_text).values_at(0, 4)).to eql(%w[Z100 AA100]) end end end