Merge branch 'develop' into ifactory-ys

yalesites-org · Nov 27, 2024 · b0a697b · b0a697b
2 parents 0f41fa1 + 9bdd9cb
commit b0a697b
Show file tree

Hide file tree

Showing 48 changed files with 580 additions and 109 deletions.
diff --git a/composer.json b/composer.json
@@ -27,9 +27,9 @@
   "require": {
     "composer/installers": "^1.9",
     "cweagans/composer-patches": "^1.7",
-    "drupal/core-composer-scaffold": "10.3.6",
-    "drupal/core-project-message": "10.3.6",
-    "drupal/core-recommended": "10.3.6",
+    "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",

diff --git a/pantheon.yml b/pantheon.yml
@@ -1,5 +1,6 @@
 api_version: 1
 # Downstream sites should not change the workflow.
+
 # Specifying Quicksilver workflows in pantheon.upstream.yml is not supported.
 workflows:
   clone_database:

diff --git a/patches/layout_builder_browser/3408935-and-3409153-9.patch b/patches/layout_builder_browser/3408935-and-3409153-9.patch
@@ -103,7 +103,7 @@ index 34310e2..fa855a6 100644
 +          if ($config->get('group_reusable_blocks_together')) {
 +
 +            foreach ($block_links as $key => $block_link) {
-+              $changed = date('m/d/Y - H:i', $block_link['#changed']);
++              $changed = date('m/d/Y - H:i', $block_link['link']['#changed']);
 +              $block_links[$key]['link']['#title']['label']['#markup'] = "
 +                <span class='underlined-title'>{$block_link['link']['#title']['label']['#markup']}</span>
 +                <br>

diff --git a/web/profiles/custom/yalesites_profile/composer.json b/web/profiles/custom/yalesites_profile/composer.json
@@ -25,10 +25,7 @@
     "drupal/allowed_formats": "3.0.1",
     "drupal/anchor_link": "3.0.0-beta1",
     "drupal/auto_entitylabel": "3.3.0",
-    "drupal/autosave_form": "1.6.0",
     "drupal/better_exposed_filters": "6.0.5",
-    "drupal/block_content_permissions": "1.11",
-    "drupal/bugherd": "1.3.0",
     "drupal/calendar_link": "3.0.3",
     "drupal/captcha": "2.0.6",
     "drupal/cas": "2.3.2",
@@ -89,7 +86,6 @@
     "drupal/paragraphs": "1.18.0",
     "drupal/paragraphs_features": "2.0.0",
     "drupal/pathauto": "1.13.0",
-    "drupal/publishcontent": "1.6",
     "drupal/quick_node_clone": "1.19.0",
     "drupal/recaptcha": "3.4.0",
     "drupal/recaptcha_v3": "2.0.3",
@@ -111,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.5",
-    "yalesites-org/atomic": "1.39.0",
+    "yalesites-org/ai_engine": "1.2.7",
+    "yalesites-org/atomic": "1.39.2",
     "yalesites-org/yale_cas": "v1.0.5"
   },
   "minimum-stability": "dev",

diff --git a/.../custom/yalesites_profile/config/sync/core.entity_form_display.media.document.default.yml b/.../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

diff --git a/...m/yalesites_profile/config/sync/core.entity_form_display.media.document.media_library.yml b/...m/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

diff --git a/.../custom/yalesites_profile/config/sync/core.entity_view_display.media.document.default.yml b/.../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

diff --git a/...m/yalesites_profile/config/sync/core.entity_view_display.media.document.media_library.yml b/...m/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

diff --git a/web/profiles/custom/yalesites_profile/config/sync/editor.editor.webform_default.yml b/web/profiles/custom/yalesites_profile/config/sync/editor.editor.webform_default.yml
@@ -1,4 +1,4 @@
-uuid: null
+uuid: 56ddbda0-c014-4865-8529-616d20969e4a
 langcode: en
 status: true
 dependencies:

diff --git a/...ofiles/custom/yalesites_profile/config/sync/field.field.media.document.field_metatags.yml b/...ofiles/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
diff --git a/web/profiles/custom/yalesites_profile/config/sync/field.storage.media.field_metatags.yml b/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
diff --git a/web/profiles/custom/yalesites_profile/config/sync/filter.format.heading_html.yml b/web/profiles/custom/yalesites_profile/config/sync/filter.format.heading_html.yml
@@ -24,24 +24,24 @@ filters:
     status: false
     weight: 50
     settings:
-      remove_empty_paragraphs: '0'
+      remove_empty_paragraphs: false
   typogrify:
     id: typogrify
     provider: typogrify
     status: true
     weight: 10
     settings:
-      smartypants_enabled: '1'
-      smartypants_hyphens: '2'
-      space_hyphens: '0'
-      widont_enabled: '0'
-      hyphenate_shy: '0'
-      space_to_nbsp: '1'
-      wrap_caps: '0'
-      wrap_ampersand: '0'
-      wrap_abbr: '0'
-      wrap_numbers: '0'
-      wrap_initial_quotes: '1'
+      smartypants_enabled: 1
+      smartypants_hyphens: 2
+      space_hyphens: 0
+      wrap_ampersand: 0
+      widont_enabled: 0
+      space_to_nbsp: 1
+      hyphenate_shy: 0
+      wrap_abbr: 0
+      wrap_caps: 0
+      wrap_initial_quotes: 1
+      wrap_numbers: 0
       ligatures: 'a:0:{}'
       arrows: 'a:0:{}'
       fractions: 'a:0:{}'

diff --git a/web/profiles/custom/yalesites_profile/config/sync/filter.format.plain_text.yml b/web/profiles/custom/yalesites_profile/config/sync/filter.format.plain_text.yml
@@ -22,4 +22,4 @@ filters:
     status: false
     weight: 50
     settings:
-      remove_empty_paragraphs: '0'
+      remove_empty_paragraphs: false
diff --git a/web/profiles/custom/yalesites_profile/config/sync/filter.format.restricted_html.yml b/web/profiles/custom/yalesites_profile/config/sync/filter.format.restricted_html.yml
@@ -43,24 +43,24 @@ filters:
     status: true
     weight: 50
     settings:
-      remove_empty_paragraphs: '1'
+      remove_empty_paragraphs: true
   typogrify:
     id: typogrify
     provider: typogrify
     status: true
     weight: 10
     settings:
-      smartypants_enabled: '1'
-      smartypants_hyphens: '2'
-      space_hyphens: '0'
-      wrap_ampersand: '0'
-      widont_enabled: '0'
-      space_to_nbsp: '1'
-      hyphenate_shy: '0'
-      wrap_abbr: '0'
-      wrap_caps: '0'
-      wrap_initial_quotes: '1'
-      wrap_numbers: '0'
+      smartypants_enabled: 1
+      smartypants_hyphens: 2
+      space_hyphens: 0
+      wrap_ampersand: 0
+      widont_enabled: 0
+      space_to_nbsp: 1
+      hyphenate_shy: 0
+      wrap_abbr: 0
+      wrap_caps: 0
+      wrap_initial_quotes: 1
+      wrap_numbers: 0
       ligatures: 'a:0:{}'
       arrows: 'a:0:{}'
       fractions: 'a:0:{}'

diff --git a/web/profiles/custom/yalesites_profile/config/sync/filter.format.webform_default.yml b/web/profiles/custom/yalesites_profile/config/sync/filter.format.webform_default.yml
@@ -1,3 +1,4 @@
+uuid: 263588a0-329b-4b3a-a970-b41e61c401ae
 langcode: en
 status: true
 dependencies:
@@ -7,6 +8,4 @@ dependencies:
 name: 'Webform (Default) - DO NOT EDIT'
 format: webform_default
 weight: 100
-roles:
-  - authenticated
 filters: {  }
diff --git a/...s_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.advanced.yml b/...s_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.advanced.yml
@@ -6,3 +6,5 @@ id: advanced
 label: Advanced
 weight: -7
 opened: true
+image_path: null
+image_alt: null
diff --git a/...profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.all_blocks.yml b/...profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.all_blocks.yml
@@ -6,3 +6,5 @@ id: all_blocks
 label: 'All Blocks'
 weight: -10
 opened: true
+image_path: null
+image_alt: null
diff --git a/...ites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.basic.yml b/...ites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.basic.yml
@@ -6,3 +6,5 @@ id: basic
 label: Basic
 weight: -9
 opened: true
+image_path: null
+image_alt: null
diff --git a/...ites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.media.yml b/...ites_profile/config/sync/layout_builder_browser.layout_builder_browser_blockcat.media.yml
@@ -6,3 +6,5 @@ id: media
 label: Media
 weight: -8
 opened: true
+image_path: null
+image_alt: null
diff --git a/web/profiles/custom/yalesites_profile/config/sync/metatag.settings.yml b/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: ''
diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.archive.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.archive.yml
@@ -29,6 +29,7 @@ display:
         type: mini
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 10
           total_pages: 0
           id: 0
@@ -43,7 +44,6 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options:

diff --git a/web/profiles/custom/yalesites_profile/config/sync/views.view.block_content.yml b/web/profiles/custom/yalesites_profile/config/sync/views.view.block_content.yml
@@ -273,6 +273,7 @@ display:
         type: mini
         options:
           offset: 0
+          pagination_heading_level: h4
           items_per_page: 50
           total_pages: null
           id: 0
@@ -287,7 +288,6 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-          pagination_heading_level: h4
       exposed_form:
         type: basic
         options: