diff --git a/modules/acquia_cms_common/acquia_cms_common.install b/modules/acquia_cms_common/acquia_cms_common.install index d9b08c3e7..a4edc1219 100644 --- a/modules/acquia_cms_common/acquia_cms_common.install +++ b/modules/acquia_cms_common/acquia_cms_common.install @@ -319,3 +319,32 @@ function acquia_cms_common_update_9331() { \Drupal::state()->delete('acquia_connector.telemetry.opted'); } } + +/** + * Implements hook_update_N(). + * + * Update editor format filter. + */ +function acquia_cms_common_update_9332() { + $configs = [ + 'editor.editor.filtered_html', + 'editor.editor.full_html', + ]; + + $config_data = [ + 'settings.plugins.ckeditor5_list' => [ + 'properties' => [ + 'reversed' => FALSE, + 'startIndex' => TRUE, + ], + ], + 'image_upload' => [ + 'status' => FALSE, + ], + ]; + + // Iterate the configurations to update the key. + foreach ($configs as $config) { + _acquia_cms_common_update_page_configurations($config, $config_data); + } +} diff --git a/modules/acquia_cms_common/config/optional/editor.editor.filtered_html.yml b/modules/acquia_cms_common/config/optional/editor.editor.filtered_html.yml index 33cff3ab0..5a0547590 100644 --- a/modules/acquia_cms_common/config/optional/editor.editor.filtered_html.yml +++ b/modules/acquia_cms_common/config/optional/editor.editor.filtered_html.yml @@ -54,8 +54,9 @@ settings: - '
' - '
' ckeditor5_list: - reversed: false - startIndex: true + properties: + reversed: false + startIndex: true ckeditor5_alignment: enabled_alignments: - left @@ -66,9 +67,3 @@ settings: allow_view_mode_override: false image_upload: status: false - scheme: public - directory: inline-images - max_size: '' - max_dimensions: - width: null - height: null diff --git a/modules/acquia_cms_common/config/optional/editor.editor.full_html.yml b/modules/acquia_cms_common/config/optional/editor.editor.full_html.yml index faa52db4b..89aa42ec6 100644 --- a/modules/acquia_cms_common/config/optional/editor.editor.full_html.yml +++ b/modules/acquia_cms_common/config/optional/editor.editor.full_html.yml @@ -58,8 +58,9 @@ settings: - '
' - '
' ckeditor5_list: - reversed: false - startIndex: true + properties: + reversed: false + startIndex: true ckeditor5_alignment: enabled_alignments: - left @@ -70,9 +71,3 @@ settings: allow_view_mode_override: false image_upload: status: false - scheme: public - directory: inline-images - max_size: '' - max_dimensions: - width: null - height: null diff --git a/modules/acquia_cms_common/modules/acquia_cms_support/tests/src/Functional/AcquiaCmsConfigSyncTest.php b/modules/acquia_cms_common/modules/acquia_cms_support/tests/src/Functional/AcquiaCmsConfigSyncTest.php index e875eea21..502a63a1a 100644 --- a/modules/acquia_cms_common/modules/acquia_cms_support/tests/src/Functional/AcquiaCmsConfigSyncTest.php +++ b/modules/acquia_cms_common/modules/acquia_cms_support/tests/src/Functional/AcquiaCmsConfigSyncTest.php @@ -112,8 +112,6 @@ public function testAcquiaConfigSyncOverriddenPage() { $assert_session->pageTextContains('Operations'); // Assert overridden configurations exists. - $assert_session->pageTextContains('editor.editor.filtered_html'); - $assert_session->pageTextContains('editor.editor.full_html'); $assert_session->pageTextContains('taxonomy.vocabulary.tags'); // Assert that unchanged configuration does not appear on overridden tab. @@ -138,8 +136,6 @@ public function testAcquiaConfigSyncOverriddenPage() { $assert_session->pageTextContains('user.role.administrator'); // Assert that overridden configuration does not appear on unchanged tab. - $assert_session->pageTextNotContains('editor.editor.filtered_html'); - $assert_session->pageTextNotContains('editor.editor.full_html'); $assert_session->pageTextNotContains('taxonomy.vocabulary.tags'); } diff --git a/modules/acquia_cms_site_studio/acquia_cms_site_studio.install b/modules/acquia_cms_site_studio/acquia_cms_site_studio.install index d2de7a7ab..7b39ed171 100644 --- a/modules/acquia_cms_site_studio/acquia_cms_site_studio.install +++ b/modules/acquia_cms_site_studio/acquia_cms_site_studio.install @@ -449,3 +449,21 @@ function acquia_cms_site_studio_update_9000() { // Set default node revision delete settings shipped by Acquia CMS. $config_handler->processConfigSettings($default_settings); } + +/** + * Implements hook_update_N(). + * + * Update site-studio editor format filter. + */ +function acquia_cms_site_studio_update_9001() { + $config_data = [ + 'settings.plugins.ckeditor5_list' => [ + 'properties' => [ + 'reversed' => TRUE, + 'startIndex' => TRUE, + ], + ], + ]; + + _acquia_cms_common_update_page_configurations('editor.editor.cohesion', $config_data); +} 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 967e1917d..6839cdc7b 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 @@ -344,8 +344,9 @@ settings: ckeditor5_sourceEditing: allowed_tags: { } ckeditor5_list: - reversed: true - startIndex: true + properties: + reversed: true + startIndex: true ckeditor5_alignment: enabled_alignments: - left