Skip to content

Commit

Permalink
Merge pull request #691 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Dev to main
  • Loading branch information
rpnykanen authored Oct 23, 2024
2 parents 0168263 + 80b8bd6 commit b7ec086
Show file tree
Hide file tree
Showing 74 changed files with 510 additions and 343 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/update-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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: |
Expand Down
180 changes: 90 additions & 90 deletions composer.lock

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.base_field_override.node.page.promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.base_field_override.node.page.status.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
- paragraphs.paragraphs_type.columns
- paragraphs.paragraphs_type.contact_card_listing
- paragraphs.paragraphs_type.content_cards
- paragraphs.paragraphs_type.content_liftup
- paragraphs.paragraphs_type.image
- paragraphs.paragraphs_type.liftup_with_image
- paragraphs.paragraphs_type.list_of_links
Expand Down Expand Up @@ -45,7 +44,6 @@ settings:
columns: columns
contact_card_listing: contact_card_listing
content_cards: content_cards
content_liftup: content_liftup
image: image
liftup_with_image: liftup_with_image
list_of_links: list_of_links
Expand All @@ -72,9 +70,6 @@ settings:
content_cards:
weight: 0
enabled: true
content_liftup:
weight: 0
enabled: true
image:
weight: 0
enabled: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_form_display.node.page.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_display.node.page.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_display.node.page.teaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module:
helfi_paragraphs_columns: 0
helfi_paragraphs_contact_card_listing: 0
helfi_paragraphs_content_cards: 0
helfi_paragraphs_content_liftup: 0
helfi_paragraphs_curated_event_list: 0
helfi_paragraphs_hearings: 0
helfi_paragraphs_hero: 0
helfi_paragraphs_image: 0
Expand Down
Loading

0 comments on commit b7ec086

Please sign in to comment.