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

yalesites-org · Dec 5, 2024 · 2ac989a · 2ac989a
2 parents 9459795 + 3d0069b
commit 2ac989a
Show file tree

Hide file tree

Showing 14 changed files with 653 additions and 56 deletions.
diff --git a/.github/workflows/release_pr.yml b/.github/workflows/release_pr.yml
@@ -5,7 +5,7 @@ on:
       - synchronize
       - closed
     branches:
-      - master
+      - v[0-9]+
   workflow_dispatch:
 env:
   YALESITES_BUILD_TOKEN: ${{ secrets.YALESITES_BUILD_TOKEN }}

diff --git a/composer.json b/composer.json
@@ -36,15 +36,7 @@
     "yalesites-org/yalesites_profile": "*"
   },
   "require-dev": {
-    "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
-    "drupal/coder": "^8.3",
-    "drupal/core-dev": "^10",
-    "drupal/drupal-driver": "^2.1",
-    "drupal/drupal-extension": "^5.0",
-    "mikey179/vfsstream": "^1.6",
-    "phpspec/prophecy-phpunit": "^2",
-    "phpunit/phpunit": "^9.5",
-    "squizlabs/php_codesniffer": "^3.6"
+    "drupal/core-dev": "^10"
   },
   "conflict": {
     "drupal/drupal": "*"

diff --git a/web/profiles/custom/yalesites_profile/composer.json b/web/profiles/custom/yalesites_profile/composer.json
@@ -43,7 +43,7 @@
     "drupal/entity_redirect": "2.3.0",
     "drupal/fast_404": "3.3.0",
     "drupal/field_group": "3.6.0",
-    "drupal/focal_point": "2.1.1",
+    "drupal/focal_point": "2.1.2",
     "drupal/formdazzle": "4.0.0",
     "drupal/gin": "3.0.0-rc13",
     "drupal/gin_lb": "1.0.0-rc8",

diff --git a/...ustom/yalesites_profile/config/sync/core.entity_view_display.node.event.search_result.yml b/...ustom/yalesites_profile/config/sync/core.entity_view_display.node.event.search_result.yml
@@ -51,7 +51,7 @@ content:
   content_moderation_control:
     settings: {  }
     third_party_settings: {  }
-    weight: -20
+    weight: 0
     region: content
   field_external_source:
     type: link_separate
@@ -63,19 +63,29 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
-    weight: 2
+    weight: 3
+    region: content
+  field_login_required:
+    type: boolean
+    label: hidden
+    settings:
+      format: boolean
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 4
     region: content
   field_teaser_text:
     type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    weight: 1
+    weight: 2
     region: content
   search_api_excerpt:
     settings: {  }
     third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
 hidden:
   field_category: true
@@ -100,7 +110,6 @@ hidden:
   field_localist_id: true
   field_localist_info: true
   field_localist_register_enabled: true
-  field_login_required: true
   field_metatags: true
   field_stream_embed_code: true
   field_stream_url: true

diff --git a/...custom/yalesites_profile/config/sync/core.entity_view_display.node.page.search_result.yml b/...custom/yalesites_profile/config/sync/core.entity_view_display.node.page.search_result.yml
@@ -26,7 +26,7 @@ content:
   content_moderation_control:
     settings: {  }
     third_party_settings: {  }
-    weight: -20
+    weight: 0
     region: content
   field_external_source:
     type: link_separate
@@ -38,23 +38,32 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
-    weight: 2
+    weight: 3
+    region: content
+  field_login_required:
+    type: boolean
+    label: hidden
+    settings:
+      format: true-false
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 4
     region: content
   field_teaser_text:
     type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    weight: 1
+    weight: 2
     region: content
   search_api_excerpt:
     settings: {  }
     third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
 hidden:
   field_category: true
-  field_login_required: true
   field_metatags: true
   field_tags: true
   field_teaser_media: true

diff --git a/...custom/yalesites_profile/config/sync/core.entity_view_display.node.post.search_result.yml b/...custom/yalesites_profile/config/sync/core.entity_view_display.node.post.search_result.yml
@@ -17,13 +17,19 @@ dependencies:
     - field.field.node.post.layout_builder__layout
     - node.type.post
   module:
+    - link
     - text
     - user
 id: node.post.search_result
 targetEntityType: node
 bundle: post
 mode: search_result
 content:
+  content_moderation_control:
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
   field_external_source:
     type: link_separate
     label: hidden
@@ -34,28 +40,38 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
-    weight: 2
+    weight: 3
+    region: content
+  field_login_required:
+    type: boolean
+    label: above
+    settings:
+      format: boolean
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 4
     region: content
   field_teaser_text:
     type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    weight: 1
+    weight: 2
     region: content
   search_api_excerpt:
     settings: {  }
     third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
 hidden:
   field_author: true
   field_category: true
-  field_login_required: true
   field_metatags: true
   field_publish_date: true
   field_tags: true
   field_teaser_media: true
   field_teaser_title: true
   layout_builder__layout: true
   links: true
+  workflow_buttons: true
diff --git a/...tom/yalesites_profile/config/sync/core.entity_view_display.node.profile.search_result.yml b/...tom/yalesites_profile/config/sync/core.entity_view_display.node.profile.search_result.yml
@@ -42,7 +42,7 @@ content:
   content_moderation_control:
     settings: {  }
     third_party_settings: {  }
-    weight: -20
+    weight: 0
     region: content
   field_external_source:
     type: link_separate
@@ -54,19 +54,29 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
-    weight: 2
+    weight: 3
+    region: content
+  field_login_required:
+    type: boolean
+    label: hidden
+    settings:
+      format: boolean
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 4
     region: content
   field_teaser_text:
     type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    weight: 1
+    weight: 2
     region: content
   search_api_excerpt:
     settings: {  }
     third_party_settings: {  }
-    weight: 0
+    weight: 1
     region: content
 hidden:
   field_address: true
@@ -76,7 +86,6 @@ hidden:
   field_first_name: true
   field_honorific_prefix: true
   field_last_name: true
-  field_login_required: true
   field_media: true
   field_metatags: true
   field_position: true