Merge branch 'develop' into IYY-266--fix-ms-bi-embed

composer.json

@@ -27,9 +27,9 @@
   "require": {
     "composer/installers": "^1.9",
     "cweagans/composer-patches": "^1.7",
-    "drupal/core-composer-scaffold": "10.3.9",
-    "drupal/core-project-message": "10.3.9",
-    "drupal/core-recommended": "10.3.9",
+    "drupal/core-composer-scaffold": "10.3.10",
+    "drupal/core-project-message": "10.3.10",
+    "drupal/core-recommended": "10.3.10",
     "drush/drush": "^11 || ^12",
     "oomphinc/composer-installers-extender": "^2.0",
     "pantheon-systems/drupal-integrations": "^10",

web/profiles/custom/yalesites_profile/composer.json

@@ -107,8 +107,8 @@
     "jjj/chosen": "2.2.1",
     "laminas/laminas-escaper": "2.13.0",
     "northernco/ckeditor5-anchor-drupal": "0.4.0",
-    "yalesites-org/ai_engine": "1.2.6",
-    "yalesites-org/atomic": "1.39.1",
+    "yalesites-org/ai_engine": "1.2.7",
+    "yalesites-org/atomic": "1.39.2",
     "yalesites-org/yale_cas": "v1.0.5"
   },
   "minimum-stability": "dev",

web/profiles/custom/yalesites_profile/config/sync/core.entity_form_display.media.document.default.yml

@@ -4,11 +4,13 @@ status: true
 dependencies:
   config:
     - field.field.media.document.field_media_file
+    - field.field.media.document.field_metatags
     - field.field.media.document.field_tags
     - media.type.document
   module:
     - chosen_field
     - file
+    - metatag
 id: media.document.default
 targetEntityType: media
 bundle: document
@@ -21,6 +23,14 @@ content:
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
+  field_metatags:
+    type: metatag_firehose
+    weight: 3
+    region: content
+    settings:
+      sidebar: true
+      use_details: true
+    third_party_settings: {  }
   field_tags:
     type: chosen_select
     weight: 2

web/profiles/custom/yalesites_profile/config/sync/core.entity_form_display.media.document.media_library.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - core.entity_form_mode.media.media_library
     - field.field.media.document.field_media_file
+    - field.field.media.document.field_metatags
     - field.field.media.document.field_tags
     - media.type.document
   module:
@@ -38,6 +39,7 @@ content:
     third_party_settings: {  }
 hidden:
   created: true
+  field_metatags: true
   path: true
   revision_log_message: true
   status: true

web/profiles/custom/yalesites_profile/config/sync/core.entity_view_display.media.document.default.yml

@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - field.field.media.document.field_media_file
+    - field.field.media.document.field_metatags
     - field.field.media.document.field_tags
     - media.type.document
   module:
@@ -22,6 +23,7 @@ content:
     region: content
 hidden:
   created: true
+  field_metatags: true
   field_tags: true
   name: true
   search_api_excerpt: true

web/profiles/custom/yalesites_profile/config/sync/core.entity_view_display.media.document.media_library.yml

@@ -5,6 +5,7 @@ dependencies:
   config:
     - core.entity_view_mode.media.media_library
     - field.field.media.document.field_media_file
+    - field.field.media.document.field_metatags
     - field.field.media.document.field_tags
     - image.style.media_library
     - media.type.document
@@ -29,6 +30,7 @@ content:
 hidden:
   created: true
   field_media_file: true
+  field_metatags: true
   field_tags: true
   name: true
   search_api_excerpt: true

web/profiles/custom/yalesites_profile/config/sync/field.field.media.document.field_metatags.yml

@@ -0,0 +1,21 @@
+uuid: 3c7d1cca-b0b1-4ee7-886b-ad6fa0400e92
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_metatags
+    - media.type.document
+  module:
+    - metatag
+id: media.document.field_metatags
+field_name: field_metatags
+entity_type: media
+bundle: document
+label: Metadata
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: metatag

web/profiles/custom/yalesites_profile/config/sync/field.storage.media.field_metatags.yml

@@ -0,0 +1,19 @@
+uuid: 241ba697-d6b1-4a31-88e4-a696c1aee334
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - metatag
+id: media.field_metatags
+field_name: field_metatags
+entity_type: media
+type: metatag
+settings: {  }
+module: metatag
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

web/profiles/custom/yalesites_profile/config/sync/metatag.settings.yml

@@ -1,4 +1,7 @@
 entity_type_groups:
+  media:
+    document:
+      ai_engine: ai_engine
   node:
     event:
       basic: basic
@@ -7,12 +10,14 @@ entity_type_groups:
     post:
       basic: basic
       open_graph: open_graph
+separator: ','
 tag_trim_method: beforeValue
+use_maxlength: true
 tag_trim_maxlength:
-  metatag_maxlength_abstract: null
-  metatag_maxlength_description: null
   metatag_maxlength_title: null
-  metatag_maxlength_og_description: null
+  metatag_maxlength_description: null
+  metatag_maxlength_abstract: null
   metatag_maxlength_og_site_name: null
   metatag_maxlength_og_title: null
+  metatag_maxlength_og_description: null
 tag_scroll_max_height: ''

web/profiles/custom/yalesites_profile/modules/custom/ys_localist/src/Plugin/migrate_plus/data_parser/LocalistJson.php

@@ -28,10 +28,13 @@ class LocalistJson extends Json implements ContainerFactoryPluginInterface, Data
    *
    * @param string $url
    *   URL of a JSON feed.
+   * @param string|int $item_selector
+   *   (optional) If the JSON data is nested, this is a selector to the
+   *   specific data. Does nothing here.
    *
    * @throws \GuzzleHttp\Exception\RequestException
    */
-  protected function getSourceData(string $url): array {
+  protected function getSourceData(string $url, string|int $item_selector = ''): array {
     $response = $this->getDataFetcherPlugin()->getResponseContent($url);
     // Convert objects to associative arrays.
     $source_data = json_decode($response, TRUE, 512, JSON_THROW_ON_ERROR);