Merge branch 'develop' into SHS-5913_Dashboard-initiative

SU-HSDO · Dec 4, 2024 · fe73ee3 · fe73ee3
2 parents 585d2fd + 416ecc8
commit fe73ee3
Show file tree

Hide file tree

Showing 25 changed files with 440 additions and 429 deletions.
diff --git a/composer.json b/composer.json
@@ -230,9 +230,6 @@
     "extra": {
         "enable-patching": true,
         "patches": {
-            "drupal/autologout": {
-                "https://www.drupal.org/project/autologout/issues/3372010": "https://www.drupal.org/files/issues/2024-05-28/autologout_3372010-25.patch"
-            },
             "drupal/conditional_fields": {
                 "https://www.drupal.org/project/conditional_fields/issues/2902164": "https://www.drupal.org/files/issues/2023-09-28/2902164-149.patch"
             },
@@ -248,8 +245,7 @@
                 "Allow hs group blocks in layout_builder": "patches/layout_builder-allow-hs-blocks.patch",
                 "Allow media items to be edited in a modal when using the field widget https://www.drupal.org/project/drupal/issues/2985168": "https://www.drupal.org/files/issues/2023-12-18/2985168-172.patch",
                 "Cannot read properties of undefined (reading 'settings') with dialog.position.js https://www.drupal.org/project/drupal/issues/3356667": "patches/core/core-mr-8892.patch",
-                "https://www.drupal.org/project/drupal/issues/3207813: ModuleHandler skips all hook implementations when invoked before the module files have been loaded": "patches/core/core-mr-6976.patch",
-                "https://www.drupal.org/project/drupal/issues/3487031: Twig 13.4.2 performance degradation": "patches/core/core-mr-10177.patch"
+                "https://www.drupal.org/project/drupal/issues/3207813: ModuleHandler skips all hook implementations when invoked before the module files have been loaded": "patches/core/core-mr-6976.patch"
             },
             "drupal/entity_reference_exposed_filters": {
                 "https://www.drupal.org/project/entity_reference_exposed_filters/issues/3189025": "https://www.drupal.org/files/issues/2023-10-17/entity_reference_exposed_filters-empty_target-3189025-4.patch"

diff --git a/composer.lock b/composer.lock
diff --git a/config/default/config_ignore.settings.yml b/config/default/config_ignore.settings.yml
@@ -45,3 +45,4 @@ ignored_config_entities:
   - system.site
   - 'domain_registration.settings:pattern'
   - 'user.settings:register'
+  - 'single_content_sync.settings:allowed_entity_types.node'
diff --git a/config/default/search_api.index.default_index.yml b/config/default/search_api.index.default_index.yml
@@ -3,11 +3,10 @@ langcode: en
 status: true
 dependencies:
   config:
-    - search_api.server.default_server
     - core.entity_view_mode.node.search_index
+    - search_api.server.default_server
   module:
     - node
-    - search_api
 id: default_index
 name: 'Default content index'
 description: 'Default content index created by the Database Search Defaults module'

diff --git a/config/default/ultimate_cron.job.core_event_dispatcher_cron.yml b/config/default/ultimate_cron.job.core_event_dispatcher_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: core_event_dispatcher_cron
 weight: 0
 module: core_event_dispatcher
-callback: core_event_dispatcher_cron
+callback: 'core_event_dispatcher#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.fast_404_generator_cron.yml b/config/default/ultimate_cron.job.fast_404_generator_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: fast_404_generator_cron
 weight: 0
 module: fast_404_generator
-callback: fast_404_generator_cron
+callback: 'fast_404_generator#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.field_cron.yml b/config/default/ultimate_cron.job.field_cron.yml
@@ -8,7 +8,7 @@ title: 'Purges deleted Field API data'
 id: field_cron
 weight: 0
 module: field
-callback: field_cron
+callback: 'field#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.file_cron.yml b/config/default/ultimate_cron.job.file_cron.yml
@@ -8,7 +8,7 @@ title: 'Deletes temporary files'
 id: file_cron
 weight: 0
 module: file
-callback: file_cron
+callback: 'file#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.google_analytics_cron.yml b/config/default/ultimate_cron.job.google_analytics_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: google_analytics_cron
 weight: 0
 module: google_analytics
-callback: google_analytics_cron
+callback: 'google_analytics#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.honeypot_cron.yml b/config/default/ultimate_cron.job.honeypot_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: honeypot_cron
 weight: 0
 module: honeypot
-callback: honeypot_cron
+callback: 'honeypot#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.hs_field_helpers_cron.yml b/config/default/ultimate_cron.job.hs_field_helpers_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: hs_field_helpers_cron
 weight: 0
 module: hs_field_helpers
-callback: hs_field_helpers_cron
+callback: 'hs_field_helpers#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.hs_page_reports_cron.yml b/config/default/ultimate_cron.job.hs_page_reports_cron.yml
@@ -8,7 +8,7 @@ title: 'HS Page Reports'
 id: hs_page_reports_cron
 weight: 0
 module: hs_page_reports
-callback: hs_page_reports_cron
+callback: 'hs_page_reports#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.layout_builder_cron.yml b/config/default/ultimate_cron.job.layout_builder_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: layout_builder_cron
 weight: 0
 module: layout_builder
-callback: layout_builder_cron
+callback: 'layout_builder#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.node_cron.yml b/config/default/ultimate_cron.job.node_cron.yml
@@ -8,7 +8,7 @@ title: 'Mark old nodes as read'
 id: node_cron
 weight: 0
 module: node
-callback: node_cron
+callback: 'node#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.node_revision_delete_cron.yml b/config/default/ultimate_cron.job.node_revision_delete_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: node_revision_delete_cron
 weight: 0
 module: node_revision_delete
-callback: node_revision_delete_cron
+callback: 'node_revision_delete#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.redirect_404_cron.yml b/config/default/ultimate_cron.job.redirect_404_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: redirect_404_cron
 weight: 0
 module: redirect_404
-callback: redirect_404_cron
+callback: 'redirect_404#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.search_api_cron.yml b/config/default/ultimate_cron.job.search_api_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: search_api_cron
 weight: 0
 module: search_api
-callback: search_api_cron
+callback: 'search_api#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.stanford_fields_cron.yml b/config/default/ultimate_cron.job.stanford_fields_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: stanford_fields_cron
 weight: 0
 module: stanford_fields
-callback: stanford_fields_cron
+callback: 'stanford_fields#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.system_cron.yml b/config/default/ultimate_cron.job.system_cron.yml
@@ -8,7 +8,7 @@ title: 'Cleanup (caches, batch, flood, temp-files, etc.)'
 id: system_cron
 weight: 0
 module: system
-callback: system_cron
+callback: 'system#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.ultimate_cron_cron.yml b/config/default/ultimate_cron.job.ultimate_cron_cron.yml
@@ -6,7 +6,7 @@ title: 'Runs internal cleanup operations'
 id: ultimate_cron_cron
 weight: 0
 module: ultimate_cron
-callback: ultimate_cron_cron
+callback: 'ultimate_cron#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.webform_cron.yml b/config/default/ultimate_cron.job.webform_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: webform_cron
 weight: 0
 module: webform
-callback: webform_cron
+callback: 'webform#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/default/ultimate_cron.job.xmlsitemap_cron.yml b/config/default/ultimate_cron.job.xmlsitemap_cron.yml
@@ -8,7 +8,7 @@ title: 'Default cron handler'
 id: xmlsitemap_cron
 weight: 0
 module: xmlsitemap
-callback: xmlsitemap_cron
+callback: 'xmlsitemap#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/envs/local/ultimate_cron.job.dblog_cron.yml b/config/envs/local/ultimate_cron.job.dblog_cron.yml
@@ -8,7 +8,7 @@ title: 'Remove expired log messages and flood control events'
 id: dblog_cron
 weight: 0
 module: dblog
-callback: dblog_cron
+callback: 'dblog#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/config/envs/local/ultimate_cron.job.update_cron.yml b/config/envs/local/ultimate_cron.job.update_cron.yml
@@ -8,7 +8,7 @@ title: 'Update indexes'
 id: update_cron
 weight: 0
 module: update
-callback: update_cron
+callback: 'update#cron'
 scheduler:
   id: simple
 launcher:

diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.install
@@ -1026,3 +1026,14 @@ function su_humsci_profile_update_9714() {
     $role->save();
   }
 }
+
+/**
+ * Update config ignore settings.
+ */
+function su_humsci_profile_update_9715() {
+  $config = \Drupal::configFactory()->getEditable('config_ignore.settings');
+  $ignored_config_entities = $config->get('ignored_config_entities');
+  $ignored_config_entities[] = 'single_content_sync.settings:allowed_entity_types.node';
+  $config->set('ignored_config_entities', $ignored_config_entities);
+  $config->save();
+}