From df240744be6c8b47f6bdcc4e9d1878a7583c5325 Mon Sep 17 00:00:00 2001
From: SamiraMSadat <samira.sadat@gsa.gov>
Date: Fri, 15 Nov 2024 09:50:48 -0700
Subject: [PATCH 1/3] VOTE-3081 Remove underline, text align, and not allowed
 tags

---
 config/local/config_split.patch.user.role.site_builder.yml | 5 +++++
 config/sync/editor.editor.basic_html.yml                   | 6 ------
 config/sync/filter.format.basic_html.yml                   | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/local/config_split.patch.user.role.site_builder.yml b/config/local/config_split.patch.user.role.site_builder.yml
index 55ac097a0..07a35ae14 100644
--- a/config/local/config_split.patch.user.role.site_builder.yml
+++ b/config/local/config_split.patch.user.role.site_builder.yml
@@ -1,9 +1,14 @@
 adding:
   dependencies:
     module:
+      - block_content
       - devel
       - disable_language
       - field_ui
+      - media
+      - node
+      - paragraphs
+      - taxonomy
       - views_ui
   permissions:
     - 'access devel information'
diff --git a/config/sync/editor.editor.basic_html.yml b/config/sync/editor.editor.basic_html.yml
index d1f8afdf8..f658f0c77 100644
--- a/config/sync/editor.editor.basic_html.yml
+++ b/config/sync/editor.editor.basic_html.yml
@@ -13,7 +13,6 @@ settings:
     items:
       - bold
       - italic
-      - underline
       - heading
       - style
       - removeFormat
@@ -22,7 +21,6 @@ settings:
       - numberedList
       - indent
       - outdent
-      - alignment
       - '|'
       - horizontalLine
       - link
@@ -51,11 +49,7 @@ settings:
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<div id class data-allow-multiple>'
-        - '<h2 id class>'
-        - '<h3 class>'
         - '<button type class aria-expanded aria-controls>'
-        - '<ul class>'
-        - '<li class>'
         - '<img src alt height width>'
     ckeditor5_style:
       styles:
diff --git a/config/sync/filter.format.basic_html.yml b/config/sync/filter.format.basic_html.yml
index 04371b104..ef388bf82 100644
--- a/config/sync/filter.format.basic_html.yml
+++ b/config/sync/filter.format.basic_html.yml
@@ -23,7 +23,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p class="usa-intro text-align-left text-align-center text-align-right"> <h2 id class> <h3 class> <h4 class="text-align-left text-align-center text-align-right"> <h5 class="text-align-left text-align-center text-align-right"> <h6 class="text-align-left text-align-center text-align-right"> <a class href aria-label title target="_blank" rel> <div id class data-allow-multiple> <button type class aria-expanded aria-controls> <img src alt height width> <strong> <em> <u> <ul class> <ol> <li class> <hr> <drupal-media data-entity-type data-entity-uuid alt> <embedded-content data-plugin-config data-plugin-id>'
+      allowed_html: '<br> <p class="usa-intro"> <h2> <h3> <h4> <h5> <h6> <a class href aria-label title target="_blank" rel> <div id class data-allow-multiple> <button type class aria-expanded aria-controls> <img src alt height width> <strong> <em> <ul> <ol> <li> <hr> <drupal-media data-entity-type data-entity-uuid alt> <embedded-content data-plugin-config data-plugin-id>'
       filter_html_help: true
       filter_html_nofollow: false
   media_embed:

From 44bfdd3b6826c889769f442f4cd6f2e007a9bda3 Mon Sep 17 00:00:00 2001
From: SamiraMSadat <samira.sadat@gsa.gov>
Date: Mon, 18 Nov 2024 08:36:24 -0700
Subject: [PATCH 2/3] VOTE-3081 Revert local file change

---
 config/local/config_split.patch.user.role.site_builder.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/local/config_split.patch.user.role.site_builder.yml b/config/local/config_split.patch.user.role.site_builder.yml
index 07a35ae14..55ac097a0 100644
--- a/config/local/config_split.patch.user.role.site_builder.yml
+++ b/config/local/config_split.patch.user.role.site_builder.yml
@@ -1,14 +1,9 @@
 adding:
   dependencies:
     module:
-      - block_content
       - devel
       - disable_language
       - field_ui
-      - media
-      - node
-      - paragraphs
-      - taxonomy
       - views_ui
   permissions:
     - 'access devel information'

From 461abbe343772ebb348393772707e7f8aab69c68 Mon Sep 17 00:00:00 2001
From: Ray Estrada <raymond.estrada@gsa.gov>
Date: Mon, 18 Nov 2024 17:26:18 -0800
Subject: [PATCH 3/3] Fix some regressions to heading and list allowed tags

---
 config/sync/editor.editor.basic_html.yml | 4 ++++
 config/sync/filter.format.basic_html.yml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/sync/editor.editor.basic_html.yml b/config/sync/editor.editor.basic_html.yml
index f658f0c77..c6918bb91 100644
--- a/config/sync/editor.editor.basic_html.yml
+++ b/config/sync/editor.editor.basic_html.yml
@@ -49,7 +49,11 @@ settings:
     ckeditor5_sourceEditing:
       allowed_tags:
         - '<div id class data-allow-multiple>'
+        - '<h2 id class>'
+        - '<h3 class>'
         - '<button type class aria-expanded aria-controls>'
+        - '<ul class>'
+        - '<li class>'
         - '<img src alt height width>'
     ckeditor5_style:
       styles:
diff --git a/config/sync/filter.format.basic_html.yml b/config/sync/filter.format.basic_html.yml
index ef388bf82..2a60402c8 100644
--- a/config/sync/filter.format.basic_html.yml
+++ b/config/sync/filter.format.basic_html.yml
@@ -23,7 +23,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p class="usa-intro"> <h2> <h3> <h4> <h5> <h6> <a class href aria-label title target="_blank" rel> <div id class data-allow-multiple> <button type class aria-expanded aria-controls> <img src alt height width> <strong> <em> <ul> <ol> <li> <hr> <drupal-media data-entity-type data-entity-uuid alt> <embedded-content data-plugin-config data-plugin-id>'
+      allowed_html: '<br> <p class="usa-intro"> <h2 id class> <h3 class> <h4> <h5> <h6> <a class href aria-label title target="_blank" rel> <div id class data-allow-multiple> <button type class aria-expanded aria-controls> <img src alt height width> <strong> <em> <ul class> <ol> <li class> <hr> <drupal-media data-entity-type data-entity-uuid alt> <embedded-content data-plugin-config data-plugin-id>'
       filter_html_help: true
       filter_html_nofollow: false
   media_embed: