Merge pull request #793 from UN-OCHA/berliner/HPC-9191

HPC-9191: Fix issues with article migrations as a result of image crop properties on the node objects, add short_title field to articles, remove deprecated fields from documents
UN-OCHA · Nov 10, 2023 · 4aff40b · 4aff40b
2 parents f05fb51 + 1aad24c
commit 4aff40b
Show file tree

Hide file tree

Showing 31 changed files with 268 additions and 215 deletions.
diff --git a/config/core.entity_form_display.node.article.default.yml b/config/core.entity_form_display.node.article.default.yml
@@ -10,6 +10,7 @@ dependencies:
     - field.field.node.article.field_image
     - field.field.node.article.field_inherit_section_image
     - field.field.node.article.field_remote_article
+    - field.field.node.article.field_short_title
     - field.field.node.article.field_summary
     - field.field.node.article.field_tags
     - field.field.node.article.layout_builder__layout
@@ -32,7 +33,7 @@ third_party_settings:
       label: Tabs
       region: content
       parent_name: ''
-      weight: 2
+      weight: 3
       format_type: tabs
       format_settings:
         classes: ''
@@ -99,7 +100,7 @@ mode: default
 content:
   created:
     type: datetime_timestamp
-    weight: 4
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -159,6 +160,14 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  field_short_title:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   field_summary:
     type: text_textarea
     weight: 13
@@ -184,34 +193,34 @@ content:
     third_party_settings: {  }
   langcode:
     type: language_select
-    weight: 1
+    weight: 2
     region: content
     settings:
       include_locked: true
     third_party_settings: {  }
   path:
     type: path
-    weight: 8
+    weight: 9
     region: content
     settings: {  }
     third_party_settings: {  }
   promote:
     type: boolean_checkbox
-    weight: 6
+    weight: 7
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 9
+    weight: 10
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
-    weight: 7
+    weight: 8
     region: content
     settings:
       display_label: true
@@ -225,13 +234,13 @@ content:
       placeholder: ''
     third_party_settings: {  }
   translation:
-    weight: 5
+    weight: 6
     region: content
     settings: {  }
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
-    weight: 3
+    weight: 4
     region: content
     settings:
       match_operator: CONTAINS
@@ -240,7 +249,7 @@ content:
       placeholder: ''
     third_party_settings: {  }
   url_redirects:
-    weight: 50
+    weight: 11
     region: content
     settings: {  }
     third_party_settings: {  }

diff --git a/config/core.entity_form_display.node.document.default.yml b/config/core.entity_form_display.node.document.default.yml
@@ -6,14 +6,12 @@ dependencies:
     - field.field.node.document.field_base_objects
     - field.field.node.document.field_crop_hero_image
     - field.field.node.document.field_display_hero_image
-    - field.field.node.document.field_entity_reference
     - field.field.node.document.field_image
     - field.field.node.document.field_inherit_section_image
     - field.field.node.document.field_remote_document
     - field.field.node.document.field_short_title
     - field.field.node.document.field_summary
     - field.field.node.document.field_tags
-    - field.field.node.document.field_team
     - field.field.node.document.layout_builder__layout
     - image.style.thumbnail
     - node.type.document
@@ -46,6 +44,7 @@ third_party_settings:
       children:
         - field_display_hero_image
         - field_crop_hero_image
+        - image_crop
         - field_inherit_section_image
       label: Display
       region: content
@@ -140,7 +139,7 @@ content:
     third_party_settings: {  }
   field_inherit_section_image:
     type: boolean_checkbox
-    weight: 17
+    weight: 18
     region: content
     settings:
       display_label: true
@@ -177,6 +176,11 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  image_crop:
+    weight: 17
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   langcode:
     type: language_select
     weight: 2
@@ -240,6 +244,4 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
-  field_entity_reference: true
-  field_team: true
   layout_builder__layout: true
diff --git a/config/core.entity_view_display.node.article.card.yml b/config/core.entity_view_display.node.article.card.yml
@@ -11,6 +11,7 @@ dependencies:
     - field.field.node.article.field_image
     - field.field.node.article.field_inherit_section_image
     - field.field.node.article.field_remote_article
+    - field.field.node.article.field_short_title
     - field.field.node.article.field_summary
     - field.field.node.article.field_tags
     - field.field.node.article.layout_builder__layout
@@ -93,7 +94,9 @@ hidden:
   field_display_hero_image: true
   field_inherit_section_image: true
   field_remote_article: true
+  field_short_title: true
   field_summary: true
   langcode: true
   layout_builder__layout: true
   links: true
+  search_api_excerpt: true
diff --git a/config/core.entity_view_display.node.article.card_summary.yml b/config/core.entity_view_display.node.article.card_summary.yml
@@ -11,6 +11,7 @@ dependencies:
     - field.field.node.article.field_image
     - field.field.node.article.field_inherit_section_image
     - field.field.node.article.field_remote_article
+    - field.field.node.article.field_short_title
     - field.field.node.article.field_summary
     - field.field.node.article.field_tags
     - field.field.node.article.layout_builder__layout
@@ -107,6 +108,7 @@ hidden:
   field_display_hero_image: true
   field_inherit_section_image: true
   field_remote_article: true
+  field_short_title: true
   field_tags: true
   langcode: true
   layout_builder__layout: true

diff --git a/config/core.entity_view_display.node.article.default.yml b/config/core.entity_view_display.node.article.default.yml
@@ -10,6 +10,7 @@ dependencies:
     - field.field.node.article.field_image
     - field.field.node.article.field_inherit_section_image
     - field.field.node.article.field_remote_article
+    - field.field.node.article.field_short_title
     - field.field.node.article.field_summary
     - field.field.node.article.field_tags
     - field.field.node.article.layout_builder__layout
@@ -33,7 +34,23 @@ third_party_settings:
         layout_settings:
           label: Content
           context_mapping: {  }
-        components: {  }
+        components:
+          8f0e42b8-302c-435f-877f-0b65259f3ef5:
+            uuid: 8f0e42b8-302c-435f-877f-0b65259f3ef5
+            region: content
+            configuration:
+              id: 'field_block:node:article:field_short_title'
+              label_display: '0'
+              context_mapping:
+                entity: layout_builder.entity
+              formatter:
+                type: string
+                label: above
+                settings:
+                  link_to_entity: false
+                third_party_settings: {  }
+            weight: 0
+            additional: {  }
         third_party_settings: {  }
   layout_builder_restrictions:
     allowed_block_categories:
@@ -158,6 +175,14 @@ content:
     third_party_settings: {  }
     weight: 1
     region: content
+  field_short_title:
+    type: string
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 108
+    region: content
   field_summary:
     type: text_default
     label: above

diff --git a/config/core.entity_view_display.node.article.grid.yml b/config/core.entity_view_display.node.article.grid.yml
@@ -11,6 +11,7 @@ dependencies:
     - field.field.node.article.field_image
     - field.field.node.article.field_inherit_section_image
     - field.field.node.article.field_remote_article
+    - field.field.node.article.field_short_title
     - field.field.node.article.field_summary
     - field.field.node.article.field_tags
     - field.field.node.article.layout_builder__layout
@@ -108,6 +109,7 @@ hidden:
   field_display_hero_image: true
   field_inherit_section_image: true
   field_remote_article: true
+  field_short_title: true
   field_summary: true
   langcode: true
   layout_builder__layout: true

diff --git a/config/core.entity_view_display.node.article.search_result.yml b/config/core.entity_view_display.node.article.search_result.yml
@@ -11,6 +11,7 @@ dependencies:
     - field.field.node.article.field_image
     - field.field.node.article.field_inherit_section_image
     - field.field.node.article.field_remote_article
+    - field.field.node.article.field_short_title
     - field.field.node.article.field_summary
     - field.field.node.article.field_tags
     - field.field.node.article.layout_builder__layout
@@ -120,6 +121,7 @@ hidden:
   field_display_hero_image: true
   field_inherit_section_image: true
   field_remote_article: true
+  field_short_title: true
   langcode: true
   layout_builder__layout: true
   links: true

diff --git a/config/core.entity_view_display.node.article.teaser.yml b/config/core.entity_view_display.node.article.teaser.yml
@@ -11,6 +11,7 @@ dependencies:
     - field.field.node.article.field_image
     - field.field.node.article.field_inherit_section_image
     - field.field.node.article.field_remote_article
