Merge pull request #420 from City-of-Helsinki/dev

Dev to main
City-of-Helsinki · Mar 14, 2024 · 0d97950 · 0d97950
2 parents c75de1d + 6e68465
commit 0d97950
Show file tree

Hide file tree

Showing 38 changed files with 474 additions and 487 deletions.
diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -3,6 +3,8 @@ on:
   repository_dispatch:
     types: [config_change]
 name: Update config
+env:
+  GH_TOKEN: ${{ github.token }}
 jobs:
   update-config:
     runs-on: ubuntu-latest
@@ -21,10 +23,7 @@ jobs:
           - 3306:3306
 
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
-
+      - uses: actions/checkout@v4
       - name: Download latest dump
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -41,16 +40,43 @@ jobs:
           # Update platform
           drush helfi:tools:update-platform
 
+      - name: Check module versions
+        id: module-status
+        run: |
+          MODE="delete"
+          drush helfi:tools:check-composer-versions $GITHUB_WORKSPACE/composer.lock --format=markdown_table >> $GITHUB_STEP_SUMMARY && EXIT_CODE=$? || EXIT_CODE=$?
+          if [ "$EXIT_CODE" -eq 3 ]; then
+            MODE="upsert"
+            echo "  " >> $GITHUB_STEP_SUMMARY
+            echo ":warning: Failed to install the latest version of the packages listed above" >> $GITHUB_STEP_SUMMARY
+            echo "  " >> $GITHUB_STEP_SUMMARY
+            echo "Please run \`composer why-not drupal/package_name package_version\` to see why." >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "MODE=$MODE" >> $GITHUB_OUTPUT
+          cat $GITHUB_STEP_SUMMARY > /tmp/pr-message.txt
+
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
-          committer: GitHub <noreply@github.com>
-          author: actions-bot <actions-bot@users.noreply.github.com>
           commit-message: Update configuration
           title: Automatic update
           labels: auto-update
           body: |
             - Updated active configuration.
             - Updated platform
-
           branch: update-configuration
+
+      - name: Attempt to find PR
+        env:
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+        id: find-pr
+        run: echo "number=$(gh pr list --base ${BRANCH_NAME} --head update-configuration --json number --jq '.[].number')" >> $GITHUB_OUTPUT
+
+      - name: Comment PR
+        uses: thollander/actions-comment-pull-request@v2
+        if: ${{ steps.find-pr.outputs.number != '' }}
+        with:
+          comment_tag: status
+          mode: ${{ steps.module-status.outputs.MODE }}
+          filePath: /tmp/pr-message.txt
+          pr_number: ${{ steps.find-pr.outputs.number }}
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.entity_form_display.node.page.default.yml b/conf/cmi/core.entity_form_display.node.page.default.yml
@@ -21,7 +21,7 @@ dependencies:
     - publication_date
     - scheduler
 _core:
-  default_config_hash: _RX52hwdyz48o4MBqyRPUVkop-Unt1rcPuPanpQ7ksk
+  default_config_hash: IrTthHmbnCZxuMpndzRlr9-t2RT3szU18RcM_bpnrz0
 id: node.page.default
 targetEntityType: node
 bundle: page
@@ -79,10 +79,12 @@ content:
         duplicate: '0'
     third_party_settings: {  }
   field_lead_in:
-    type: string_textarea
+    type: textarea_character_counter
     weight: 13
     region: content
     settings:
+      counter_step: 160
+      counter_total: 200
       rows: 3
       placeholder: ''
     third_party_settings: {  }
@@ -203,10 +205,12 @@ content:
       display_label: true
     third_party_settings: {  }
   title:
-    type: string_textfield
+    type: textfield_character_counter
     weight: 1
     region: content
     settings:
+      counter_step: 0
+      counter_total: 55
       size: 60
       placeholder: ''
     third_party_settings: {  }

diff --git a/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml
@@ -9,14 +9,15 @@ dependencies:
     - field.field.paragraph.event_list.field_event_list_title
     - field.field.paragraph.event_list.field_event_location
     - field.field.paragraph.event_list.field_event_time
+    - field.field.paragraph.event_list.field_filter_keywords
     - field.field.paragraph.event_list.field_free_events
     - field.field.paragraph.event_list.field_remote_events
     - paragraphs.paragraphs_type.event_list
   module:
     - link
     - text
 _core:
-  default_config_hash: bGb0ZQ38-NxHtZ1rrdqclYHeStlwA5q3ucy5Wpnb0ng
+  default_config_hash: 26rzwNcMiiF5Bucl9iUliZYoL4vZcdmdNkYBAr9DYOU
 id: paragraph.event_list.default
 targetEntityType: paragraph
 bundle: event_list
