Revert "Issue #7: Update configuration related to ckeditor add suppor…

…t of Drupal 10." This reverts commit a666741.
LOBsTerr · Sep 7, 2023 · 611225d · 611225d
1 parent a666741
commit 611225d
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 64 deletions.
diff --git a/modules/newsroom_connector_country/newsroom_connector_country.info.yml b/modules/newsroom_connector_country/newsroom_connector_country.info.yml
@@ -3,7 +3,7 @@ description: Provides Newsroom Country vocabulary and importer.
 package: Newsroom
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9
 php: (>=8.0)
 
 dependencies:

diff --git a/modules/newsroom_connector_item/config/install/editor.editor.newsroom_basic_html.yml b/modules/newsroom_connector_item/config/install/editor.editor.newsroom_basic_html.yml
@@ -8,34 +8,49 @@ dependencies:
   config:
     - filter.format.newsroom_basic_html
   module:
-    - ckeditor5
+    - ckeditor
 format: newsroom_basic_html
-editor: ckeditor5
+editor: ckeditor
 settings:
   toolbar:
-    items:
-      - bold
-      - italic
-      - '|'
-      - link
-      - '|'
-      - bulletedList
-      - numberedList
-      - '|'
-      - blockQuote
-      - insertTable
-      - code
-      - heading
+    rows:
+      -
+        -
+          name: Formatting
+          items:
+            - Bold
+            - Italic
+        -
+          name: Linking
+          items:
+            - DrupalLink
+            - DrupalUnlink
+        -
+          name: Lists
+          items:
+            - BulletedList
+            - NumberedList
+        -
+          name: Media
+          items:
+            - Blockquote
+            - DrupalImage
+        -
+          name: 'Block Formatting'
+          items:
+            - Format
+        -
+          name: Tools
+          items:
+            - Source
   plugins:
-    ckeditor5_heading:
-      enabled_headings:
-        - heading1
-        - heading2
-        - heading3
-        - heading4
-        - heading5
-        - heading6
-    ckeditor5_list:
-      reversed: false
-      startIndex: true
-image_upload: {  }
+    stylescombo:
+      styles: ''
+image_upload:
+  status: true
+  scheme: public
+  directory: inline-images
+  max_size: ''
+  max_dimensions:
+    width: 0
+    height: 0
diff --git a/modules/newsroom_connector_item/config/install/filter.format.newsroom_basic_html.yml b/modules/newsroom_connector_item/config/install/filter.format.newsroom_basic_html.yml
@@ -10,31 +10,33 @@ dependencies:
 name: 'Newsroom Basic HTML'
 format: newsroom_basic_html
 weight: 0
+roles:
+  - authenticated
 filters:
   filter_html:
     id: filter_html
     provider: filter
     status: true
     weight: -10
     settings:
-      allowed_html: '<br> <p> <h1> <h2> <h3> <h4> <h5> <h6> <strong> <em> <code> <blockquote> <a href> <ul> <ol start> <li> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <tfoot> <caption>'
+      allowed_html: '<a href hreflang class=""> <em> <strong> <cite class=""> <blockquote cite class> <code class=""> <ul type class=""> <ol start type class=""> <li class=""> <dl class=""> <dt class=""> <dd class=""> <h2 id class=""> <h3 id class=""> <h4 id class=""> <h5 id class=""> <h6 id class=""> <p class=""> <br> <span class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption class=""> <iframe width height src frameborder allow allowfullscreen title class=""> <div class=""> <use xlink:href> <svg focusable aria-hidden data-ecl-icon class="">'
       filter_html_help: false
       filter_html_nofollow: false
   filter_align:
     id: filter_align
     provider: filter
-    status: false
+    status: true
     weight: 7
     settings: {  }
   filter_caption:
     id: filter_caption
     provider: filter
-    status: false
+    status: true
     weight: 8
     settings: {  }
   editor_file_reference:
     id: editor_file_reference
     provider: editor
-    status: false
+    status: true
     weight: 11
     settings: {  }
