Merge pull request #953 from danskernesdigitalebibliotek/merge-develo…

…p-into-release-brahma-13 Merge develop into release brahma 13
danskernesdigitalebibliotek · Apr 8, 2024 · 7c9a9ac · 7c9a9ac
2 parents 9822c82 + 0e06329
commit 7c9a9ac
Show file tree

Hide file tree

Showing 205 changed files with 22,054 additions and 7,481 deletions.
diff --git a/.github/workflows/lagoon.yml b/.github/workflows/lagoon.yml
@@ -32,7 +32,7 @@ jobs:
           echo ::set-output name=url::'https://varnish.pr-${{github.event.number}}.${{ env.LAGOON_PROJECT }}.${{ env.LAGOON_HOST }}/'
           echo ::set-output name=logs::'https://ui.lagoon.${{ env.LAGOON_HOST }}/projects/${{ env.LAGOON_PROJECT }}/${{ env.LAGOON_PROJECT }}-pr-${{github.event.number}}/deployments'
       - name: Start deployment
-        uses: bobheadxi/deployments@v1.4.0
+        uses: bobheadxi/deployments@v1.5.0
         id: deployment
         with:
           step: start
@@ -61,7 +61,7 @@ jobs:
           config: ${{ runner.temp }}/wait-on.config.json
       - name: Finish deployment
         if: always()
-        uses: bobheadxi/deployments@v1.4.0
+        uses: bobheadxi/deployments@v1.5.0
         with:
           step: finish
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -85,7 +85,7 @@ jobs:
         run: |
           echo ::set-output name=id::pr-${{github.event.number}}
       - name: Close environment
-        uses: bobheadxi/deployments@v1.4.0
+        uses: bobheadxi/deployments@v1.5.0
         with:
           step: deactivate-env
           token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.gitignore b/.gitignore
@@ -59,3 +59,6 @@ docker-compose.override.yml
 
 # Module upload folder
 /web/modules/local
+
+# Danish translations folder
+/config/sync/language/da
diff --git a/composer.json b/composer.json
@@ -82,6 +82,7 @@
         "drupal/address": "^1.0",
         "drupal/admin_toolbar": "^3.4",
         "drupal/administerusersbyrole": "^3.4",
+        "drupal/color_field": "^3.0",
         "drupal/config_ignore": "^2.4",
         "drupal/config_translation_po": "^1.0",
         "drupal/content_lock": "^2.3",
@@ -95,7 +96,9 @@
         "drupal/dynamic_entity_reference": "^3.1",
         "drupal/entity_clone_template": "^2.0",
         "drupal/enum_field": "^1.0",
+        "drupal/facets": "^2.0",
         "drupal/field_group": "^3.4",
+        "drupal/field_inheritance": "^2.0",
         "drupal/focal_point": "^2.0",
         "drupal/gin": "^3.0@RC",
         "drupal/gin_toolbar": "^1.0@RC",
@@ -267,9 +270,6 @@
             "drupal/entity_clone_template": {
                 "3424597: Fix error when creating entity of type without templates": "https://git.drupalcode.org/project/entity_clone_template/-/merge_requests/3.patch"
             },
-            "drupal/field_inheritance": {
-                "3330386: field_inheritance_form_alter should enforce module permissions": "https://git.drupalcode.org/project/field_inheritance/-/commit/bc3d26cdce8c09d5b6275fc126e35bc7e239c7d1.patch"
-            },
             "drupal/focal_point": {
                 "3162210: Preview link accidentally closes the media library": "https://www.drupal.org/files/issues/2020-10-11/preview_link_accidentally_closes_the_media_library-3162210-19.patch"
             },
@@ -308,6 +308,9 @@
             },
             "drupal/theme_permission": {
                 "3105637: Edit, install and uninstall permission": "https://www.drupal.org/files/issues/2024-02-01/theme-permission-edit-install-uninstall-3105637-7.patch"
+            },
+            "drupal/twig_tweak": {
+                "3428226: Clear menu cache when adding first item": "https://git.drupalcode.org/project/twig_tweak/-/merge_requests/47.patch"
             }
         }
     }

