From 0f3f4cfebb99778af82b60933dcfef35510ecb84 Mon Sep 17 00:00:00 2001
From: Rajeshreeputra <pravin.gaikwad@acquia.com>
Date: Wed, 29 Jan 2025 16:09:23 +0530
Subject: [PATCH] ACMS-4430: Fix Site Studio (Text formats and editors) as per
 CKEditor5. (#1922)

ACMS-4430: Fix Site Studio (Text formats and editors) as per CKEditor5.
---
 composer.json                                 |  3 ++
 composer.lock                                 | 14 ++++----
 .../acquia_cms_site_studio.info.yml           |  1 +
 .../optional/editor.editor.cohesion.yml       | 33 ++++++++++++++++++-
 .../optional/filter.format.cohesion.yml       | 30 ++++++++---------
 5 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/composer.json b/composer.json
index dd70c2e6d..03245b0cd 100644
--- a/composer.json
+++ b/composer.json
@@ -322,6 +322,9 @@
             "drupal/core": "-p2"
         },
         "patches": {
+            "acquia/cohesion": {
+                "3340269 - Site Studio Drupal 11.1 compatibility": "https://www.drupal.org/files/issues/2025-01-09/3340269-site-studio-drupal-11-1-compatibility.patch"
+            },
             "drupal/core": {
                 "3328187 - PHP Deprecated: strpos(): Passing null to parameter #1 ($haystack) of type string is deprecated in docroot/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php on line 112": "https://git.drupalcode.org/project/drupal/-/merge_requests/3142.patch",
                 "Fix failing test for site studio due to missing file": "https://gist.githubusercontent.com/chandan-singh7929/978c8c3c8b6f1e2de23492e7e562c0c3/raw/f0e7770d94be862e5495ca25662a0a0d5672b785/bypass-library-version-core.patch"
diff --git a/composer.lock b/composer.lock
index 4a55c2782..674993546 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f7f9e623cf8da30e566ee0d0052fb980",
+    "content-hash": "a285aa0789cbf1a0b52f8b799237b02c",
     "packages": [
         {
             "name": "acquia/acquia-cms-starterkit",
@@ -83,16 +83,16 @@
         },
         {
             "name": "acquia/cohesion",
-            "version": "8.0.1",
+            "version": "8.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/acquia/cohesion.git",
-                "reference": "9c1fe03d979508e4d606ed3033143f9b345bcce3"
+                "reference": "edea0bfa3ebc42c519b30d831aaf6fb19107030f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/acquia/cohesion/zipball/9c1fe03d979508e4d606ed3033143f9b345bcce3",
-                "reference": "9c1fe03d979508e4d606ed3033143f9b345bcce3",
+                "url": "https://api.github.com/repos/acquia/cohesion/zipball/edea0bfa3ebc42c519b30d831aaf6fb19107030f",
+                "reference": "edea0bfa3ebc42c519b30d831aaf6fb19107030f",
                 "shasum": ""
             },
             "require": {
@@ -140,9 +140,9 @@
             ],
             "description": "Site Studio",
             "support": {
-                "source": "https://github.com/acquia/cohesion/tree/8.0.1"
+                "source": "https://github.com/acquia/cohesion/tree/8.0.2"
             },
-            "time": "2024-10-08T11:09:42+00:00"
+            "time": "2024-11-20T19:17:26+00:00"
         },
         {
             "name": "acquia/cohesion-theme",
diff --git a/modules/acquia_cms_site_studio/acquia_cms_site_studio.info.yml b/modules/acquia_cms_site_studio/acquia_cms_site_studio.info.yml
index 288224379..689d60016 100644
--- a/modules/acquia_cms_site_studio/acquia_cms_site_studio.info.yml
+++ b/modules/acquia_cms_site_studio/acquia_cms_site_studio.info.yml
@@ -12,4 +12,5 @@ dependencies:
   - cohesion_sync # phpcs:ignore
   - cohesion_website_settings # phpcs:ignore
   - collapsiblock:collapsiblock
+  - drupal:media_library
   - sitestudio_page_builder # phpcs:ignore
diff --git a/modules/acquia_cms_site_studio/config/optional/editor.editor.cohesion.yml b/modules/acquia_cms_site_studio/config/optional/editor.editor.cohesion.yml
index 6839cdc7b..a12f58017 100644
--- a/modules/acquia_cms_site_studio/config/optional/editor.editor.cohesion.yml
+++ b/modules/acquia_cms_site_studio/config/optional/editor.editor.cohesion.yml
@@ -35,6 +35,36 @@ settings:
       - codeBlock
       - style
   plugins:
+    ckeditor5_codeBlock:
+      languages:
+        - label: 'Plain text'
+          language: plaintext
+        - label: C
+          language: c
+        - label: 'C#'
+          language: cs
+        - label: C++
+          language: cpp
+        - label: CSS
+          language: css
+        - label: Diff
+          language: diff
+        - label: HTML
+          language: html
+        - label: Java
+          language: java
+        - label: JavaScript
+          language: javascript
+        - label: PHP
+          language: php
+        - label: Python
+          language: python
+        - label: Ruby
+          language: ruby
+        - label: TypeScript
+          language: typescript
+        - label: XML
+          language: xml
     ckeditor5_heading:
       enabled_headings:
         - heading2
@@ -347,6 +377,7 @@ settings:
       properties:
         reversed: true
         startIndex: true
+      multiBlock: true
     ckeditor5_alignment:
       enabled_alignments:
         - left
@@ -359,7 +390,7 @@ image_upload:
   status: true
   scheme: public
   directory: inline-images
-  max_size: ''
+  max_size: '2 MB'
   max_dimensions:
     width: null
     height: null
diff --git a/modules/acquia_cms_site_studio/config/optional/filter.format.cohesion.yml b/modules/acquia_cms_site_studio/config/optional/filter.format.cohesion.yml
index 1da6c2e89..343915f8b 100644
--- a/modules/acquia_cms_site_studio/config/optional/filter.format.cohesion.yml
+++ b/modules/acquia_cms_site_studio/config/optional/filter.format.cohesion.yml
@@ -11,15 +11,6 @@ name: 'Site Studio'
 format: cohesion
 weight: 0
 filters:
-  filter_html:
-    id: filter_html
-    provider: filter
-    status: false
-    weight: -9
-    settings:
-      allowed_html: '<p class="coh-style-paragraph-extra-large coh-style-paragraph-small coh-style-paragraph-large"> <span class="coh-style-paragraph-extra-large coh-style-link-button-light coh-style-heading-3-size coh-style-link-with-icon coh-style-heading-2-size coh-style-tick-list coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-link-button-dark coh-style-paragraph-small coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-link-button-color coh-style-pre-heading-light coh-style-paragraph-large coh-color-brand-color-light coh-color-brand-color coh-color-brand-color-dark coh-color-gray-10 coh-color-gray-20 coh-color-gray-30 coh-color-gray-70 coh-color-gray-80 coh-color-gray-90 coh-color-black coh-color-white"> <a class="coh-style-link-button-light coh-style-link-with-icon coh-style-link-button-dark coh-style-link-button-color"> <h1 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <h2 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <h3 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <h4 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <h5 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <h6 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <ul class="coh-style-tick-list"> <ol class="coh-style-tick-list"> <dl class="coh-style-tick-list">'
-      filter_html_help: true
-      filter_html_nofollow: false
   editor_file_reference:
     id: editor_file_reference
     provider: editor
@@ -32,12 +23,27 @@ filters:
     status: true
     weight: 0
     settings: {  }
+  filter_autop:
+    id: filter_autop
+    provider: filter
+    status: true
+    weight: 0
+    settings: { }
   filter_caption:
     id: filter_caption
     provider: filter
     status: true
     weight: 0
     settings: {  }
+  filter_html:
+    id: filter_html
+    provider: filter
+    status: false
+    weight: -9
+    settings:
+      allowed_html: '<p class="coh-style-paragraph-extra-large coh-style-paragraph-small coh-style-paragraph-large"> <span class="coh-style-paragraph-extra-large coh-style-link-button-light coh-style-heading-3-size coh-style-link-with-icon coh-style-heading-2-size coh-style-tick-list coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-link-button-dark coh-style-paragraph-small coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-link-button-color coh-style-pre-heading-light coh-style-paragraph-large coh-color-brand-color-light coh-color-brand-color coh-color-brand-color-dark coh-color-gray-10 coh-color-gray-20 coh-color-gray-30 coh-color-gray-70 coh-color-gray-80 coh-color-gray-90 coh-color-black coh-color-white"> <a class="coh-style-link-button-light coh-style-link-with-icon coh-style-link-button-dark coh-style-link-button-color"> <h1 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <h2 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <h3 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <h4 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <h5 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <h6 class="coh-style-heading-3-size coh-style-heading-2-size coh-style-pre-heading coh-style-pre-heading-dark coh-style-heading-5-size coh-style-pre-heading-blue coh-style-heading-1-size coh-style-heading-xl coh-style-heading-4-size coh-style-pre-heading-light"> <ul class="coh-style-tick-list"> <ol class="coh-style-tick-list"> <dl class="coh-style-tick-list">'
+      filter_html_help: true
+      filter_html_nofollow: false
   filter_htmlcorrector:
     id: filter_htmlcorrector
     provider: filter
@@ -55,9 +61,3 @@ filters:
         default: default
         full: full
       allowed_media_types: {  }
-  filter_autop:
-    id: filter_autop
-    provider: filter
-    status: true
-    weight: 0
-    settings: {  }