diff --git a/modules/newsroom_connector_item/newsroom_connector_item.info.yml b/modules/newsroom_connector_item/newsroom_connector_item.info.yml
@@ -3,7 +3,7 @@ description: Provides Newsroom Item content type and importer.
 package: Newsroom
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9
 php: (>=8.0)
 
 dependencies:

diff --git a/modules/newsroom_connector_item/newsroom_connector_item.install b/modules/newsroom_connector_item/newsroom_connector_item.install
@@ -131,30 +131,6 @@ function newsroom_connector_item_update_9006(&$sandbox) {
   _newsroom_connector_item_install_field('field_newsroom_docs_match_lang');
 }
 
-/**
- * Replace ckeditor to ckeditor5.
- */
-function newsroom_connector_item_update_9007(&$sandbox) {
-  $config_storage = \Drupal::service('config.storage');
-
-  // Get the storage for optional extension configuration.
-  $optional_storage = new ExtensionInstallStorage(
-    $config_storage,
-    InstallStorage::CONFIG_INSTALL_DIRECTORY,
-    InstallStorage::DEFAULT_COLLECTION,
-    TRUE,
-    NULL
-  );
-
-  $config_name = 'filter.format.newsroom_basic_html';
-  $config = \Drupal::configFactory()->getEditable($config_name);
-  $config->set($config_name, $optional_storage->read($config_name));
-  $config->save(TRUE);
-
-  $config_name = 'editor.editor.newsroom_basic_html';
-  $config_storage->write($config_name, $optional_storage->read($config_name));
-}
-
 /**
  * Install field from module config files.
  *

diff --git a/modules/newsroom_connector_media/newsroom_connector_media.info.yml b/modules/newsroom_connector_media/newsroom_connector_media.info.yml
@@ -3,7 +3,7 @@ description: Newsroom media provides media configuration.
 package: Newsroom
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9
 php: (>=8.0)
 
 dependencies:

diff --git a/modules/newsroom_connector_newsletter/newsroom_connector_newsletter.info.yml b/modules/newsroom_connector_newsletter/newsroom_connector_newsletter.info.yml
@@ -3,7 +3,7 @@ description: Provides Newsroom Newsletter vocabulary and importer.
 package: Newsroom
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9
 php: (>=8.0)
 
 dependencies:

diff --git a/modules/newsroom_connector_service/newsroom_connector_service.info.yml b/modules/newsroom_connector_service/newsroom_connector_service.info.yml
@@ -3,7 +3,7 @@ description: Provides Newsroom Service vocabulary and importer.
 package: Newsroom
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9
 php: (>=8.0)
 
 dependencies:

diff --git a/modules/newsroom_connector_team_responsible/newsroom_connector_team_responsible.info.yml b/modules/newsroom_connector_team_responsible/newsroom_connector_team_responsible.info.yml
@@ -3,7 +3,7 @@ description: Provides Newsroom Team Responsible vocabulary and importer.
 package: Newsroom
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9
 php: (>=8.0)
 
 dependencies:

diff --git a/modules/newsroom_connector_topic/newsroom_connector_topic.info.yml b/modules/newsroom_connector_topic/newsroom_connector_topic.info.yml
@@ -3,7 +3,7 @@ description: Provides Newsroom Topic vocabulary and importer.
 package: Newsroom
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9
 php: (>=8.0)
 
 dependencies:

diff --git a/modules/newsroom_connector_type/newsroom_connector_type.info.yml b/modules/newsroom_connector_type/newsroom_connector_type.info.yml
@@ -3,7 +3,7 @@ description: Provides Newsroom Type vocabulary and importer.
 package: Newsroom
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9
 php: (>=8.0)
 
 dependencies:

diff --git a/newsroom_connector.info.yml b/newsroom_connector.info.yml
@@ -3,7 +3,7 @@ description: Newsroom connector
 package: Newsroom
 
 type: module
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9
 php: (>=8.0)
 
 dependencies: