From b47738c4bec6f6b681ef36b9cbffd09d40ae4794 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 23 Sep 2024 15:31:41 +0100
Subject: [PATCH 1/3] CLDC-3632 Bulk upload hide empty critical errors table 
 (#2627)

* Make critical errors table conditionally shown

* Add the same margin to buttons, just like in lettings logs and sales logs page
---
 .../bulk_upload_error_row_component.html.erb  | 37 ++++++++++---------
 app/views/schemes/index.html.erb              |  4 +-
 app/views/users/index.html.erb                |  4 +-
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/app/components/bulk_upload_error_row_component.html.erb b/app/components/bulk_upload_error_row_component.html.erb
index 9447c9d37..65e38613f 100644
--- a/app/components/bulk_upload_error_row_component.html.erb
+++ b/app/components/bulk_upload_error_row_component.html.erb
@@ -9,24 +9,27 @@
 
   <div class="govuk-summary-card__content">
     <% potential_errors, critical_errors = bulk_upload_errors.partition { |error| error.category == "soft_validation" } %>
-    <h2 class="govuk-heading-m">Critical errors</h2>
-    <p class="govuk-body">These errors must be fixed to complete your logs.</p>
-    <%= govuk_table do |table| %>
-      <%= table.with_head do |head| %>
-        <% head.with_row do |row| %>
-          <% row.with_cell(header: true, text: "Cell") %>
-          <% row.with_cell(header: true, text: "Question") %>
-          <% row.with_cell(header: true, text: "Error") %>
-          <% row.with_cell(header: true, text: "Specification") %>
-        <% end %>
 
-        <%= table.with_body do |body| %>
-          <% critical_errors.each do |error| %>
-            <% body.with_row do |row| %>
-                <% row.with_cell(text: error.cell) %>
-                <% row.with_cell(text: question_for_field(error.field), html_attributes: { class: "govuk-!-width-one-half" }) %>
-                <% row.with_cell(text: error.error.html_safe, html_attributes: { class: "govuk-!-font-weight-bold govuk-!-width-one-half" }) %>
-                <% row.with_cell(text: error.field.humanize) %>
+    <% if critical_errors.any? %>
+      <h2 class="govuk-heading-m">Critical errors</h2>
+      <p class="govuk-body">These errors must be fixed to complete your logs.</p>
+      <%= govuk_table do |table| %>
+        <%= table.with_head do |head| %>
+          <% head.with_row do |row| %>
+            <% row.with_cell(header: true, text: "Cell") %>
+            <% row.with_cell(header: true, text: "Question") %>
+            <% row.with_cell(header: true, text: "Error") %>
+            <% row.with_cell(header: true, text: "Specification") %>
+          <% end %>
+
+          <%= table.with_body do |body| %>
+            <% critical_errors.each do |error| %>
+              <% body.with_row do |row| %>
+                  <% row.with_cell(text: error.cell) %>
+                  <% row.with_cell(text: question_for_field(error.field), html_attributes: { class: "govuk-!-width-one-half" }) %>
+                  <% row.with_cell(text: error.error.html_safe, html_attributes: { class: "govuk-!-font-weight-bold govuk-!-width-one-half" }) %>
+                  <% row.with_cell(text: error.field.humanize) %>
+              <% end %>
             <% end %>
           <% end %>
         <% end %>
diff --git a/app/views/schemes/index.html.erb b/app/views/schemes/index.html.erb
index d0ae44072..edaed6212 100644
--- a/app/views/schemes/index.html.erb
+++ b/app/views/schemes/index.html.erb
@@ -6,7 +6,9 @@
 <%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Supported housing schemes", sub: nil } : { main: "Supported housing schemes", sub: current_user.organisation.name } %>
 
 <% if SchemePolicy.new(current_user, nil).create? %>
-  <%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %>
+  <div class="govuk-button-group govuk-!-margin-bottom-6">
+    <%= govuk_button_link_to "Create a new supported housing scheme", new_scheme_path, html: { method: :post } %>
+  </div>
 <% end %>
 <div class="app-filter-layout" data-controller="filter-layout">
   <%= render partial: "schemes/scheme_filters" %>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 7da3deda1..4e5053563 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -6,7 +6,9 @@
 <%= render partial: "organisations/headings", locals: current_user.support? ? { main: "Users", sub: nil } : { main: "Users", sub: current_user.organisation.name } %>
 
 <% if current_user.data_coordinator? || current_user.support? %>
-  <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>
+  <div class="govuk-button-group govuk-!-margin-bottom-6">
+    <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>
+  </div>
 <% end %>
 <div class="app-filter-layout" data-controller="filter-layout">
   <%= render partial: "users/user_filters" %>

From e604d358b35502ea7be08ad38e2baeadbaf7ae11 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Mon, 23 Sep 2024 15:45:35 +0100
Subject: [PATCH 2/3] CLDC-3627 Problem displaying apostrophes in browser tab
 title (#2643)

---
 app/helpers/application_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bb119b29e..5a9203da8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,6 +2,7 @@ module ApplicationHelper
   include Pagy::Frontend
 
   def browser_title(title, pagy, *resources)
+    title = sanitize(title)&.gsub("&amp;", "&")
     if resources.any? { |r| r.present? && r.errors.present? }
       "Error: #{[title, t('service_name'), 'GOV.UK'].select(&:present?).join(' - ')}"
     else

From 806424992579127dffdee614216ed79d6b9c3af2 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Mon, 23 Sep 2024 16:31:23 +0100
Subject: [PATCH 3/3] Add checked field to log_validations (#2657)

---
 db/migrate/20240923145326_add_validation_checked_field.rb | 5 +++++
 db/schema.rb                                              | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20240923145326_add_validation_checked_field.rb

diff --git a/db/migrate/20240923145326_add_validation_checked_field.rb b/db/migrate/20240923145326_add_validation_checked_field.rb
new file mode 100644
index 000000000..899992974
--- /dev/null
+++ b/db/migrate/20240923145326_add_validation_checked_field.rb
@@ -0,0 +1,5 @@
+class AddValidationCheckedField < ActiveRecord::Migration[7.0]
+  def change
+    add_column :log_validations, :checked, :boolean
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 80463eaad..cd7708957 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2024_09_18_112702) do
+ActiveRecord::Schema[7.0].define(version: 2024_09_23_145326) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -410,6 +410,7 @@ ActiveRecord::Schema[7.0].define(version: 2024_09_18_112702) do
     t.string "other_validated_models"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.boolean "checked"
   end
 
   create_table "logs_exports", force: :cascade do |t|