Skip to content

Commit

Permalink
Release 2024.16 (#1570)
Browse files Browse the repository at this point in the history
* UHF-10354: new cron entrypoint (#1506)

* UHF-10354: Remove base.sh

* UHF-10354: Remove migrate-hearings.sh

* UHF-10343: Updating the liikunta_suunnistuskartta_avustus forms texts (#1513)

* UHF-10343: Update liikunta_suunnistuskartta_avustus forms texts to new version

* UHF-10343: Fix issue with application search where the search button and the clear the search button have no spacing in between

* UHF-10343: Fix issue with unneccessary wrapper around the application search form styles

* UHF-10248: Run tests against automatic updates (#1516)

* UHF-10131: sentry (#1515)

* UHF-10131: Repurpose grants_logger module for sentry logging

* UHF-10131: Fix typo

* UHF-10131: Code deduplication

* UHF-10131: Capture exceptions

* UHF-10131: Remove comment

* feat: UHF-XXXX: Fix failing tests by fixing dependency-related errors. (#1517)

* Refactor events to custom module to get installation to succeed
* Make some services use lazyloading with events service.
* Add update hook & make sure drush deploy is run 1st.
* PHPCS
* Try to clear caches after importing DB to no avail.

* fix: Disable pubsub (#1518)

* must be completely commented out (#1519)

* UHF-10276: Replace old dialog.js implementation from forms (#1511)

* UHF-10276: Replace the dialog.js functionality with custom dialog

* UHF-10276: Fix translations, style the close button on the dialog

* UHF-10276: Add focus trap for the dialog

* UHF-10276: Refactor dialog and survey styles together

* UHF-10276: Add comment about survey similarities

* UHF-10276: Refactor dialog to a separate file so it can be used by other grants modules, refactored dialog.js away from grants_profile, add translations and remove old dialog.js

---------

Co-authored-by: Janne Suominen <[email protected]>

* Removed article permissions (#1522)

* Automatic update (#1520)

* Update configuration

* Revert unwanted changes from configuration

* Revert unwanted changes from configuration

* Update .gitignore

* Removed article permissions

---------

Co-authored-by: Tero Elonen <[email protected]>
Co-authored-by: Janne Suominen <[email protected]>
Co-authored-by: tuutti <[email protected]>

* UHF-10276: Fix translations on webform.form.unsaved.js (#1525)

* UHF-10276: Replace the dialog.js functionality with custom dialog

* UHF-10276: Fix translations, style the close button on the dialog

* UHF-10276: Add focus trap for the dialog

* UHF-10276: Refactor dialog and survey styles together

* UHF-10276: Add comment about survey similarities

* UHF-10276: Refactor dialog to a separate file so it can be used by other grants modules, refactored dialog.js away from grants_profile, add translations and remove old dialog.js

* UHF-10276: Manually trigger translations for the webform.form.unsaved javascript file

* Update configuration (#1523)

* fix: [Snyk] Upgrade @playwright/test from 1.41.2 to 1.48.0 (#1544)

* fix: upgrade @playwright/test from 1.41.2 to 1.48.0

Snyk has created this PR to upgrade @playwright/test from 1.41.2 to 1.48.0.

See this package in npm:
@playwright/test

See this project in Snyk:
https://app.snyk.io/org/city-of-helsinki/project/aed93529-486e-499e-9b12-5815057dc0ec?utm_source=github&utm_medium=referral&page=upgrade-pr

* Update e2e docker image

---------

Co-authored-by: snyk-bot <[email protected]>

* Version bump

* Update core to 10.3.10

---------

Co-authored-by: Santeri Hurnanen <[email protected]>
Co-authored-by: Tero Elonen <[email protected]>
Co-authored-by: tuutti <[email protected]>
Co-authored-by: rpnykanen <[email protected]>
Co-authored-by: hel-platta-automation <[email protected]>
Co-authored-by: Tero Elonen <[email protected]>
Co-authored-by: snyk-bot <[email protected]>
  • Loading branch information
8 people authored Nov 26, 2024
1 parent 05252cc commit 00cd8d0
Show file tree
Hide file tree
Showing 98 changed files with 1,550 additions and 1,956 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
#- name: Make sure configuration was exported in correct language (en or und)
# run: |
# OUTPUT=$(grep -oP '^langcode: \b(?!(?:en|und)\b)\w+' conf -R || true)
#

# if [ ! -z "$OUTPUT" ]; then
# echo "Found configuration that does not match the pattern 'langcode: (en|und)':" >> $GITHUB_STEP_SUMMARY
# echo "$OUTPUT" >> $GITHUB_STEP_SUMMARY
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
2 changes: 1 addition & 1 deletion .platform/schema
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9
10
2 changes: 1 addition & 1 deletion compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
e2e:
container_name: "${COMPOSE_PROJECT_NAME}-e2e"
image: mcr.microsoft.com/playwright:v1.41.0-jammy
image: mcr.microsoft.com/playwright:v1.48.0-jammy
ipc: host
network_mode: host
tty: true
Expand Down
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"homepage": "https://github.com/City-of-Helsinki/drupal-helfi-platform",
"minimum-stability": "dev",
"prefer-stable": true,
"version": "2024.14",
"version": "2024.16",
"require": {
"ext-json": "*",
"composer/installers": "^1.9",
Expand Down Expand Up @@ -56,7 +56,6 @@
"drupal/potx": "^1.0",
"drupal/purge_users": "^3.1",
"drupal/radioactivity": "^4.0",
"drupal/raven": "^5.0",
"drupal/redis": "^1.7",
"drupal/remove_http_headers": "^2.0.1",
"drupal/restui": "^1.21",
Expand Down
546 changes: 272 additions & 274 deletions composer.lock

Large diffs are not rendered by default.

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
@@ -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
7 changes: 5 additions & 2 deletions conf/cmi/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,13 @@ module:
grants_admin_applications: 0
grants_applicant_info: 0
grants_application_search: 0
grants_attachments: 0
grants_audit_log: 0
grants_budget_components: 0
grants_club_section: 0
grants_events: 0
grants_front_banner: 0
grants_industries: 0
grants_logger: 0
grants_mandate: 0
grants_members: 0
grants_metadata: 0
Expand Down Expand Up @@ -103,6 +104,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
Expand Down Expand Up @@ -217,9 +219,10 @@ module:
webform_translation_permissions: 0
webform_ui: 0
webform_views: 0
grants_handler: 1
grants_attachments: 1
menu_admin_per_menu: 1
pathauto: 1
grants_handler: 2
content_translation: 10
externalauth: 10
views: 10
Expand Down
Original file line number Diff line number Diff line change
@@ -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.'
read_only: true
generate_aliases: false
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
5 changes: 5 additions & 0 deletions conf/cmi/field.field.node.landing_page.field_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.event_list
- paragraphs.paragraphs_type.from_library
- paragraphs.paragraphs_type.front_banner
Expand Down Expand Up @@ -65,6 +66,7 @@ settings:
service_list_search: service_list_search
unit_search: unit_search
unit_contact_card: unit_contact_card
curated_event_list: curated_event_list
negate: 0
target_bundles_drag_drop:
banner:
Expand All @@ -79,6 +81,9 @@ settings:
content_cards:
weight: 1
enabled: true
curated_event_list:
weight: 15
enabled: true
event_list:
weight: 13
enabled: true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
uuid: b144b934-3c5a-4c5b-ae89-b477bfb8367d
langcode: en
status: true
dependencies:
config:
- field.storage.paragraph.field_all_events_link
- paragraphs.paragraphs_type.curated_event_list
module:
- link
_core:
default_config_hash: FfVydFQYnAcPJkSaTbBQoyzqe8k11WrSJ5tSxAt8b1k
id: paragraph.curated_event_list.field_all_events_link
field_name: field_all_events_link
entity_type: paragraph
bundle: curated_event_list
label: 'All events link'
description: "Add a link to the tapahtumat.hel.fi website. You may also filter the events in the event calendar as desired and copy the page's URL.\r\n<br><br>\r\nAlso provide a text for the link, eg. <i>View all events.</i>"
required: false
translatable: false
default_value:
-
attributes: { }
uri: 'https://tapahtumat.hel.fi'
title: 'View all events'
options: { }
default_value_callback: ''
settings:
title: 2
link_type: 16
field_type: link
28 changes: 28 additions & 0 deletions conf/cmi/field.field.paragraph.curated_event_list.field_events.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
uuid: 41acbd4d-63ba-4cb7-919c-d6435553d4a9
langcode: en
status: true
dependencies:
config:
- field.storage.paragraph.field_events
- paragraphs.paragraphs_type.curated_event_list
_core:
default_config_hash: XaOHQv-1E_t55GwYhhyvtA03_7mWbdEbmXA3YhGrHiA
id: paragraph.curated_event_list.field_events
field_name: field_events
entity_type: paragraph
bundle: curated_event_list
label: Events
description: "Pick events to display in the list. You may either search event by their name <i>or</i> enter their ID. \r\n <br><br>\r\nYou can find the ID of an event on tapahtumat.hel.fi site from the URL of the page. For example, in the url <a>https://tapahtumat.hel.fi/fi/events/helsinki:agiy4m4ida</a> the <b>helsinki:agiy4m4ida</b> part is the ID of the event.\r\n <br><br>\r\nThe page will display the top three events. You can arrange the events by dragging. Expired events will be automatically removed from the page."
required: false
translatable: false
default_value: { }
default_value_callback: ''
settings:
handler: 'default:linkedevents_event'
handler_settings:
target_bundles: null
sort:
field: _none
direction: ASC
auto_create: false
field_type: entity_reference
21 changes: 21 additions & 0 deletions conf/cmi/field.storage.paragraph.field_all_events_link.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
uuid: 1dd4d7e6-e3be-490e-9309-e9380e0c33b4
langcode: en
status: true
dependencies:
module:
- link
- paragraphs
_core:
default_config_hash: 7QiTeiuYd-9Za2xvC3WVShDfIhAcgIpMYzIV4PX2NLQ
id: paragraph.field_all_events_link
field_name: field_all_events_link
entity_type: paragraph
type: link
settings: { }
module: link
locked: false
cardinality: 1
translatable: true
indexes: { }
persist_with_no_fields: false
custom_storage: false
Loading

0 comments on commit 00cd8d0

Please sign in to comment.