Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev to main #309

Merged
merged 24 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
128c4dd
UHF-9546: New test and staging addresses
tuutti Feb 13, 2024
52b36f4
UHF-9546: Removed unnecessary settings
tuutti Feb 13, 2024
a50ada2
UHF-9497: Removed custom icons for hdbt subtheme as all usable icons …
khalima Feb 20, 2024
ecf230c
UHF-9718: Added a tool to scan out-of-date HELfi packages
tuutti Mar 4, 2024
666fed5
Merge pull request #308 from City-of-Helsinki/UHF-9718
teroelonen Mar 4, 2024
a408ea3
Merge pull request #295 from City-of-Helsinki/UHF-9546
tuutti Mar 5, 2024
443db6c
Update configuration
hel-platta-automation Mar 6, 2024
009e898
UHF-9497: Updated caniuse
khalima Mar 6, 2024
0f62af2
Merge pull request #299 from City-of-Helsinki/UHF-9497
khalima Mar 6, 2024
ffc4a15
Merge pull request #307 from City-of-Helsinki/update-configuration
khalima Mar 6, 2024
7fd33ac
Update configuration
hel-platta-automation Mar 6, 2024
95fe534
Merge pull request #310 from City-of-Helsinki/update-configuration
khalima Mar 6, 2024
24b63fc
Update configuration
hel-platta-automation Mar 6, 2024
7034f91
Merge pull request #311 from City-of-Helsinki/update-configuration
khalima Mar 7, 2024
6c9cda8
Update configuration
hel-platta-automation Mar 11, 2024
fd1779e
Merge pull request #312 from City-of-Helsinki/update-configuration
teroelonen Mar 11, 2024
cc510f4
Update configuration
hel-platta-automation Mar 11, 2024
bb91a54
Merge pull request #313 from City-of-Helsinki/update-configuration
teroelonen Mar 11, 2024
680e887
Update configuration
hel-platta-automation Mar 11, 2024
eb2542d
Merge pull request #314 from City-of-Helsinki/update-configuration
teroelonen Mar 11, 2024
7988ad6
Update configuration
hel-platta-automation Mar 11, 2024
b9d0542
Merge pull request #315 from City-of-Helsinki/update-configuration
teroelonen Mar 12, 2024
4064ce9
Update configuration
hel-platta-automation Mar 12, 2024
bc047d1
Merge pull request #316 from City-of-Helsinki/update-configuration
teroelonen Mar 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 34 additions & 8 deletions .github/workflows/update-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand All @@ -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 }}
281 changes: 147 additions & 134 deletions composer.lock

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions 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: _RX52hwdyz48o4MBqyRPUVkop-Unt1rcPuPanpQ7ksk
default_config_hash: IrTthHmbnCZxuMpndzRlr9-t2RT3szU18RcM_bpnrz0
id: node.page.default
targetEntityType: node
bundle: page
Expand Down Expand Up @@ -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: { }
Expand Down Expand Up @@ -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: { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
19 changes: 14 additions & 5 deletions conf/cmi/core.entity_form_display.paragraph.hero.default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: { }
Expand All @@ -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: { }
Expand Down
Original file line number Diff line number Diff line change
@@ -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: { }
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_display.media.image.hero.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -86,3 +95,4 @@ content:
region: content
hidden:
field_api_url: true
search_api_excerpt: true
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- telephone
- text
_core:
default_config_hash: i0i5Sy5UJYyKJqoc7NKFbAMaMlXpC53GoO7Z3mahaBE
default_config_hash: NC4qX-7naY7U9PAcLK80wAYby0wkk8T8ZuqKK2_fRd0
id: tpr_service_channel.tpr_service_channel.default
targetEntityType: tpr_service_channel
bundle: tpr_service_channel
Expand Down Expand Up @@ -106,6 +106,13 @@ content:
third_party_settings: { }
weight: 22
region: content
information:
type: text_default
label: hidden
settings: { }
third_party_settings: { }
weight: 4
region: content
langcode:
type: language
label: hidden
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/core.entity_view_mode.media.hero.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ''
Expand Down
2 changes: 1 addition & 1 deletion conf/cmi/eu_cookie_compliance.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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>'
Expand Down
Loading
Loading