diff --git a/composer.lock b/composer.lock
diff --git a/config/sync/content_lock.settings.yml b/config/sync/content_lock.settings.yml
@@ -1,6 +1,6 @@
 _core:
   default_config_hash: 6Ka3T1c-CIjEUO1Q64NXKksLthkMhj53a6zy4RJBtkc
-verbose: 1
+verbose: 0
 types:
   crop: {  }
   file: {  }
@@ -40,7 +40,7 @@ form_op_lock:
     mode: 0
     values: {  }
   path_alias:
-    mode: null
+    mode: 0
     values: {  }
   eventseries:
     mode: 0

diff --git a/config/sync/core.entity_form_display.eventinstance.default.default.yml b/config/sync/core.entity_form_display.eventinstance.default.default.yml
@@ -7,7 +7,6 @@ dependencies:
     - field.field.eventinstance.default.field_categories
     - field.field.eventinstance.default.field_description
     - field.field.eventinstance.default.field_event_address
-    - field.field.eventinstance.default.field_event_description
     - field.field.eventinstance.default.field_event_image
     - field.field.eventinstance.default.field_event_link
     - field.field.eventinstance.default.field_event_paragraphs
@@ -254,4 +253,3 @@ content:
     third_party_settings: {  }
 hidden:
   body: true
-  field_event_description: true
diff --git a/config/sync/core.entity_form_display.eventseries.default.default.yml b/config/sync/core.entity_form_display.eventseries.default.default.yml
@@ -7,7 +7,6 @@ dependencies:
     - field.field.eventseries.default.field_categories
     - field.field.eventseries.default.field_description
     - field.field.eventseries.default.field_event_address
-    - field.field.eventseries.default.field_event_description
     - field.field.eventseries.default.field_event_image
     - field.field.eventseries.default.field_event_link
     - field.field.eventseries.default.field_event_paragraphs
@@ -321,5 +320,4 @@ content:
 hidden:
   body: true
   excluded_dates: true
-  field_event_description: true
   included_dates: true
diff --git a/config/sync/core.entity_form_display.node.page.default.yml b/config/sync/core.entity_form_display.node.page.default.yml
@@ -8,12 +8,37 @@ dependencies:
     - field.field.node.page.field_hero_title
     - field.field.node.page.field_paragraphs
     - field.field.node.page.field_subtitle
+    - field.field.node.page.field_teaser_image
+    - field.field.node.page.field_teaser_text
     - node.type.page
   module:
+    - field_group
+    - media_library
+    - media_library_edit
     - paragraphs
     - paragraphs_ee
     - paragraphs_features
+    - path
     - scheduler
+third_party_settings:
+  field_group:
+    group_teaser_card:
+      children:
+        - field_teaser_text
+        - field_teaser_image
+      label: 'Teaser card'
+      region: content
+      parent_name: ''
+      weight: 12
+      format_type: details_sidebar
+      format_settings:
+        classes: ''
+        show_empty_fields: true
+        id: ''
+        open: true
+        description: ''
+        required_fields: true
+        weight: 0
 id: node.page.default
 targetEntityType: node
 bundle: page
@@ -76,9 +101,26 @@ content:
       rows: 3
       placeholder: ''
     third_party_settings: {  }
+  field_teaser_image:
+    type: media_library_widget
+    weight: 10
+    region: content
+    settings:
+      media_types: {  }
+    third_party_settings:
+      media_library_edit:
+        show_edit: '1'
+  field_teaser_text:
+    type: string_textfield
+    weight: 9
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   path:
     type: path
-    weight: 30
+    weight: 13
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -110,7 +152,7 @@ content:
     third_party_settings: {  }
   unpublish_on:
     type: datetime_timestamp_no_default
-    weight: 9
+    weight: 10
     region: content
     settings: {  }
     third_party_settings: {  }