@@ -66,6 +67,16 @@ content:
     settings:
       display_label: true
     third_party_settings: {  }
+  field_filter_keywords:
+    type: entity_reference_autocomplete_tags
+    weight: 8
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
   field_free_events:
     type: boolean_checkbox
     weight: 7

diff --git a/conf/cmi/core.entity_form_display.paragraph.hero.default.yml b/conf/cmi/core.entity_form_display.paragraph.hero.default.yml
@@ -11,24 +11,29 @@ dependencies:
     - field.field.paragraph.hero.field_hero_title
     - paragraphs.paragraphs_type.hero
   module:
+    - allowed_formats
     - hdbt_admin_tools
     - media_library
-    - text
 _core:
-  default_config_hash: CvDiqRtujItZjhiR7KUf0a9dQrlgEcmuDDhJHmzUNOw
+  default_config_hash: 1GjBs_T3tKYlTF4jxU6lUtwC7YSCChaZ4Tmsrialewk
 id: paragraph.hero.default
 targetEntityType: paragraph
 bundle: hero
 mode: default
 content:
   field_hero_desc:
-    type: text_textarea
+    type: formatted_text_character_counter
     weight: 3
     region: content
     settings:
+      counter_step: 160
+      counter_total: 200
       rows: 5
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      allowed_formats:
+        hide_help: '0'
+        hide_guidelines: '0'
   field_hero_design:
     type: design_field_widget
     weight: 0
@@ -47,6 +52,8 @@ content:
     weight: 6
     region: content
     settings:
+      placeholder_url: ''
+      placeholder_title: ''
       linkit_profile: helfi
       linkit_auto_link_text: false
     third_party_settings: {  }
@@ -57,10 +64,12 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_hero_title:
-    type: string_textfield
+    type: textfield_character_counter
     weight: 2
     region: content
     settings:
+      counter_step: 0
+      counter_total: 55
       size: 60
       placeholder: ''
     third_party_settings: {  }

diff --git a/conf/cmi/core.entity_form_display.taxonomy_term.linked_events_keywords.default.yml b/conf/cmi/core.entity_form_display.taxonomy_term.linked_events_keywords.default.yml
@@ -0,0 +1,72 @@
+uuid: d3bdb49e-461c-4a0f-a88c-c34eb54f7101
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.taxonomy_term.linked_events_keywords.field_keyword_id
+    - taxonomy.vocabulary.linked_events_keywords
+  module:
+    - hdbt_admin_tools
+    - path
+    - readonly_field_widget
+_core:
+  default_config_hash: wrJ7qU6IE5H0AiZu6m8w7XCBXT-dqOntJPqFqR0iyU8
+id: taxonomy_term.linked_events_keywords.default
+targetEntityType: taxonomy_term
+bundle: linked_events_keywords
+mode: default
+content:
+  description:
+    type: formatted_text_character_counter
+    weight: 0
+    region: content
+    settings:
+      counter_step: 160
+      counter_total: 200
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+  field_keyword_id:
+    type: readonly_field_widget
+    weight: 101
+    region: content
+    settings:
+      label: above
+      formatter_type: null
+      formatter_settings: {  }
+      show_description: false
+    third_party_settings: {  }
+  langcode:
+    type: language_select
+    weight: 2
+    region: content
+    settings:
+      include_locked: true
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: -5
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  status:
+    type: boolean_checkbox
+    weight: 100
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
+  translation:
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden: {  }
diff --git a/conf/cmi/core.entity_view_display.media.image.hero.yml b/conf/cmi/core.entity_view_display.media.image.hero.yml
@@ -11,7 +11,7 @@ dependencies:
   module:
     - responsive_image
 _core:
-  default_config_hash: UX2CrJYBdnGTpSaqiYid65d46ihnZEmWEBJbdXJZQ7g
+  default_config_hash: 1TRAhLvz-37rbjca1TJiVCP65Gy_X5ppn2iiiTRvl-g
 id: media.image.hero
 targetEntityType: media
 bundle: image

diff --git a/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.event_list.default.yml
@@ -9,14 +9,15 @@ dependencies:
     - field.field.paragraph.event_list.field_event_list_title
     - field.field.paragraph.event_list.field_event_location
     - field.field.paragraph.event_list.field_event_time
+    - field.field.paragraph.event_list.field_filter_keywords
     - field.field.paragraph.event_list.field_free_events
     - field.field.paragraph.event_list.field_remote_events
     - paragraphs.paragraphs_type.event_list
   module:
     - options
     - text
 _core:
-  default_config_hash: dMZ_8jKpOaA7CkuxlB2baa1apQcQ_vFlXM04jq4bqQY
+  default_config_hash: klW1qrhnmScBqsz4kDhFjtI4wmrMjLZynRsx9475Egs
 id: paragraph.event_list.default
 targetEntityType: paragraph
 bundle: event_list
@@ -64,6 +65,14 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
+  field_filter_keywords:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 6
+    region: content
   field_free_events:
     type: boolean
     label: above

diff --git a/conf/cmi/core.entity_view_display.taxonomy_term.linked_events_keywords.default.yml b/conf/cmi/core.entity_view_display.taxonomy_term.linked_events_keywords.default.yml
@@ -0,0 +1,27 @@
+uuid: 19cd3ce0-e5a8-4db8-ab50-ae7bde5fa981
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.taxonomy_term.linked_events_keywords.field_keyword_id
+    - taxonomy.vocabulary.linked_events_keywords
+  module:
+    - text
+_core:
+  default_config_hash: fBcG1sEoN3MYNH4WUM9M_e2jo304Kha_sUVu26s05ig
+id: taxonomy_term.linked_events_keywords.default
+targetEntityType: taxonomy_term
+bundle: linked_events_keywords
+mode: default
+content:
+  description:
+    type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  field_keyword_id: true
+  langcode: true
+  search_api_excerpt: true
diff --git a/conf/cmi/core.entity_view_mode.media.hero.yml b/conf/cmi/core.entity_view_mode.media.hero.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - media
 _core:
-  default_config_hash: XHi0bUTi0UQU5CFI90xrtRS1tLLlwUSrMhNft4fY_XA
+  default_config_hash: zAj-eiOJoImMZ2MAmC2k7HFfOKvT0JA_aHDz6RaN2uQ
 id: media.hero
 label: Hero
 description: ''

diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml
@@ -56,7 +56,7 @@ better_support_for_screen_readers: false
 method: categories
 disabled_javascripts: ''
 automatic_cookies_removal: true
-allowed_cookies: "essential:AWSELBCORS\r\nessential:cookiehub\r\nessential:mtm_cookie_consent\r\nessential:JSESSIONID\r\nessential:COOKIE_SUPPORT\r\nessential:GUEST_LANGUAGE_ID\r\npreference:httpskartta.hel.fi.SWCulture\r\npreference:icareus-device\r\npreference:VISITOR_INFO1_LIVE\r\npreference:CONSENT\r\nstatistics:nmstat\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.141.89f6\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:rnsbid\r\nstatistics:rnsbid_ts\r\nstatistics:rns_reaction_*\r\nstatistics:YSC\r\nchat:_genesys.widgets.*\r\nchat:leijuke.*"
+allowed_cookies: "helfi_accordions_open\r\nessential:AWSELBCORS\r\nessential:cookiehub\r\nessential:mtm_cookie_consent\r\nessential:JSESSIONID\r\nessential:COOKIE_SUPPORT\r\nessential:GUEST_LANGUAGE_ID\r\npreference:httpskartta.hel.fi.SWCulture\r\npreference:icareus-device\r\npreference:VISITOR_INFO1_LIVE\r\npreference:CONSENT\r\nstatistics:nmstat\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.141.89f6\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:_pk_id.*\r\nstatistics:_pk_ses.*\r\nstatistics:rnsbid\r\nstatistics:rnsbid_ts\r\nstatistics:rns_reaction_*\r\nstatistics:YSC\r\nchat:_genesys.widgets.*\r\nchat:leijuke.*"
 consent_storage_method: do_not_store
 withdraw_message:
   value: '<h2>Hel.fi uses cookies</h2><p>You have given your consent for us to set cookies.</p>'

diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml
@@ -40,21 +40,21 @@ settings:
   handler_settings:
     target_bundles:
       text: text
-      columns: columns
-      image: image
       accordion: accordion
+      banner: banner
+      image: image
       list_of_links: list_of_links
-      contact_card_listing: contact_card_listing
       content_cards: content_cards
-      content_liftup: content_liftup
-      banner: banner
-      event_list: event_list
-      news_list: news_list
-      from_library: from_library
+      columns: columns
       phasing: phasing
-      chart: chart
-      remote_video: remote_video
+      from_library: from_library
       map: map
+      remote_video: remote_video
+      chart: chart
+      event_list: event_list
+      contact_card_listing: contact_card_listing
+      news_list: news_list
+      content_liftup: content_liftup
     negate: 0
     target_bundles_drag_drop:
       accordion: