City-of-Helsinki · rpnykanen · Oct 23, 2024 · Oct 11, 2024 · Oct 11, 2024 · Oct 11, 2024
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -51,8 +51,8 @@ jobs:
 
  - name: Run PHPCS
  run: |
- vendor/bin/phpcs public/modules/custom/ --ignore="*.js,*.css" --extensions=php,module,install --standard=Drupal,DrupalPractice
- vendor/bin/phpcs public/themes/custom/ --ignore="*.js,*.css" --extensions=php,theme --standard=Drupal,DrupalPractice
+ vendor/bin/phpcs public/modules/custom/
+ vendor/bin/phpcs public/themes/custom/
 
  - name: Run phpstan
  run: vendor/bin/phpstan analyze

diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml
@@ -24,6 +24,12 @@ jobs:
  steps:
  - uses: actions/checkout@v4
 
+ - name: Check if required secrets are set
+ env:
+ AUTOMATIC_UPDATE_TOKEN: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}
+ if: env.AUTOMATIC_UPDATE_TOKEN == ''
+ run: exit 1
+
  - name: Download latest dump
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -77,6 +83,7 @@ jobs:
  uses: peter-evans/create-pull-request@v6
  with:
  commit-message: Update configuration
+ token: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }}
  title: Automatic update
  labels: auto-update
  body: |

diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/core.base_field_override.node.landing_page.promote.yml b/conf/cmi/core.base_field_override.node.landing_page.promote.yml
@@ -5,7 +5,7 @@ dependencies:
  config:
  - node.type.landing_page
 _core:
- default_config_hash: KZ4pDrGhkRiIo7Ee-E4HGZp7YPXKS_FLR0nLeUQ3P2U
+ default_config_hash: 0RFWx8vtIwLeQrOoawTp8idfhPTj_7aPejhw4Pp3xqc
 id: node.landing_page.promote
 field_name: promote
 entity_type: node

diff --git a/conf/cmi/core.base_field_override.node.landing_page.status.yml b/conf/cmi/core.base_field_override.node.landing_page.status.yml
@@ -5,7 +5,7 @@ dependencies:
  config:
  - node.type.landing_page
 _core:
- default_config_hash: ewmZbuO4KgD36Ka7QA-8tJ9jktJH-jQbTNMrkHfuQRc
+ default_config_hash: LhhVx2le9fx915rM-xf5RApryzfsAY8X_odQehIJq9U
 id: node.landing_page.status
 field_name: status
 entity_type: node

diff --git a/conf/cmi/core.base_field_override.node.page.promote.yml b/conf/cmi/core.base_field_override.node.page.promote.yml
@@ -5,7 +5,7 @@ dependencies:
  config:
  - node.type.page
 _core:
- default_config_hash: vdYkuvvyzCU3dFiOu7LULd-uZyENb_byNYidQVIZtXk
+ default_config_hash: Awr4_4hZMOAsXNK5ZxL4I1U5BCzGywFswcc9pteegIk
 id: node.page.promote
 field_name: promote
 entity_type: node

diff --git a/conf/cmi/core.base_field_override.node.page.status.yml b/conf/cmi/core.base_field_override.node.page.status.yml
@@ -5,7 +5,7 @@ dependencies:
  config:
  - node.type.page
 _core:
- default_config_hash: 0m4p2SiQag8S_hCuiUZt-3xis3qrOuBXCwKH51hF5lo
+ default_config_hash: sq-TgFSE-Ft53bktUufBtJVHiqZboy0IFAc5JH0iLJ4
 id: node.page.status
 field_name: status
 entity_type: node

diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml
@@ -18,7 +18,7 @@ dependencies:
  - publication_date
  - scheduler
 _core:
- default_config_hash: hhHaoVWPiqGGQ2qDbN-7sawAmvK_BCGWA2vwgIevwq4
+ default_config_hash: nz2kuZQ53sXaRjzi5GT0LPTskHJFGOgRZuY2XwpDYls
 id: node.landing_page.default
 targetEntityType: node
 bundle: landing_page

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: IrTthHmbnCZxuMpndzRlr9-t2RT3szU18RcM_bpnrz0
+ default_config_hash: 1c66UJvkqgUlwTKKPGactcR0FjaLLXJZq9ZHP_M24ao
 id: node.page.default
 targetEntityType: node
 bundle: page

diff --git a/conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml
@@ -0,0 +1,38 @@
+uuid: b5c5ed81-d651-4db2-8d72-a67e7b66390e
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.paragraph.curated_event_list.field_all_events_link
+ - field.field.paragraph.curated_event_list.field_events
+ - paragraphs.paragraphs_type.curated_event_list
+ module:
+ - link
+_core:
+ default_config_hash: xbLWsjGFnK8aSW5O_r3mVF5bAlCp8J6wP5mGihlXLfU
+id: paragraph.curated_event_list.default
+targetEntityType: paragraph
+bundle: curated_event_list
+mode: default
+content:
+ field_all_events_link:
+ type: link_default
+ weight: 1
+ region: content
+ settings:
+ placeholder_url: ''
+ placeholder_title: ''
+ third_party_settings: { }
+ field_events:
+ type: entity_reference_autocomplete
+ weight: 0
+ region: content
+ settings:
+ match_operator: CONTAINS
+ match_limit: 5
+ size: 60
+ placeholder: ''
+ third_party_settings: { }
+hidden:
+ created: true
+ status: true
diff --git a/conf/cmi/core.entity_view_display.linkedevents_event.linkedevents_event.default.yml b/conf/cmi/core.entity_view_display.linkedevents_event.linkedevents_event.default.yml
@@ -0,0 +1,75 @@
+uuid: 22363443-8bc6-4b97-980f-6bfb225edb1b
+langcode: en
+status: true
+dependencies:
+ config:
+ - responsive_image.styles.card_teaser
+ module:
+ - datetime
+ - external_entities
+ - imagecache_external
+ - linkit
+_core:
+ default_config_hash: HLUzZHxqtb77OIc2B344fWXiNo5fO78woa0r4KmRGcA
+id: linkedevents_event.linkedevents_event.default
+targetEntityType: linkedevents_event
+bundle: linkedevents_event
+mode: default
+content:
+ end_time:
+ type: datetime_default
+ label: hidden
+ settings:
+ timezone_override: ''
+ format_type: medium
+ third_party_settings: { }
+ weight: 3
+ region: content
+ external_link:
+ type: linkit
+ label: hidden
+ settings:
+ trim_length: 80
+ url_only: false
+ url_plain: false
+ rel: ''
+ target: ''
+ linkit_profile: default
+ third_party_settings: { }
+ weight: 4
+ region: content
+ langcode:
+ type: string_default
+ label: hidden
+ settings: { }
+ third_party_settings: { }
+ weight: 5
+ region: content
+ main_image:
+ type: imagecache_external_responsive_image
+ label: hidden
+ settings:
+ imagecache_external_link: ''
+ imagecache_external_responsive_style: card_teaser
+ third_party_settings: { }
+ weight: 1
+ region: content
+ start_time:
+ type: datetime_default
+ label: hidden
+ settings:
+ timezone_override: ''
+ format_type: medium
+ third_party_settings: { }
+ weight: 2
+ region: content
+ title:
+ type: string
+ label: hidden
+ settings:
+ link_to_entity: false
+ third_party_settings: { }
+ weight: 0
+ region: content
+hidden:
+ search_api_excerpt: true
diff --git a/conf/cmi/core.entity_view_display.node.landing_page.default.yml b/conf/cmi/core.entity_view_display.node.landing_page.default.yml
@@ -14,7 +14,7 @@ dependencies:
  - metatag
  - user
 _core:
- default_config_hash: k0yB8d9jdIQ1SPK3C2TVyKEfwT05muqbE9tTkdV9fdQ
+ default_config_hash: '-3nrGpFj2UjEtxeOaUkHAayjdX0IK1zP1joIg9Da5lg'
 id: node.landing_page.default
 targetEntityType: node
 bundle: landing_page

diff --git a/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml b/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml
@@ -13,7 +13,7 @@ dependencies:
  module:
  - user
 _core:
- default_config_hash: '-w2hz1ajYKPav1NspjgUWRkxu9iE-8eHNZ1Ix1LKx_M'
+ default_config_hash: r_BQI2tPEU16do-YUzrDByQnVy_8d8bJr91mdehPlwE
 id: node.landing_page.teaser
 targetEntityType: node
 bundle: landing_page

diff --git a/conf/cmi/core.entity_view_display.node.page.default.yml b/conf/cmi/core.entity_view_display.node.page.default.yml
@@ -18,7 +18,7 @@ dependencies:
  - metatag
  - user
 _core:
- default_config_hash: piTzY36HSFy5WyKCdZ6BvAOj3JzxAy5Jt6J1KyU4h64
+ default_config_hash: F-u8s9R9tXTY7ZzyOpQcQ6abxM8QlR2Asv_-C3fo3Mc
 id: node.page.default
 targetEntityType: node
 bundle: page

diff --git a/conf/cmi/core.entity_view_display.node.page.teaser.yml b/conf/cmi/core.entity_view_display.node.page.teaser.yml
@@ -16,7 +16,7 @@ dependencies:
  module:
  - user
 _core:
- default_config_hash: cNX3bx6qnz2khBmsfeNeR-4bUFPswL2Eb0w6tRAUzvc
+ default_config_hash: IHO2JHvcAGkOIDr7TbzmCXV80ajFCCbKs05r35GcfVc
 id: node.page.teaser
 targetEntityType: node
 bundle: page

diff --git a/conf/cmi/core.entity_view_display.paragraph.curated_event_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.curated_event_list.default.yml
@@ -0,0 +1,40 @@
+uuid: 313ec60d-d84a-4e82-9ae3-ee3221c0e631
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.paragraph.curated_event_list.field_all_events_link
+ - field.field.paragraph.curated_event_list.field_events
+ - paragraphs.paragraphs_type.curated_event_list
+ module:
+ - link
+_core:
+ default_config_hash: kSyBcsfddKV9vQJsToglwPaZvKFQSf3GDFPLqkzIfTQ
+id: paragraph.curated_event_list.default
+targetEntityType: paragraph
+bundle: curated_event_list
+mode: default
+content:
+ field_all_events_link:
+ type: link
+ label: hidden
+ settings:
+ trim_length: 80
+ url_only: false
+ url_plain: false
+ rel: ''
+ target: ''
+ third_party_settings: { }
+ weight: 1
+ region: content
+ field_events:
+ type: entity_reference_entity_view
+ label: hidden
+ settings:
+ view_mode: default
+ link: false
+ third_party_settings: { }
+ weight: 0
+ region: content
+hidden:
+ search_api_excerpt: true
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
@@ -72,6 +72,7 @@ module:
  helfi_paragraphs_columns: 0
  helfi_paragraphs_contact_card_listing: 0
  helfi_paragraphs_content_cards: 0
+ helfi_paragraphs_curated_event_list: 0
  helfi_paragraphs_hearings: 0
  helfi_paragraphs_hero: 0
  helfi_paragraphs_image: 0

diff --git a/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml b/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml
@@ -0,0 +1,38 @@
+uuid: 66fe8cbc-203c-40aa-ac7b-6e0e89470312
+langcode: en
+status: true
+dependencies: { }
+_core:
+ default_config_hash: Ll_0kw3O6gGsRvmdTi7l4K2pwhUrL0yQT4uPcttspmA
+id: linkedevents_event
+label: 'LinkedEvents: Event'
+label_plural: 'LinkedEvents: Events'
+description: 'Event entities from https://api.hel.fi/linkedevents.'
+generate_aliases: false
+read_only: true
+field_mapper_id: jsonpath
+field_mapper_config:
+ field_mappings:
+ id:
+ value: $.id
+ uuid:
+ value: $.id
+ title:
+ value: $.title
+ main_image:
+ uri: '$.images[0].url'
+ title: '$.images[0].alt_text'
+ start_time:
+ value: $.start_time
+ end_time:
+ value: $.end_time
+ external_link:
+ uri: $.external_link
+ title: $.clean_title
+storage_client_id: linkedevents_events
+storage_client_config: null
+persistent_cache_max_age: 0
+annotation_entity_type_id: null
+annotation_bundle_id: null
+annotation_field_name: null
+inherits_annotation_fields: false
diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml
@@ -9,6 +9,7 @@ dependencies:
  - paragraphs.paragraphs_type.chart
  - paragraphs.paragraphs_type.columns
  - paragraphs.paragraphs_type.content_cards
