City-of-Helsinki · khalima · Oct 11, 2024 · Oct 11, 2024
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
@@ -128,9 +128,9 @@ content:
  third_party_settings: { }
  simple_sitemap:
  weight: 10
- region: content
  settings: { }
  third_party_settings: { }
+ region: content
  status:
  type: boolean_checkbox
  weight: 12

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_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/easy_breadcrumb.settings.yml b/conf/cmi/easy_breadcrumb.settings.yml
@@ -30,7 +30,7 @@ capitalizator_forced_words_first_letter: false
 follow_redirects: false
 limit_segment_display: false
 segment_display_limit: null
+segment_display_minimum: 1
 truncator_mode: false
 truncator_length: 100
 truncator_dots: true
-segment_display_minimum: 1
diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml
@@ -24,7 +24,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

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

diff --git a/conf/cmi/field.field.node.landing_page.field_metatags.yml b/conf/cmi/field.field.node.landing_page.field_metatags.yml
@@ -8,7 +8,7 @@ dependencies:
  module:
  - metatag
 _core:
- default_config_hash: i5JpOyh9B9vJHXsqh-XHmZBoSaWMT3XTnBGCFLtDntw
+ default_config_hash: hekcnEJjTt7ESst-zfAY8MrteMhOFYz540rJOo4l0LI
 id: node.landing_page.field_metatags
 field_name: field_metatags
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml
@@ -23,7 +23,7 @@ dependencies:
  module:
  - entity_reference_revisions
 _core:
- default_config_hash: G8uqVofIIeSPJSEW4FPnQrwefO2xMZGnwlbcHrbpZ48
+ default_config_hash: 6ObVx71DtZm2Bwbo4phVPA-nauJ8lld2GdbvT9iFIcw
 id: node.page.field_content
 field_name: field_content
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_has_hero.yml b/conf/cmi/field.field.node.page.field_has_hero.yml
@@ -6,7 +6,7 @@ dependencies:
  - field.storage.node.field_has_hero
  - node.type.page
 _core:
- default_config_hash: ZaUX6z_hdafBR97yocI3uxs6NHlntDM1GTvyOzaqLec
+ default_config_hash: OQINdpOOSCX5l_5PfJelmtFDiHVESETGrWj7_LoTmk0
 id: node.page.field_has_hero
 field_name: field_has_hero
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_hero.yml b/conf/cmi/field.field.node.page.field_hero.yml
@@ -9,7 +9,7 @@ dependencies:
  module:
  - entity_reference_revisions
 _core:
- default_config_hash: _JO0VBpDGRU-ye4MgCyh72SJmF6G9ndACtwAfuQJZI8
+ default_config_hash: ABVg78DS3Nw5IjpLToJyHIKKneImCCeV37bGTSYQCPw
 id: node.page.field_hero
 field_name: field_hero
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_lead_in.yml b/conf/cmi/field.field.node.page.field_lead_in.yml
@@ -6,7 +6,7 @@ dependencies:
  - field.storage.node.field_lead_in
  - node.type.page
 _core:
- default_config_hash: tPwfvL9sS2_dI0nhmfCMypX6JXVe5rARuztaSQ5h6Z8
+ default_config_hash: WJ-GI4hxHLj-LOOeftyY2oUueL_Vf7aCagTbT3RTlkU
 id: node.page.field_lead_in
 field_name: field_lead_in
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_liftup_image.yml b/conf/cmi/field.field.node.page.field_liftup_image.yml
@@ -7,7 +7,7 @@ dependencies:
  - media.type.image
  - node.type.page
 _core:
- default_config_hash: HnNX7GzhZeJlJrJoD5s1zgpCSG-TT5PEgL9tSbc97Qg
+ default_config_hash: YVZuPe0HyzTmFUyhL571saa_4HZD7-iDMePASIRhqcs
 id: node.page.field_liftup_image
 field_name: field_liftup_image
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml
@@ -23,7 +23,7 @@ dependencies:
  module:
  - entity_reference_revisions
 _core:
- default_config_hash: AejXN443GE3b159k_6fsqDyZ_BHs68SU9wBMY24Ueog
+ default_config_hash: v3n3ZeAjQ22N3kPPeDCIlFFcOuTiJ9F1CB0Gf4HQ6ZI
 id: node.page.field_lower_content
 field_name: field_lower_content
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_metatags.yml b/conf/cmi/field.field.node.page.field_metatags.yml
@@ -8,7 +8,7 @@ dependencies:
  module:
  - metatag
 _core:
- default_config_hash: 66fePtAJZ1t0RO2WvkpN-gBiDaq55M4LM1FFDEQ6rvY
+ default_config_hash: umfCmBUM3Qvbgnbf2Mms9ptk9QqXkx-P2bw7BHUvc8g
 id: node.page.field_metatags
 field_name: field_metatags
 entity_type: node

diff --git a/conf/cmi/field.field.node.page.field_sidebar_content.yml b/conf/cmi/field.field.node.page.field_sidebar_content.yml
@@ -10,7 +10,7 @@ dependencies:
  module:
  - entity_reference_revisions
 _core:
- default_config_hash: 056k2o_OzWbDmv_9zA5BNb30RqLImUGCYN6nnYWjqoQ
+ default_config_hash: SQUCcarKdIUnT8p_fKf_Dca17YujYpyfd8H1m91BTK0
 id: node.page.field_sidebar_content
 field_name: field_sidebar_content
 entity_type: node

diff --git a/conf/cmi/language.content_settings.node.landing_page.yml b/conf/cmi/language.content_settings.node.landing_page.yml
@@ -10,7 +10,7 @@ third_party_settings:
  content_translation:
  enabled: true
 _core:
- default_config_hash: UrEWFwFHhJNNrHsT2CbI-8FK7KIgmDq0xV6ahjaavBM
+ default_config_hash: Jkn_hpGZxUb8bwd-7N-7pq9YU3Ttt4tLVGrEAPhxrRg
 id: node.landing_page
 target_entity_type_id: node
 target_bundle: landing_page

diff --git a/conf/cmi/language.content_settings.node.page.yml b/conf/cmi/language.content_settings.node.page.yml
@@ -10,7 +10,7 @@ third_party_settings:
  content_translation:
  enabled: true
 _core:
- default_config_hash: gmtmgLpPQOcKE9BA_eKfrCXtoWVO63kmcfythbJiz5Q
+ default_config_hash: NuKCYRhchzV5oFaVmTQHc64apY1USi-6PazrucpcR34
 id: node.page
 target_entity_type_id: node
 target_bundle: page

diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml
diff --git a/conf/cmi/menu_link_attributes.config.yml b/conf/cmi/menu_link_attributes.config.yml
@@ -4,10 +4,10 @@ attributes:
  icon:
  label: ''
  class:
- label: 'Link class(es)'
- description: 'CSS class for the link (&lt;a href&gt;). Separate multiple classes by space.'
+ label: ''
+ description: ''
  target:
- label: 'Link target'
+ label: ''
  description: ''
  options:
  _blank: 'New window (_blank)'

diff --git a/conf/cmi/metatag.metatag_defaults.global.yml b/conf/cmi/metatag.metatag_defaults.global.yml
@@ -14,3 +14,4 @@ tags:
  og_image: '[site:shareable-image]'
  twitter_cards_image: '[site:shareable-image]'
  og_site_name: '[site:page-title-suffix]'
+ twitter_cards_page_url: '[current-page:url]'
diff --git a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: { }
 _core:
- default_config_hash: KFDRmGwu9d-ua_6WM0B6f7Qz85hnDdZ0VulBDnvmg5Q
+ default_config_hash: IxbBxQpwTHAosiqZXzMlXTSiLA2-mZs2g4lZ48xwpkA
 id: node__landing_page
 label: 'Content: Landing page'
 tags:

diff --git a/conf/cmi/metatag.metatag_defaults.node__page.yml b/conf/cmi/metatag.metatag_defaults.node__page.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: { }
 _core:
- default_config_hash: Mqgf6_xfg7HLsBnW3BSP9e9EuHWJXsEMbt240DMt_5E
+ default_config_hash: FCzY3DYgTVYC6q7fgjEKTt3jTHOgRUhj1XmD2SE9O5I
 id: node__page
 label: 'Content: Page'
 tags: { }
diff --git a/conf/cmi/node.type.landing_page.yml b/conf/cmi/node.type.landing_page.yml
@@ -24,7 +24,7 @@ third_party_settings:
  unpublish_required: false
  unpublish_revision: false
 _core:
- default_config_hash: PfTlYxtl_LoeL3LJeT4Qwnzu5MZq6Rc7R5o3NLTInHU
+ default_config_hash: R1Ihw3WH8wwYHlx0C6VCEMhTDZHQ6NbZl56Dz0zMOAo
 name: 'Landing page'
 type: landing_page
 description: 'Content type for the front page of a section or theme. A landing page consists of highlight areas, content listings and links.'

diff --git a/conf/cmi/node.type.page.yml b/conf/cmi/node.type.page.yml
@@ -24,7 +24,7 @@ third_party_settings:
  unpublish_required: false
  unpublish_revision: false
 _core:
- default_config_hash: A1XVcWETFW22MWUdDTxkOE331kBoYUWPQILECfHoBfk
+ default_config_hash: TxNxs_Yq3TzOPE9lwS4hArqiWBve9F-de3Lm12Hbm9U
 name: 'Standard page'
 type: page
 description: 'Content type for standard web content.'

diff --git a/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml b/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml
@@ -5,7 +5,7 @@ dependencies:
  module:
  - node
 _core:
- default_config_hash: JC4p2qHXUeY-wiNBTGDl6RCdOEYxfeMrvQe7tVcJHZY
+ default_config_hash: OkUmSgW0vSciD4ZUN-lXM_UuXElx5msmlPZToa-3yss
 id: landing_page_content_pattern
 label: 'Landing page content pattern'
 type: 'canonical_entities:node'

diff --git a/conf/cmi/pathauto.pattern.page_content_pattern.yml b/conf/cmi/pathauto.pattern.page_content_pattern.yml
@@ -5,7 +5,7 @@ dependencies:
  module:
  - node
 _core:
- default_config_hash: YrMS_tpZzY4kqrmIPkRckaFUN3aKZEyHpgADFLI6rBg
+ default_config_hash: FbJxc16K3DO9eOHODpQQ-oQAmC98JJc0Lw__17AP-fY
 id: page_content_pattern
 label: 'Page content pattern'
 type: 'canonical_entities:node'

diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -385,6 +385,10 @@ function drupal_get_env(string|array $variables) : mixed {
  }
 }
 
+// Supported values: https://github.com/Seldaek/monolog/blob/main/doc/01-usage.md#log-levels.
+$default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug';
+$settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level;
+
 /**
  * Deployment identifier.
  *

diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
@@ -1,9 +1,9 @@
 ifeq ($(DRUPAL_CONF_EXISTS),yes)
- DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-uli
+ DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-unblock drush-uli
 else
- DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-uli
+ DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-unblock drush-uli
 endif
-DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-uli
+DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-unblock
 
 OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token')
 
@@ -46,3 +46,8 @@ drush-helfi-locale-import: ## Update translations from helfi platform config.
  $(call step,Import helfi platform config translations...)
  $(call drush,helfi:locale-import helfi_platform_config)
  $(call drush,cr)
+
+PHONY += drush-unblock
+drush-unblock: ## Get login link
+ $(call step,Unblocking helfi-admin...\n)
+ $(call drush,user:unblock --uid=1)