diff --git a/composer.lock b/composer.lock
index 20ea4ffe..3846d10c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4073,16 +4073,16 @@
},
{
"name": "drupal/hdbt",
- "version": "6.7.8",
+ "version": "6.7.11",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "9ad05cc9c80d0dc536132ae07625ae4375c51d3d"
+ "reference": "5f9902895d8690e0167af2b8df37e84798c1ab8b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9ad05cc9c80d0dc536132ae07625ae4375c51d3d",
- "reference": "9ad05cc9c80d0dc536132ae07625ae4375c51d3d",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5f9902895d8690e0167af2b8df37e84798c1ab8b",
+ "reference": "5f9902895d8690e0167af2b8df37e84798c1ab8b",
"shasum": ""
},
"require": {
@@ -4101,23 +4101,23 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.8",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.11",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2024-10-07T12:37:51+00:00"
+ "time": "2024-10-11T08:54:21+00:00"
},
{
"name": "drupal/hdbt_admin",
- "version": "3.2.3",
+ "version": "3.2.5",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git",
- "reference": "2d5454a08e66621f0e7ef5116066c1eb450cea33"
+ "reference": "f3284d00c7cb52126c727b744ccac5108195544c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/2d5454a08e66621f0e7ef5116066c1eb450cea33",
- "reference": "2d5454a08e66621f0e7ef5116066c1eb450cea33",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/f3284d00c7cb52126c727b744ccac5108195544c",
+ "reference": "f3284d00c7cb52126c727b744ccac5108195544c",
"shasum": ""
},
"require": {
@@ -4138,10 +4138,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.3",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.5",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues"
},
- "time": "2024-10-02T11:54:42+00:00"
+ "time": "2024-10-11T08:52:57+00:00"
},
{
"name": "drupal/health_check",
@@ -4241,16 +4241,16 @@
},
{
"name": "drupal/helfi_azure_fs",
- "version": "2.0.5",
+ "version": "2.0.7",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git",
- "reference": "955f8b742147cab0cf82370b6cc93a6901624261"
+ "reference": "f35b0a703e2da09374c4ca137dd6519274db552a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/955f8b742147cab0cf82370b6cc93a6901624261",
- "reference": "955f8b742147cab0cf82370b6cc93a6901624261",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/f35b0a703e2da09374c4ca137dd6519274db552a",
+ "reference": "f35b0a703e2da09374c4ca137dd6519274db552a",
"shasum": ""
},
"require": {
@@ -4272,6 +4272,9 @@
},
"twistor/flysystem-stream-wrapper": {
"PHP 8.2 support (https://www.drupal.org/project/flysystem/issues/3387094)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/ddb222622b92d1c2b7db975a84167a00579a1ad0/patches/3387094-add-context-property-to-stream-wrapper.patch"
+ },
+ "drupal/flysystem": {
+ "UHF-10544 D10.3 support (https://drupal.org/i/3457193)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/82f0dc93d14357011d12d219f5d1641da7ae6960/patches/3457193.patch"
}
}
},
@@ -4280,10 +4283,10 @@
],
"description": "Helfi - Azure FS",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.5",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.7",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues"
},
- "time": "2024-10-03T06:32:56+00:00"
+ "time": "2024-10-11T07:42:06+00:00"
},
{
"name": "drupal/helfi_drupal_tools",
@@ -4406,16 +4409,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "4.6.11",
+ "version": "4.6.14",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "46f83e38d3e63714779f3b040e040c9b4be406bb"
+ "reference": "a5706c1fff0690115510224dcdccf61ce2b6dadd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/46f83e38d3e63714779f3b040e040c9b4be406bb",
- "reference": "46f83e38d3e63714779f3b040e040c9b4be406bb",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a5706c1fff0690115510224dcdccf61ce2b6dadd",
+ "reference": "a5706c1fff0690115510224dcdccf61ce2b6dadd",
"shasum": ""
},
"require": {
@@ -4436,7 +4439,7 @@
"drupal/elasticsearch_connector": "^7.0@alpha",
"drupal/entity_browser": "^2.5",
"drupal/entity_usage": "^2.0@beta",
- "drupal/eu_cookie_compliance": "^1.24",
+ "drupal/eu_cookie_compliance": "1.24",
"drupal/external_entities": "^2.0@beta",
"drupal/field_group": "^3.1",
"drupal/focal_point": "^2.0",
@@ -4534,10 +4537,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.11",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.14",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2024-10-08T06:10:45+00:00"
+ "time": "2024-10-11T08:52:39+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -9626,16 +9629,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.0",
+ "version": "v5.3.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a"
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3abf7425cd284141dc5d8d14a9ee444de3345d1a",
- "reference": "3abf7425cd284141dc5d8d14a9ee444de3345d1a",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
"shasum": ""
},
"require": {
@@ -9678,9 +9681,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
},
- "time": "2024-09-29T13:56:26+00:00"
+ "time": "2024-10-08T18:51:32+00:00"
},
{
"name": "nodespark/des-connector",
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
index 6b077a32..647693c9 100644
--- 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
index 6daac50a..9f4c934c 100644
--- 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
index ab82995b..b4d03740 100644
--- 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
index 46f540ac..68fab5b9 100644
--- 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.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
index e25eea46..5386fac5 100644
--- a/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
+++ b/conf/cmi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml
@@ -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
@@ -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
@@ -72,9 +70,6 @@ settings:
content_cards:
weight: 0
enabled: true
- content_liftup:
- weight: 0
- enabled: true
image:
weight: 0
enabled: true
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
index 7948b74e..2b32c5c7 100644
--- 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
index 578e7126..003bac0a 100644
--- 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.content_liftup.default.yml b/conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml
deleted file mode 100644
index 6a95039c..00000000
--- a/conf/cmi/core.entity_form_display.paragraph.content_liftup.default.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 60f16f53-b150-4edb-84f0-2c76e14b1043
-langcode: en
-status: true
-dependencies:
- config:
- - field.field.paragraph.content_liftup.field_content_liftup_unit
- - paragraphs.paragraphs_type.content_liftup
-_core:
- default_config_hash: xULweJ9JMlJZPMLEKe6rT2QooMGsSyiqRMh9VCv95fM
-id: paragraph.content_liftup.default
-targetEntityType: paragraph
-bundle: content_liftup
-mode: default
-content:
- field_content_liftup_unit:
- type: entity_reference_autocomplete
- weight: 1
- region: content
- settings:
- match_operator: CONTAINS
- match_limit: 10
- size: 60
- placeholder: ''
- third_party_settings: { }
-hidden:
- created: true
- status: 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
index 2689e919..f710842c 100644
--- 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
index 4841d24e..41f71f3a 100644
--- 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
index a6f1de9a..e36da482 100644
--- 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
index e2bc8e32..4ba54efd 100644
--- 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.content_liftup.default.yml b/conf/cmi/core.entity_view_display.paragraph.content_liftup.default.yml
deleted file mode 100644
index bf9bc890..00000000
--- a/conf/cmi/core.entity_view_display.paragraph.content_liftup.default.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 92d2cb50-438e-4bb8-9abd-93f1b1da2545
-langcode: en
-status: true
-dependencies:
- config:
- - field.field.paragraph.content_liftup.field_content_liftup_unit
- - paragraphs.paragraphs_type.content_liftup
-_core:
- default_config_hash: dPsp5m4FRvYce8_hXZJSdT2m-WOFaFpX1hOQw-mrgGE
-id: paragraph.content_liftup.default
-targetEntityType: paragraph
-bundle: content_liftup
-mode: default
-content:
- field_content_liftup_unit:
- type: entity_reference_entity_view
- label: hidden
- settings:
- view_mode: wide_teaser
- link: false
- third_party_settings: { }
- weight: 2
- region: content
-hidden:
- search_api_excerpt: true
diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml
index 86c36c94..2eacc666 100644
--- a/conf/cmi/core.extension.yml
+++ b/conf/cmi/core.extension.yml
@@ -61,7 +61,6 @@ module:
helfi_paragraphs_columns: 0
helfi_paragraphs_contact_card_listing: 0
helfi_paragraphs_content_cards: 0
- helfi_paragraphs_content_liftup: 0
helfi_paragraphs_hearings: 0
helfi_paragraphs_hero: 0
helfi_paragraphs_image: 0
diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml
index 203442fd..f46fdf55 100644
--- a/conf/cmi/field.field.node.landing_page.field_content.yml
+++ b/conf/cmi/field.field.node.landing_page.field_content.yml
@@ -9,7 +9,6 @@ dependencies:
- paragraphs.paragraphs_type.chart
- paragraphs.paragraphs_type.columns
- paragraphs.paragraphs_type.content_cards
- - paragraphs.paragraphs_type.content_liftup
- paragraphs.paragraphs_type.event_list
- paragraphs.paragraphs_type.from_library
- paragraphs.paragraphs_type.hearings
@@ -28,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
@@ -58,7 +57,6 @@ settings:
event_list: event_list
news_list: news_list
hearings: hearings
- content_liftup: content_liftup
service_list: service_list
service_list_search: service_list_search
unit_search: unit_search
@@ -77,9 +75,6 @@ settings:
content_cards:
weight: 1
enabled: true
- content_liftup:
- weight: 11
- enabled: true
event_list:
weight: 13
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
index 6a9f7b41..68eebed6 100644
--- 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
index 48cd1101..1d425b65 100644
--- 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
index 95328f69..9a092f37 100644
--- 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
index 6734b3a5..000cc6f9 100644
--- 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
index 4415413f..c1b466e6 100644
--- a/conf/cmi/field.field.node.page.field_content.yml
+++ b/conf/cmi/field.field.node.page.field_content.yml
@@ -11,7 +11,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.event_list
- paragraphs.paragraphs_type.from_library
- paragraphs.paragraphs_type.image
@@ -27,7 +26,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
@@ -57,7 +56,6 @@ settings:
event_list: event_list
contact_card_listing: contact_card_listing
news_list: news_list
- content_liftup: content_liftup
service_list_search: service_list_search
unit_search: unit_search
unit_contact_card: unit_contact_card
@@ -81,9 +79,6 @@ settings:
content_cards:
weight: 5
enabled: true
- content_liftup:
- weight: 12
- enabled: true
event_list:
weight: 13
enabled: true
diff --git a/conf/cmi/field.field.node.page.field_has_hero.yml b/conf/cmi/field.field.node.page.field_has_hero.yml
index 293313b3..f9823959 100644
--- 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
index d72b2aa3..dab28173 100644
--- 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
index f1de056f..e0fb7721 100644
--- 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
index 03ea1afa..130d90dd 100644
--- 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
index e901ee95..ef3529a7 100644
--- a/conf/cmi/field.field.node.page.field_lower_content.yml
+++ b/conf/cmi/field.field.node.page.field_lower_content.yml
@@ -11,7 +11,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.event_list
- paragraphs.paragraphs_type.from_library
- paragraphs.paragraphs_type.image
@@ -27,7 +26,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
@@ -57,7 +56,6 @@ settings:
event_list: event_list
contact_card_listing: contact_card_listing
news_list: news_list
- content_liftup: content_liftup
service_list_search: service_list_search
unit_search: unit_search
unit_contact_card: unit_contact_card
@@ -81,9 +79,6 @@ settings:
content_cards:
weight: 1
enabled: true
- content_liftup:
- weight: 12
- enabled: true
event_list:
weight: 13
enabled: true
diff --git a/conf/cmi/field.field.node.page.field_metatags.yml b/conf/cmi/field.field.node.page.field_metatags.yml
index cbdd37d0..bf742d66 100644
--- 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
index 79b5a852..c36b2774 100644
--- 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/field.field.paragraph.content_liftup.field_content_liftup_unit.yml b/conf/cmi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml
deleted file mode 100644
index ed1937c9..00000000
--- a/conf/cmi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: b8818373-8c1b-42c2-949e-dc7f8cbd9165
-langcode: en
-status: true
-dependencies:
- config:
- - field.storage.paragraph.field_content_liftup_unit
- - paragraphs.paragraphs_type.content_liftup
-_core:
- default_config_hash: PDfXJdsEFnyW-qrv229_Y5bkaK0ztYhLPJc6JutjBfs
-id: paragraph.content_liftup.field_content_liftup_unit
-field_name: field_content_liftup_unit
-entity_type: paragraph
-bundle: content_liftup
-label: Unit
-description: 'Add here the content that you want to appear as cards to the block. Works only with TPR Unit in alpha version'
-required: true
-translatable: false
-default_value: { }
-default_value_callback: ''
-settings:
- handler: views
- handler_settings:
- view:
- view_name: er_tpr_unit
- display_name: entity_reference
- arguments: { }
-field_type: entity_reference
diff --git a/conf/cmi/field.storage.paragraph.field_content_liftup_unit.yml b/conf/cmi/field.storage.paragraph.field_content_liftup_unit.yml
deleted file mode 100644
index af553020..00000000
--- a/conf/cmi/field.storage.paragraph.field_content_liftup_unit.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: fc29b82f-a142-43d3-84c3-3e6802a9013e
-langcode: en
-status: true
-dependencies:
- module:
- - helfi_tpr
- - paragraphs
-_core:
- default_config_hash: qDXN7Cf4Za-x_Udo3DzY4P9LhxH6YTQW0D0YhB66BnQ
-id: paragraph.field_content_liftup_unit
-field_name: field_content_liftup_unit
-entity_type: paragraph
-type: entity_reference
-settings:
- target_type: tpr_unit
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: { }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/conf/cmi/language.content_settings.node.landing_page.yml b/conf/cmi/language.content_settings.node.landing_page.yml
index 1fe39671..287dc47b 100644
--- 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
index ce8d59d1..4be8f720 100644
--- 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/field.field.paragraph.content_liftup.field_content_liftup_unit.yml b/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml
deleted file mode 100644
index 32a00dda..00000000
--- a/conf/cmi/language/fi/field.field.paragraph.content_liftup.field_content_liftup_unit.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-label: Toimipiste
-description: |-
- Lisää tähän sen sisällön otsikko jonka haluat nostaa sivulle.
- Voit toistaiseksi valita vain toimipisteitä.
\ No newline at end of file
diff --git a/conf/cmi/language/fi/field.storage.paragraph.field_content_liftup_unit.yml b/conf/cmi/language/fi/field.storage.paragraph.field_content_liftup_unit.yml
deleted file mode 100644
index 04c7ee99..00000000
--- a/conf/cmi/language/fi/field.storage.paragraph.field_content_liftup_unit.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: fc29b82f-a142-43d3-84c3-3e6802a9013e
-langcode: en
-status: true
-dependencies:
- module:
- - helfi_tpr
- - paragraphs
-_core:
- default_config_hash: qDXN7Cf4Za-x_Udo3DzY4P9LhxH6YTQW0D0YhB66BnQ
-id: paragraph.field_content_liftup_unit
-field_name: field_content_liftup_unit
-entity_type: paragraph
-type: entity_reference
-settings:
- target_type: tpr_unit
-module: core
-locked: false
-cardinality: 1
-translatable: true
-persist_with_no_fields: false
-custom_storage: false
diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml
deleted file mode 100644
index 3cf63a6b..00000000
--- a/conf/cmi/language/fi/paragraphs.paragraphs_type.content_liftup.yml
+++ /dev/null
@@ -1 +0,0 @@
-label: Toimipistekortti
diff --git a/conf/cmi/language/fi/social_media.settings.yml b/conf/cmi/language/fi/social_media.settings.yml
index ead72050..973f8ba0 100644
--- a/conf/cmi/language/fi/social_media.settings.yml
+++ b/conf/cmi/language/fi/social_media.settings.yml
@@ -12,7 +12,7 @@ social_media:
api_url: 'https://twitter.com/intent/tweet?url=[current-page:url]&status=[current-page:title]+[current-page:url]'
attributes: "target|_blank\r\nclass|twitter"
email:
- text: Sähköposti
+ text: 'Lähetä sivu sähköpostitse'
facebook_msg:
attributes: "target|_blank\r\nclass|facebook-msg\r\nrel|noopener noreferrer"
pinterest:
diff --git a/conf/cmi/language/sv/social_media.settings.yml b/conf/cmi/language/sv/social_media.settings.yml
index f3c07820..79ff812c 100644
--- a/conf/cmi/language/sv/social_media.settings.yml
+++ b/conf/cmi/language/sv/social_media.settings.yml
@@ -12,7 +12,7 @@ social_media:
api_url: 'https://twitter.com/intent/tweet?url=[current-page:url]&status=[current-page:title]+[current-page:url]'
attributes: "target|_blank\r\nclass|twitter"
email:
- text: E-post
+ text: 'Skicka via e-post'
facebook_msg:
attributes: "target|_blank\r\nclass|facebook-msg\r\nrel|noopener noreferrer"
pinterest:
diff --git a/conf/cmi/menu_link_attributes.config.yml b/conf/cmi/menu_link_attributes.config.yml
index d2fe542f..3bebeb20 100644
--- 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 (<a href>). 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
index ee87162f..b7d7b043 100644
--- 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
index f624d2ec..c984ed61 100644
--- 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
index 9f1a2303..f2447221 100644
--- 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
index 41865c43..40c53c26 100644
--- 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
index bbc925fa..d5aa1eee 100644
--- 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/paragraphs.paragraphs_type.content_liftup.yml b/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml
deleted file mode 100644
index 03cfb7ee..00000000
--- a/conf/cmi/paragraphs.paragraphs_type.content_liftup.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 6d19fc6c-9441-40b8-a60c-3ba8ff6d62fe
-langcode: en
-status: true
-dependencies: { }
-_core:
- default_config_hash: ONSzgYJ_Jc8pZ002ZLaFDdkbCXm0lKyjjWMpiEYA3v8
-id: content_liftup
-label: 'Content liftup'
-icon_uuid: null
-icon_default: null
-description: 'With content liftup you can reference to a single content inside this site. The information about the content is automatically fetched through the reference.'
-behavior_plugins: { }
diff --git a/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml b/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml
index abeca96b..1a6e3014 100644
--- 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
index a24b1355..4161c7d8 100644
--- 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
index 9813b60a..872d57aa 100644
--- 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
index 02cca319..fade4de0 100644
--- 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)