+    - field.field.node.article.field_short_title
     - field.field.node.article.field_summary
     - field.field.node.article.field_tags
     - field.field.node.article.layout_builder__layout
@@ -50,6 +51,7 @@ hidden:
   field_display_hero_image: true
   field_inherit_section_image: true
   field_remote_article: true
+  field_short_title: true
   field_summary: true
   langcode: true
   layout_builder__layout: true

diff --git a/config/core.entity_view_display.node.document.default.yml b/config/core.entity_view_display.node.document.default.yml
@@ -6,14 +6,12 @@ dependencies:
     - field.field.node.document.field_base_objects
     - field.field.node.document.field_crop_hero_image
     - field.field.node.document.field_display_hero_image
-    - field.field.node.document.field_entity_reference
     - field.field.node.document.field_image
     - field.field.node.document.field_inherit_section_image
     - field.field.node.document.field_remote_document
     - field.field.node.document.field_short_title
     - field.field.node.document.field_summary
     - field.field.node.document.field_tags
-    - field.field.node.document.field_team
     - field.field.node.document.layout_builder__layout
     - node.type.document
   module:
@@ -123,14 +121,6 @@ content:
     third_party_settings: {  }
     weight: 109
     region: content
-  field_entity_reference:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 112
-    region: content
   field_image:
     type: image
     label: above
@@ -172,14 +162,6 @@ content:
     third_party_settings: {  }
     weight: 107
     region: content
-  field_team:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 113
-    region: content
   links:
     settings: {  }
     third_party_settings: {  }

diff --git a/config/core.entity_view_display.node.document.search_result.yml b/config/core.entity_view_display.node.document.search_result.yml
@@ -7,14 +7,12 @@ dependencies:
     - field.field.node.document.field_base_objects
     - field.field.node.document.field_crop_hero_image
     - field.field.node.document.field_display_hero_image
-    - field.field.node.document.field_entity_reference
     - field.field.node.document.field_image
     - field.field.node.document.field_inherit_section_image
     - field.field.node.document.field_remote_document
     - field.field.node.document.field_short_title
     - field.field.node.document.field_summary
     - field.field.node.document.field_tags
-    - field.field.node.document.field_team
     - field.field.node.document.layout_builder__layout
     - node.type.document
     - responsive_image.styles.card_hero
@@ -108,11 +106,9 @@ hidden:
   field_base_objects: true
   field_crop_hero_image: true
   field_display_hero_image: true
-  field_entity_reference: true
   field_inherit_section_image: true
   field_remote_document: true
   field_short_title: true
-  field_team: true
   langcode: true
   layout_builder__layout: true
   links: true

diff --git a/config/core.entity_view_display.node.document.teaser.yml b/config/core.entity_view_display.node.document.teaser.yml
@@ -7,14 +7,12 @@ dependencies:
     - field.field.node.document.field_base_objects
     - field.field.node.document.field_crop_hero_image
     - field.field.node.document.field_display_hero_image
-    - field.field.node.document.field_entity_reference
     - field.field.node.document.field_image
     - field.field.node.document.field_inherit_section_image
     - field.field.node.document.field_remote_document
     - field.field.node.document.field_short_title
     - field.field.node.document.field_summary
     - field.field.node.document.field_tags
-    - field.field.node.document.field_team
     - field.field.node.document.layout_builder__layout
     - node.type.document
   module:
@@ -33,13 +31,12 @@ hidden:
   field_base_objects: true
   field_crop_hero_image: true
   field_display_hero_image: true
-  field_entity_reference: true
   field_image: true
   field_inherit_section_image: true
   field_remote_document: true
   field_short_title: true
   field_summary: true
   field_tags: true
-  field_team: true
   langcode: true
   layout_builder__layout: true
+  search_api_excerpt: true
diff --git a/config/core.entity_view_display.node.section.teaser.yml b/config/core.entity_view_display.node.section.teaser.yml
@@ -48,4 +48,5 @@ hidden:
   field_year: true
   langcode: true
   layout_builder__layout: true
+  search_api_excerpt: true
   section_menu: true