From ded5f225cc7bb672108250d4d03960fae06518f7 Mon Sep 17 00:00:00 2001
From: Brett McHargue <ebrett@users.noreply.github.com>
Date: Wed, 21 Feb 2024 13:44:32 +0000
Subject: [PATCH] Quick update to increase character limits on inputs (#709)

* Quick update to increase character limits on inputs

* Fix delete of content page version
---
 app/views/admin/content_blocks/_form.html.erb      |  4 ++--
 .../admin/content_page_versions/_form.html.erb     | 10 +++++-----
 app/views/admin/content_pages/_form.html.erb       | 14 +++++++-------
 .../content_pages/_table_of_draft_versions.erb     |  2 +-
 app/views/admin/users/edit.html.erb                |  2 +-
 spec/models/web/resource_spec.rb                   |  2 ++
 terraform-azure/terraform-azure-web/appgateway.tf  |  4 ++++
 7 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/views/admin/content_blocks/_form.html.erb b/app/views/admin/content_blocks/_form.html.erb
index 9aa48003..919ffcd2 100644
--- a/app/views/admin/content_blocks/_form.html.erb
+++ b/app/views/admin/content_blocks/_form.html.erb
@@ -6,11 +6,11 @@
         <%= form.govuk_error_summary order: %i[name description markdown]  %>
 
         <div data-controller='character-counter' data-character-counter-countdown-value='true'>
-          <%= form.govuk_text_field :name, label: {text: "Name - this should be provided by the developers, it refers to part of the fixed pages"}, disabled: content_block&.id, 'data-character-counter-target': 'input', maxlength: '254', hint: {text: "<p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the name.</p>".html_safe} %>
+          <%= form.govuk_text_field :name, label: {text: "Name - this should be provided by the developers, it refers to part of the fixed pages"}, disabled: content_block&.id, 'data-character-counter-target': 'input', maxlength: '10000', hint: {text: "<p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the name.</p>".html_safe} %>
         </div>
 
         <div data-controller='character-counter' data-character-counter-countdown-value='true'>
-          <%= form.govuk_text_field :description, label: {text: "Description - where does this appear in the site ?"}, 'data-character-counter-target': 'input', maxlength: '254', hint: {text: "<p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the description.</p>".html_safe} %>
+          <%= form.govuk_text_field :description, label: {text: "Description - where does this appear in the site ?"}, 'data-character-counter-target': 'input', maxlength: '10000', hint: {text: "<p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the description.</p>".html_safe} %>
         </div>
 
         <!-- This text_area is not rendered with gov_text_field because it needs to
diff --git a/app/views/admin/content_page_versions/_form.html.erb b/app/views/admin/content_page_versions/_form.html.erb
index 181e656d..3777c1c2 100644
--- a/app/views/admin/content_page_versions/_form.html.erb
+++ b/app/views/admin/content_page_versions/_form.html.erb
@@ -7,7 +7,7 @@
           <%= form.govuk_error_summary order: %i[title markdown]  %>
 
           <div data-controller='character-counter' data-character-counter-countdown-value='true'>
-            <%= form.govuk_text_field :title, label: {text: "Heading"}, :class => 'govuk-input govuk-!-width-three-quarters', 'data-character-counter-target': 'input', maxlength: '254' %>
+            <%= form.govuk_text_field :title, label: {text: "Heading"}, :class => 'govuk-input govuk-!-width-three-quarters', 'data-character-counter-target': 'input', maxlength: '10000' %>
             <p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the title.</p>
           </div>
 
@@ -19,7 +19,7 @@
               Introduction
             </label>
             <div data-controller='character-counter' data-character-counter-countdown-value='true'>
-              <%= form.text_area :intro, id: 'intro-editor', rows: 8, cols: 35, class: 'govuk-input govuk-textarea', 'data-character-counter-target': 'input', maxlength: '254' %>
+              <%= form.text_area :intro, id: 'intro-editor', rows: 8, cols: 35, class: 'govuk-input govuk-textarea', 'data-character-counter-target': 'input', maxlength: '10000' %>
               <p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the introduction.</p>
             </div>
 
@@ -27,7 +27,7 @@
               Table of contents
             </label>
             <div data-controller='character-counter' data-character-counter-countdown-value='true'>
-              <%= form.text_area :content_list, id: 'content-list-editor', rows: 8, cols: 35, class: 'govuk-input govuk-textarea', 'data-character-counter-target': 'input', maxlength: '254' %>
+              <%= form.text_area :content_list, id: 'content-list-editor', rows: 8, cols: 35, class: 'govuk-input govuk-textarea', 'data-character-counter-target': 'input', maxlength: '10000' %>
               <p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the content list.</p>
             </div>
 
@@ -42,10 +42,10 @@
             <div data-controller='character-counter' data-character-counter-countdown-value='true'>
               <%= form.text_area :markdown, :id => 'markdown-editor', :rows => 20, :cols => 35,  :class => govuk_input_classes(:textarea, errors: @content_page_version.errors[:markdown]), 'data-character-counter-target': 'input', maxlength: '30000' %>
               <p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the markdown.</p>
-            </div> 
+            </div>
 
             <div data-controller='character-counter' data-character-counter-countdown-value='true'>
-              <%= form.govuk_text_area :description, label: {text: "Meta Description"}, 'data-character-counter-target': 'input', maxlength: '254' %>
+              <%= form.govuk_text_area :description, label: {text: "Meta Description"}, 'data-character-counter-target': 'input', maxlength: '10000' %>
               <p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the description.</p>
             </div>
           </div>
diff --git a/app/views/admin/content_pages/_form.html.erb b/app/views/admin/content_pages/_form.html.erb
index 1afa5266..fe5d721d 100644
--- a/app/views/admin/content_pages/_form.html.erb
+++ b/app/views/admin/content_pages/_form.html.erb
@@ -6,7 +6,7 @@
         <%= form.govuk_error_summary order: %i[title markdown position]  %>
 
           <div data-controller='character-counter' data-character-counter-countdown-value='true'>
-            <%= form.govuk_text_field :title, label: {text: "Heading"}, :class => 'govuk-input govuk-!-width-three-quarters', disabled: (@content_page.title && !content_page.parent_id), 'data-character-counter-target': 'input', maxlength: '254' %>
+            <%= form.govuk_text_field :title, label: {text: "Heading"}, :class => 'govuk-input govuk-!-width-three-quarters', disabled: (@content_page.title && !content_page.parent_id), 'data-character-counter-target': 'input', maxlength: '10000' %>
             <p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the title.</p>
           </div>
 
@@ -18,7 +18,7 @@
               Introduction
             </label>
             <div data-controller='character-counter' data-character-counter-countdown-value='true'>
-              <%= form.text_area :intro, id: 'intro-editor', rows: 8, cols: 35, class: 'govuk-input govuk-textarea', 'data-character-counter-target': 'input', maxlength: '254' %>
+              <%= form.text_area :intro, id: 'intro-editor', rows: 8, cols: 35, class: 'govuk-input govuk-textarea', 'data-character-counter-target': 'input', maxlength: '10000' %>
               <p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the introduction.</p>
             </div>
 
@@ -26,7 +26,7 @@
               Table of contents
             </label>
             <div data-controller='character-counter' data-character-counter-countdown-value='true'>
-              <%= form.text_area :content_list, id: 'content-list-editor', rows: 8, cols: 35, class: 'govuk-input govuk-textarea', 'data-character-counter-target': 'input', maxlength: '254' %>
+              <%= form.text_area :content_list, id: 'content-list-editor', rows: 8, cols: 35, class: 'govuk-input govuk-textarea', 'data-character-counter-target': 'input', maxlength: '10000' %>
               <p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the content list.</p>
             </div>
 
@@ -41,13 +41,13 @@
             <div data-controller='character-counter' data-character-counter-countdown-value='true'>
               <%= form.text_area :markdown, :id => 'markdown-editor', :rows => 20, :cols => 35,  :class => govuk_input_classes(:textarea, errors: @content_page.errors[:markdown]), 'data-character-counter-target': 'input', maxlength: '30000' %>
               <p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the markdown.</p>
-            </div> 
-            
+            </div>
+
             <%= form.hidden_field :parent_id, id: "parent_id" %>
             <%= form.govuk_text_field :position, label: {text: "Position"}%>
-           
+
             <div data-controller='character-counter' data-character-counter-countdown-value='true'>
-              <%= form.govuk_text_area :description, label: {text: "Meta Description"}, 'data-character-counter-target': 'input', maxlength: '254' %>
+              <%= form.govuk_text_area :description, label: {text: "Meta Description"}, 'data-character-counter-target': 'input', maxlength: '10000' %>
               <p>There are <strong data-character-counter-target='counter' ></strong> remaining characters in the description.</p>
             </div>
           </div>
diff --git a/app/views/admin/content_pages/_table_of_draft_versions.erb b/app/views/admin/content_pages/_table_of_draft_versions.erb
index f02f5e18..b08c02d5 100644
--- a/app/views/admin/content_pages/_table_of_draft_versions.erb
+++ b/app/views/admin/content_pages/_table_of_draft_versions.erb
@@ -15,7 +15,7 @@
         <td class="govuk-table__cell govuk-!-width-one-quarter">
           <%= link_to 'Edit', edit_admin_content_page_content_page_version_path(@content_page, version), { :class => "govuk-link" } %>
           <%= link_to 'Preview and Publish', preview_of_draft_admin_content_page_content_page_version_path(@content_page, version), { :class => "govuk-link" } %>
-          <%= link_to "Delete", admin_content_page_content_page_version_path(@content_page, version), method: :delete, data: { confirm: "Are you certain you want to delete this version ? " + version.created_at.strftime('%d/%m/%Y %I:%M') } %>
+          <%= link_to "Delete", admin_content_page_content_page_version_path(@content_page, version), data: { 'turbo-method': :delete, 'turbo-confirm': "Are you certain you want to delete this version ? " + version.created_at.strftime('%d/%m/%Y %I:%M') } %>
         </td>
         <td class="govuk-table__cell govuk-!-width-one-quarter"><%= version.author %></td>
       </tr>
diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb
index a4014941..8f890e15 100644
--- a/app/views/admin/users/edit.html.erb
+++ b/app/views/admin/users/edit.html.erb
@@ -2,7 +2,7 @@
 
 <h1 class="govuk-heading-l">Edit user</h1>
 <% if policy(@user).destroy? %>
-  <%= button_to "Delete", [:admin, @user], method: :delete, class: "govuk-button govuk-button--warning", data: { confirm: "Are you sure you want to delete #{@user.email}?" } %>
+  <%= button_to "Delete", [:admin, @user], method: :delete, class: "govuk-button govuk-button--warning", data: { turbo_confirm: "Are you sure you want to delete #{@user.email}?" } %>
 <% end %>
 <div class="govuk-width-container">
   <div class="govuk-grid-row">
diff --git a/spec/models/web/resource_spec.rb b/spec/models/web/resource_spec.rb
index 4d524232..99d1b667 100644
--- a/spec/models/web/resource_spec.rb
+++ b/spec/models/web/resource_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe Web::Resource, type: :model do
+  before { skip 'WIP' unless Rails.application.cms? }
+
   describe '.by_name' do
     specify do
       expect(described_class.by_name('test.resource')).to be_a described_class
diff --git a/terraform-azure/terraform-azure-web/appgateway.tf b/terraform-azure/terraform-azure-web/appgateway.tf
index c15c4830..6d6bf7ed 100644
--- a/terraform-azure/terraform-azure-web/appgateway.tf
+++ b/terraform-azure/terraform-azure-web/appgateway.tf
@@ -90,6 +90,10 @@ resource "azurerm_web_application_firewall_policy" "agw_wafp" {
           id      = "933210"
           enabled = false
         }
+        rule {
+          id      = "933180"
+          enabled = false
+        }
       }
     }