+ - paragraphs.paragraphs_type.curated_event_list
  - paragraphs.paragraphs_type.current
  - paragraphs.paragraphs_type.event_list
  - paragraphs.paragraphs_type.from_library
@@ -26,7 +27,7 @@ dependencies:
  module:
  - entity_reference_revisions
 _core:
- default_config_hash: zEXoDFJnyArUOiL2ZrtDuq4YDWKyn6ung9JndPk_Ntg
+ default_config_hash: hTXPpiRGSAr_S4UXdMrZbYum_JkD4y-qlfTvBS_M-X4
 id: node.landing_page.field_content
 field_name: field_content
 entity_type: node
@@ -45,6 +46,7 @@ settings:
  front_page_top_news: front_page_top_news
  front_page_latest_news: front_page_latest_news
  event_list: event_list
+ news_archive: news_archive
  list_of_links: list_of_links
  content_cards: content_cards
  banner: banner
@@ -58,7 +60,7 @@ settings:
  chart: chart
  target_group_links: target_group_links
  hearings: hearings
- news_archive: news_archive
+ curated_event_list: curated_event_list
  negate: 0
  target_bundles_drag_drop:
  banner:
@@ -73,6 +75,9 @@ settings:
  content_cards:
  weight: 1
  enabled: true
+ curated_event_list:
+ weight: 15
+ enabled: true
  current:
  weight: 15
  enabled: true

diff --git a/conf/cmi/field.field.node.landing_page.field_has_hero.yml b/conf/cmi/field.field.node.landing_page.field_has_hero.yml
@@ -6,7 +6,7 @@ dependencies:
  - field.storage.node.field_has_hero
  - node.type.landing_page
 _core:
- default_config_hash: 9YN8dmUhU-XhgxPRCb4x-ghOzqatFuntD6iIFhL9G3k
+ default_config_hash: D-QxXFQAE5RYftqDw7rRXhAGQ8Zi6KVyhqr7wDO9K4g
 id: node.landing_page.field_has_hero
 field_name: field_has_hero
 entity_type: node

diff --git a/conf/cmi/field.field.node.landing_page.field_hero.yml b/conf/cmi/field.field.node.landing_page.field_hero.yml
@@ -9,7 +9,7 @@ dependencies:
  module:
  - entity_reference_revisions
 _core:
- default_config_hash: wqQr5ULFXtP_T3sIZky7GLndZznJR6XMIzyIO-0lmiY
+ default_config_hash: KaTQhVTD7zi12oPJmsx4YCvrqYI4VKs6UzsUSHZMW_0
 id: node.landing_page.field_hero
 field_name: field_hero
 entity_type: node

diff --git a/conf/cmi/field.field.node.landing_page.field_liftup_image.yml b/conf/cmi/field.field.node.landing_page.field_liftup_image.yml
@@ -7,7 +7,7 @@ dependencies:
  - media.type.image
  - node.type.landing_page
 _core:
- default_config_hash: tjssmYxe5qbWn7P7--dg9YMnck83F4dImAQiwIz4eJs
+ default_config_hash: LmNZ-_b0A7CEHJsvBCOu0Bm5rL8wYMrWwy5BA_9LutI
 id: node.landing_page.field_liftup_image
 field_name: field_liftup_image
 entity_type: node