From 27fa112b020e5de8638f78ee2712c5cd389015ab Mon Sep 17 00:00:00 2001
From: mmyllynen <4696381+dire@users.noreply.github.com>
Date: Wed, 13 Sep 2023 14:42:45 +0300
Subject: [PATCH 1/9] UFH-8950: Copy changes to after school activity search.
---
.../language/fi/views.view.after_school_activity_search.yml | 6 +++---
.../language/sv/views.view.after_school_activity_search.yml | 6 +++---
conf/cmi/views.view.after_school_activity_search.yml | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/conf/cmi/language/fi/views.view.after_school_activity_search.yml b/conf/cmi/language/fi/views.view.after_school_activity_search.yml
index 87975dfc..7e507d25 100644
--- a/conf/cmi/language/fi/views.view.after_school_activity_search.yml
+++ b/conf/cmi/language/fi/views.view.after_school_activity_search.yml
@@ -13,7 +13,7 @@ display:
items_per_page_options_all_label: '- Kaikki -'
exposed_form:
options:
- submit_button: 'Hae iltapäivätoimintaa'
+ submit_button: 'Etsi toimintapaikkoja'
reset_button_label: Palauta
exposed_sorts_label: Järjestä
sort_asc_label: Nouseva
@@ -26,11 +26,11 @@ display:
filters:
address_search:
expose:
- label: 'Järjestä iltapäivätoiminnat osoitteen perusteella'
+ label: 'Kirjoita osoite'
header:
area_address_search_info:
succeed:
- value: "Tulokset järjestettynä hakemasi osoitteen perusteella. Etäisyys annettuun osoitteeseen on kerrottu toimipisteen osoitteen jälkeen tuloslistauksessa.
\r\n"
+ value: "Toimipaikat järjestettynä antamasi osoitteen perusteella.
\r\n"
format: minimal
failed:
value: "Voi harmi. Hakemaasi osoitetta ei löytynyt. Tarkista syöttämäsi osoite. Tulokset on nyt järjestetty aakkosjärjestykseen.
\r\n"
diff --git a/conf/cmi/language/sv/views.view.after_school_activity_search.yml b/conf/cmi/language/sv/views.view.after_school_activity_search.yml
index cdf3d0bb..aa7f3d98 100644
--- a/conf/cmi/language/sv/views.view.after_school_activity_search.yml
+++ b/conf/cmi/language/sv/views.view.after_school_activity_search.yml
@@ -14,7 +14,7 @@ display:
items_per_page_options_all_label: '- Allt -'
exposed_form:
options:
- submit_button: 'Sök eftermiddagsverksamhet'
+ submit_button: 'Sök verksamhetsställen'
empty:
area:
content:
@@ -23,11 +23,11 @@ display:
filters:
address_search:
expose:
- label: 'Sortera eftermiddagsverksamhet efter adress'
+ label: 'Sök på svenskspråkig adress.'
header:
area_address_search_info:
succeed:
- value: "Resultaten sorterade enligt adressen du sökte med. Avståndet till den angivna adressen står efter verksamhetsställets adress i resultatlistan.
\r\n"
+ value: "Verksamhetsställena står listade efter adressen du sökte på.
\r\n"
format: minimal
failed:
value: "Tyvärr kunde adressen du sökte inte hittas. Kontrollera adressen du uppgav. Resultaten är nu i alfabetisk ordning.
\r\n"
diff --git a/conf/cmi/views.view.after_school_activity_search.yml b/conf/cmi/views.view.after_school_activity_search.yml
index 40900ec3..5e49f8f9 100644
--- a/conf/cmi/views.view.after_school_activity_search.yml
+++ b/conf/cmi/views.view.after_school_activity_search.yml
@@ -151,7 +151,7 @@ display:
exposed_form:
type: bef
options:
- submit_button: 'Search for a after-school activities'
+ submit_button: 'Search locations'
reset_button: false
reset_button_label: Reset
exposed_sorts_label: 'Sort by'
@@ -281,7 +281,7 @@ display:
exposed: true
expose:
operator_id: ''
- label: 'Sort after-school activities by address'
+ label: 'Search with a Finnish address'
description: ''
use_operator: false
operator: address_search_op
@@ -444,7 +444,7 @@ display:
plugin_id: address_search_info
empty: false
succeed:
- value: 'Results organised by the address you searched for. The distance to the address is indicated in the results list after the location’s address.'
+ value: 'The locations are listed based on the address you provided.'
format: minimal
failed:
value: 'Given address was not found. Please check the address. The results are now in alphabetical order.'
From d59d04cdf8854a334f5b861488f1aa73785c00ae Mon Sep 17 00:00:00 2001
From: tuutti
Date: Mon, 18 Sep 2023 10:59:38 +0300
Subject: [PATCH 2/9] UHF-8527: Start PubSub cron
---
docker/openshift/crons/base.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/docker/openshift/crons/base.sh b/docker/openshift/crons/base.sh
index 6ac065a5..ddf23420 100644
--- a/docker/openshift/crons/base.sh
+++ b/docker/openshift/crons/base.sh
@@ -22,6 +22,7 @@ exec "/crons/purge-queue.sh" &
exec "/crons/update-translations.sh" &
# Uncomment this to enable content scheduler
exec "/crons/content-scheduler.sh" &
+exec "/crons/pubsub.sh" &
while true
do
From fcaa839940bc061203c6667287cbe84fe30a423d Mon Sep 17 00:00:00 2001
From: Krister Haverinen
Date: Wed, 20 Sep 2023 14:16:58 +0300
Subject: [PATCH 3/9] UHF-8839: Add view id to results container
---
.../templates/views/views-view--daycare-search.html.twig | 2 +-
.../templates/views/views-view--playground-search.html.twig | 2 +-
.../views/views-view--vocational-school-search.html.twig | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/themes/custom/hdbt_subtheme/templates/views/views-view--daycare-search.html.twig b/public/themes/custom/hdbt_subtheme/templates/views/views-view--daycare-search.html.twig
index 4049f16d..611d9f9d 100644
--- a/public/themes/custom/hdbt_subtheme/templates/views/views-view--daycare-search.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/views/views-view--daycare-search.html.twig
@@ -48,7 +48,7 @@
{{ exposed }}
{{ attachment_before }}
-
+
{{ total_rows }}
{% trans with {'context': 'Daycare search count'}%}location{% plural total_rows %}locations{% endtrans %}
diff --git a/public/themes/custom/hdbt_subtheme/templates/views/views-view--playground-search.html.twig b/public/themes/custom/hdbt_subtheme/templates/views/views-view--playground-search.html.twig
index 8775eeb4..e3cb0f96 100644
--- a/public/themes/custom/hdbt_subtheme/templates/views/views-view--playground-search.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/views/views-view--playground-search.html.twig
@@ -48,7 +48,7 @@
{{ exposed }}
{{ attachment_before }}
-
+
{% if total_rows %}
{{ total_rows }}
diff --git a/public/themes/custom/hdbt_subtheme/templates/views/views-view--vocational-school-search.html.twig b/public/themes/custom/hdbt_subtheme/templates/views/views-view--vocational-school-search.html.twig
index a025f76e..043de525 100644
--- a/public/themes/custom/hdbt_subtheme/templates/views/views-view--vocational-school-search.html.twig
+++ b/public/themes/custom/hdbt_subtheme/templates/views/views-view--vocational-school-search.html.twig
@@ -53,7 +53,7 @@
{{ exposed }}
{{ attachment_before }}
-
+
{{ total_rows }}
{% trans with {'context': 'Vocational school search count'}%}unit{% plural total_rows %}units{% endtrans %}
From 65ff6f36de0a189cbc3899b586bcba72d6212522 Mon Sep 17 00:00:00 2001
From: actions-bot
Date: Thu, 21 Sep 2023 06:33:40 +0000
Subject: [PATCH 4/9] Update configuration
---
composer.lock | 110 +++++++++---------
...form_display.tpr_unit.tpr_unit.default.yml | 12 +-
...ternal_entity_type.helfi_announcements.yml | 6 +-
conf/cmi/helfi_api_base.delete_revisions.yml | 6 +
docker-compose.yml | 16 ---
phpunit.xml.dist | 6 +-
6 files changed, 75 insertions(+), 81 deletions(-)
create mode 100644 conf/cmi/helfi_api_base.delete_revisions.yml
diff --git a/composer.lock b/composer.lock
index 1d6a5963..707a50ef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2108,16 +2108,16 @@
},
{
"name": "drupal/core",
- "version": "9.5.10",
+ "version": "9.5.11",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "c84bab7403943fbc4ed90ffcdde4460a94642b06"
+ "reference": "8afcb233c2a71501b35fed2713167c37831d5c19"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/c84bab7403943fbc4ed90ffcdde4460a94642b06",
- "reference": "c84bab7403943fbc4ed90ffcdde4460a94642b06",
+ "url": "https://api.github.com/repos/drupal/core/zipball/8afcb233c2a71501b35fed2713167c37831d5c19",
+ "reference": "8afcb233c2a71501b35fed2713167c37831d5c19",
"shasum": ""
},
"require": {
@@ -2269,9 +2269,9 @@
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"support": {
- "source": "https://github.com/drupal/core/tree/9.5.10"
+ "source": "https://github.com/drupal/core/tree/9.5.11"
},
- "time": "2023-07-05T09:26:59+00:00"
+ "time": "2023-09-19T17:58:28+00:00"
},
{
"name": "drupal/core-composer-scaffold",
@@ -3982,16 +3982,16 @@
},
{
"name": "drupal/hdbt",
- "version": "5.6.3",
+ "version": "5.6.5",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "c4286467ed25fa60ea8ca58e7ca60dcd5ada54ec"
+ "reference": "b9e7c69b79d822f3d53725c79e6cd4a2f976aaa6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c4286467ed25fa60ea8ca58e7ca60dcd5ada54ec",
- "reference": "c4286467ed25fa60ea8ca58e7ca60dcd5ada54ec",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b9e7c69b79d822f3d53725c79e6cd4a2f976aaa6",
+ "reference": "b9e7c69b79d822f3d53725c79e6cd4a2f976aaa6",
"shasum": ""
},
"require": {
@@ -4009,10 +4009,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.3",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.5",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2023-09-14T13:07:07+00:00"
+ "time": "2023-09-21T06:30:24+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -4101,16 +4101,16 @@
},
{
"name": "drupal/helfi_api_base",
- "version": "2.5.3",
+ "version": "2.5.5",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
- "reference": "f5fab16526d75c612e420a68ebe933efb5c72a0e"
+ "reference": "7ffd5b029f1d85590dc8966007f3936f14cb3c35"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/f5fab16526d75c612e420a68ebe933efb5c72a0e",
- "reference": "f5fab16526d75c612e420a68ebe933efb5c72a0e",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/7ffd5b029f1d85590dc8966007f3936f14cb3c35",
+ "reference": "7ffd5b029f1d85590dc8966007f3936f14cb3c35",
"shasum": ""
},
"require": {
@@ -4136,10 +4136,10 @@
],
"description": "Helfi - API Base",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.3",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.5",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
},
- "time": "2023-09-13T05:29:57+00:00"
+ "time": "2023-09-18T06:55:18+00:00"
},
{
"name": "drupal/helfi_azure_fs",
@@ -4186,12 +4186,12 @@
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-tools.git",
- "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa"
+ "reference": "640edf67a34bf37e44c24b75e45e946c7ddb8ef0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa",
- "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/640edf67a34bf37e44c24b75e45e946c7ddb8ef0",
+ "reference": "640edf67a34bf37e44c24b75e45e946c7ddb8ef0",
"shasum": ""
},
"default-branch": true,
@@ -4204,20 +4204,20 @@
"source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main",
"issues": "https://github.com/City-of-Helsinki/drupal-tools/issues"
},
- "time": "2023-09-06T06:27:11+00:00"
+ "time": "2023-09-19T05:58:55+00:00"
},
{
"name": "drupal/helfi_navigation",
- "version": "2.0.13",
+ "version": "2.1.0",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git",
- "reference": "c2497e87c7b4242354c323aad5c21ec09e37d3a7"
+ "reference": "668049d8601e4d9bbc2525fac4616b583960b97a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/c2497e87c7b4242354c323aad5c21ec09e37d3a7",
- "reference": "c2497e87c7b4242354c323aad5c21ec09e37d3a7",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/668049d8601e4d9bbc2525fac4616b583960b97a",
+ "reference": "668049d8601e4d9bbc2525fac4616b583960b97a",
"shasum": ""
},
"require": {
@@ -4235,23 +4235,23 @@
],
"description": "Helfi - Navigation",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.13",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.1.0",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues"
},
- "time": "2023-09-13T05:51:44+00:00"
+ "time": "2023-09-16T04:24:11+00:00"
},
{
"name": "drupal/helfi_platform_config",
- "version": "3.4.5",
+ "version": "3.4.9",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "90394a0feab45409ed2c2101ef3d48c02906714e"
+ "reference": "0944074c7d8f1e4dfe37e05b25e6f442cf5c6576"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/90394a0feab45409ed2c2101ef3d48c02906714e",
- "reference": "90394a0feab45409ed2c2101ef3d48c02906714e",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/0944074c7d8f1e4dfe37e05b25e6f442cf5c6576",
+ "reference": "0944074c7d8f1e4dfe37e05b25e6f442cf5c6576",
"shasum": ""
},
"require": {
@@ -4354,10 +4354,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.5",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.9",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2023-09-13T06:57:57+00:00"
+ "time": "2023-09-20T13:23:27+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -4405,16 +4405,16 @@
},
{
"name": "drupal/helfi_tpr",
- "version": "2.2.6",
+ "version": "2.2.7",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git",
- "reference": "f73c27c4d30522303dfadf1228c7331e120f04ac"
+ "reference": "68a4e65acffc2038e5006f1d4b2763bc52017184"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/f73c27c4d30522303dfadf1228c7331e120f04ac",
- "reference": "f73c27c4d30522303dfadf1228c7331e120f04ac",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/68a4e65acffc2038e5006f1d4b2763bc52017184",
+ "reference": "68a4e65acffc2038e5006f1d4b2763bc52017184",
"shasum": ""
},
"require": {
@@ -4440,10 +4440,10 @@
],
"description": "TPR integration",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.6",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.7",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues"
},
- "time": "2023-09-01T12:09:30+00:00"
+ "time": "2023-09-14T11:48:29+00:00"
},
{
"name": "drupal/helfi_tunnistamo",
@@ -8511,30 +8511,30 @@
},
{
"name": "laminas/laminas-stdlib",
- "version": "3.17.0",
+ "version": "3.18.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-stdlib.git",
- "reference": "dd35c868075bad80b6718959740913e178eb4274"
+ "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/dd35c868075bad80b6718959740913e178eb4274",
- "reference": "dd35c868075bad80b6718959740913e178eb4274",
+ "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf",
+ "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf",
"shasum": ""
},
"require": {
- "php": "~8.1.0 || ~8.2.0"
+ "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
},
"conflict": {
"zendframework/zend-stdlib": "*"
},
"require-dev": {
"laminas/laminas-coding-standard": "^2.5",
- "phpbench/phpbench": "^1.2.9",
- "phpunit/phpunit": "^10.0.16",
+ "phpbench/phpbench": "^1.2.14",
+ "phpunit/phpunit": "^10.3.3",
"psalm/plugin-phpunit": "^0.18.4",
- "vimeo/psalm": "^5.8"
+ "vimeo/psalm": "^5.15.0"
},
"type": "library",
"autoload": {
@@ -8566,7 +8566,7 @@
"type": "community_bridge"
}
],
- "time": "2023-03-20T13:51:37+00:00"
+ "time": "2023-09-19T10:15:21+00:00"
},
{
"name": "league/container",
@@ -16178,16 +16178,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.24.0",
+ "version": "1.24.1",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6"
+ "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6",
- "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01",
+ "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01",
"shasum": ""
},
"require": {
@@ -16219,9 +16219,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.0"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.1"
},
- "time": "2023-09-07T20:46:32+00:00"
+ "time": "2023-09-18T12:18:02+00:00"
},
{
"name": "phpunit/php-code-coverage",
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
index 79059f8b..fc1490ba 100644
--- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -88,8 +88,8 @@ content:
third_party_settings: { }
contacts:
type: readonly_field_widget
- region: content
weight: 36
+ region: content
settings:
label: above
formatter_type: null
@@ -180,8 +180,8 @@ content:
third_party_settings: { }
highlights:
type: readonly_field_widget
- region: content
weight: 33
+ region: content
settings:
label: above
formatter_type: null
@@ -207,8 +207,8 @@ content:
third_party_settings: { }
links:
type: readonly_field_widget
- region: content
weight: 31
+ region: content
settings:
label: above
formatter_type: null
@@ -245,8 +245,8 @@ content:
third_party_settings: { }
opening_hours:
type: readonly_field_widget
- region: content
weight: 32
+ region: content
settings:
label: above
formatter_type: null
@@ -255,8 +255,8 @@ content:
third_party_settings: { }
other_info:
type: readonly_field_widget
- region: content
weight: 34
+ region: content
settings:
label: above
formatter_type: null
@@ -298,8 +298,8 @@ content:
third_party_settings: { }
price_info:
type: readonly_field_widget
- region: content
weight: 35
+ region: content
settings:
label: above
formatter_type: null
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
index 39e6ead1..8ce8153e 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -3,13 +3,13 @@ langcode: en
status: true
dependencies: { }
_core:
- default_config_hash: XBOd0Lfy5FpXJkeuZi75vBaT7ffFCENINrui5kCVygo
+ default_config_hash: zY_1slrvSjIWdILbI-0OWc8A1RRz0fRVj4Gtz4m6zS0
id: helfi_announcements
label: 'Helfi: Announcements'
label_plural: 'Helfi: Announcements'
description: ''
-read_only: true
generate_aliases: null
+read_only: true
field_mapper_id: jsonpath
field_mapper_config:
field_mappings:
@@ -39,7 +39,7 @@ field_mapper_config:
value: '$.attributes["field_announcement_link"]["uri"]'
storage_client_id: helfi_announcements
storage_client_config: { }
-persistent_cache_max_age: 600
+persistent_cache_max_age: -1
annotation_entity_type_id: null
annotation_bundle_id: null
annotation_field_name: null
diff --git a/conf/cmi/helfi_api_base.delete_revisions.yml b/conf/cmi/helfi_api_base.delete_revisions.yml
new file mode 100644
index 00000000..6955f667
--- /dev/null
+++ b/conf/cmi/helfi_api_base.delete_revisions.yml
@@ -0,0 +1,6 @@
+entity_types:
+ - node
+ - paragraph
+ - tpr_unit
+ - tpr_service
+ - tpr_errand_service
diff --git a/docker-compose.yml b/docker-compose.yml
index e8b20509..c9be64c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -82,22 +82,6 @@ services:
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-varnish.tls=true"
- "traefik.http.services.${COMPOSE_PROJECT_NAME}-varnish.loadbalancer.server.port=6081"
- "traefik.docker.network=stonehenge-network"
- robo:
- image: ghcr.io/city-of-helsinki/drupal-robo:latest
- shm_size: '2gb'
- tty: true
- volumes:
- - .:/app:delegated
- networks:
- - internal
- - stonehenge-network
- depends_on:
- - app
- profiles:
- - testing
- extra_hosts:
- - "${DRUPAL_HOSTNAME}:host-gateway"
- - "varnish-${DRUPAL_HOSTNAME}:host-gateway"
networks:
internal:
external: false
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 603e6d95..0ae082a9 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -16,7 +16,7 @@
-
+
@@ -41,9 +41,13 @@
./tests/dtt/src/ExistingSite
+ ./public/modules/custom/*/tests/src/ExistingSite
+ ./public/modules/contrib/*/tests/src/ExistingSite
./tests/dtt/src/ExistingSiteJavascript
+ ./public/modules/custom/*/tests/src/ExistingSiteJavascript
+ ./public/modules/contrib/*/tests/src/ExistingSiteJavascript
From 203cb9f254b8336d5a150d4a30bbbe2754d50e3a Mon Sep 17 00:00:00 2001
From: actions-bot
Date: Mon, 25 Sep 2023 12:08:54 +0000
Subject: [PATCH 5/9] Update configuration
---
composer.lock | 48 +++++++++----------
...isplay.tpr_service.tpr_service.default.yml | 33 ++++++++-----
...form_display.tpr_unit.tpr_unit.default.yml | 12 ++---
...isplay.tpr_service.tpr_service.default.yml | 3 +-
...display.tpr_service.tpr_service.teaser.yml | 3 +-
...rvice.tpr_service.teaser_search_result.yml | 3 +-
...ternal_entity_type.helfi_announcements.yml | 2 +-
conf/cmi/views.view.service_list.yml | 8 +++-
conf/cmi/views.view.unit_services.yml | 21 +-------
9 files changed, 66 insertions(+), 67 deletions(-)
diff --git a/composer.lock b/composer.lock
index 707a50ef..3fa436f8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3982,16 +3982,16 @@
},
{
"name": "drupal/hdbt",
- "version": "5.6.5",
+ "version": "5.6.9",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "b9e7c69b79d822f3d53725c79e6cd4a2f976aaa6"
+ "reference": "bd4ca8c055b0b3f64b5e49ad06e918576b815968"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b9e7c69b79d822f3d53725c79e6cd4a2f976aaa6",
- "reference": "b9e7c69b79d822f3d53725c79e6cd4a2f976aaa6",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/bd4ca8c055b0b3f64b5e49ad06e918576b815968",
+ "reference": "bd4ca8c055b0b3f64b5e49ad06e918576b815968",
"shasum": ""
},
"require": {
@@ -4009,10 +4009,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.5",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.9",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2023-09-21T06:30:24+00:00"
+ "time": "2023-09-25T12:04:46+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -4208,16 +4208,16 @@
},
{
"name": "drupal/helfi_navigation",
- "version": "2.1.0",
+ "version": "2.1.1",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git",
- "reference": "668049d8601e4d9bbc2525fac4616b583960b97a"
+ "reference": "5c0f648a21220a6e8b6c14543f8e60b4b843a918"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/668049d8601e4d9bbc2525fac4616b583960b97a",
- "reference": "668049d8601e4d9bbc2525fac4616b583960b97a",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/5c0f648a21220a6e8b6c14543f8e60b4b843a918",
+ "reference": "5c0f648a21220a6e8b6c14543f8e60b4b843a918",
"shasum": ""
},
"require": {
@@ -4235,23 +4235,23 @@
],
"description": "Helfi - Navigation",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.1.0",
+ "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.1.1",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues"
},
- "time": "2023-09-16T04:24:11+00:00"
+ "time": "2023-09-21T08:34:22+00:00"
},
{
"name": "drupal/helfi_platform_config",
- "version": "3.4.9",
+ "version": "3.4.14",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "0944074c7d8f1e4dfe37e05b25e6f442cf5c6576"
+ "reference": "f3a9eff8df01870a1b3124a87465ae62bb7c47ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/0944074c7d8f1e4dfe37e05b25e6f442cf5c6576",
- "reference": "0944074c7d8f1e4dfe37e05b25e6f442cf5c6576",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f3a9eff8df01870a1b3124a87465ae62bb7c47ba",
+ "reference": "f3a9eff8df01870a1b3124a87465ae62bb7c47ba",
"shasum": ""
},
"require": {
@@ -4354,10 +4354,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.9",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.14",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2023-09-20T13:23:27+00:00"
+ "time": "2023-09-25T07:25:21+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -10502,16 +10502,16 @@
},
{
"name": "psr/http-client",
- "version": "1.0.2",
+ "version": "1.0.3",
"source": {
"type": "git",
"url": "https://github.com/php-fig/http-client.git",
- "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
- "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+ "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+ "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
"shasum": ""
},
"require": {
@@ -10548,9 +10548,9 @@
"psr-18"
],
"support": {
- "source": "https://github.com/php-fig/http-client/tree/1.0.2"
+ "source": "https://github.com/php-fig/http-client"
},
- "time": "2023-04-10T20:12:12+00:00"
+ "time": "2023-09-23T14:17:50+00:00"
},
{
"name": "psr/http-factory",
diff --git a/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml b/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml
index 16985ea8..c1dd7847 100644
--- a/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml
+++ b/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml
@@ -15,7 +15,7 @@ dependencies:
- path
- readonly_field_widget
_core:
- default_config_hash: fBGDQ46DbT3UoCm-GrCSgq6Fd6pARcmF3BNBKxO-qaE
+ default_config_hash: TuN2oM9gnDHnqYyB_3Y28xQmAKLYtQD0cry_Qo4jByo
id: tpr_service.tpr_service.default
targetEntityType: tpr_service
bundle: tpr_service
@@ -33,7 +33,7 @@ content:
third_party_settings: { }
errand_services:
type: readonly_field_widget
- weight: 7
+ weight: 8
region: content
settings:
label: above
@@ -43,7 +43,7 @@ content:
third_party_settings: { }
field_content:
type: paragraphs
- weight: 9
+ weight: 11
region: content
settings:
title: Paragraph
@@ -62,7 +62,7 @@ content:
third_party_settings: { }
field_lower_content:
type: paragraphs
- weight: 11
+ weight: 15
region: content
settings:
title: Paragraph
@@ -81,14 +81,14 @@ content:
third_party_settings: { }
field_metatags:
type: metatag_firehose
- weight: 8
+ weight: 10
region: content
settings:
sidebar: false
third_party_settings: { }
field_sidebar_content:
type: paragraphs
- weight: 10
+ weight: 12
region: content
settings:
title: Paragraph
@@ -107,7 +107,7 @@ content:
third_party_settings: { }
has_unit:
type: readonly_field_widget
- weight: 27
+ weight: 18
region: content
settings:
label: above
@@ -115,9 +115,16 @@ content:
formatter_settings: { }
show_description: false
third_party_settings: { }
+ hide_service_points:
+ type: boolean_checkbox
+ weight: 14
+ region: content
+ settings:
+ display_label: true
+ third_party_settings: { }
hide_sidebar_navigation:
type: boolean_checkbox
- weight: 21
+ weight: 16
region: content
settings:
display_label: true
@@ -131,7 +138,7 @@ content:
third_party_settings: { }
links:
type: readonly_field_widget
- weight: 6
+ weight: 7
region: content
settings:
label: above
@@ -159,7 +166,7 @@ content:
third_party_settings: { }
name_synonyms:
type: readonly_field_widget
- weight: 26
+ weight: 17
region: content
settings:
label: above
@@ -169,13 +176,13 @@ content:
third_party_settings: { }
path:
type: path
- weight: 7
+ weight: 9
region: content
settings: { }
third_party_settings: { }
service_id:
type: readonly_field_widget
- weight: 28
+ weight: 19
region: content
settings:
label: above
@@ -184,7 +191,7 @@ content:
show_description: false
third_party_settings: { }
simple_sitemap:
- weight: 10
+ weight: 13
region: content
settings: { }
third_party_settings: { }
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
index fc1490ba..79059f8b 100644
--- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -88,8 +88,8 @@ content:
third_party_settings: { }
contacts:
type: readonly_field_widget
- weight: 36
region: content
+ weight: 36
settings:
label: above
formatter_type: null
@@ -180,8 +180,8 @@ content:
third_party_settings: { }
highlights:
type: readonly_field_widget
- weight: 33
region: content
+ weight: 33
settings:
label: above
formatter_type: null
@@ -207,8 +207,8 @@ content:
third_party_settings: { }
links:
type: readonly_field_widget
- weight: 31
region: content
+ weight: 31
settings:
label: above
formatter_type: null
@@ -245,8 +245,8 @@ content:
third_party_settings: { }
opening_hours:
type: readonly_field_widget
- weight: 32
region: content
+ weight: 32
settings:
label: above
formatter_type: null
@@ -255,8 +255,8 @@ content:
third_party_settings: { }
other_info:
type: readonly_field_widget
- weight: 34
region: content
+ weight: 34
settings:
label: above
formatter_type: null
@@ -298,8 +298,8 @@ content:
third_party_settings: { }
price_info:
type: readonly_field_widget
- weight: 35
region: content
+ weight: 35
settings:
label: above
formatter_type: null
diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml
index 34cdb64d..76c94580 100644
--- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml
+++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml
@@ -14,7 +14,7 @@ dependencies:
- metatag
- text
_core:
- default_config_hash: 26lfekZ94e-EhgSzEv_7KLsDbUr7VnPlFuJk0GdpVtc
+ default_config_hash: bipB-zcUXW3e12wtjBTJ42I9vKovNlR8ZW8o-73Reas
id: tpr_service.tpr_service.default
targetEntityType: tpr_service
bundle: tpr_service
@@ -111,6 +111,7 @@ content:
hidden:
created: true
has_unit: true
+ hide_service_points: true
langcode: true
name_synonyms: true
search_api_excerpt: true
diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml
index 3f0409eb..759f2b6d 100644
--- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml
+++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml
@@ -12,7 +12,7 @@ dependencies:
- helfi_tpr
- text
_core:
- default_config_hash: arzHjXolWlH8pmxrz3B8CZjJ9zTVIIXnLNyZD3EK6uw
+ default_config_hash: _3hhx9CkvItBW_aQmvGwqAsj65Tat3XlacXqHwECJgo
id: tpr_service.tpr_service.teaser
targetEntityType: tpr_service
bundle: tpr_service
@@ -49,6 +49,7 @@ hidden:
field_metatags: true
field_sidebar_content: true
has_unit: true
+ hide_service_points: true
langcode: true
links: true
name_synonyms: true
diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml
index 3f1c3d44..98837780 100644
--- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml
+++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml
@@ -12,7 +12,7 @@ dependencies:
- helfi_tpr
- text
_core:
- default_config_hash: xB11NuB4PFanx7E4ETdV0gOTv4_GPPPt-Ix-sw4MKHU
+ default_config_hash: eoKQQ4Dm1sXFoG58JFBy_EocUfCV1R4fVs65N63D7xo
id: tpr_service.tpr_service.teaser_search_result
targetEntityType: tpr_service
bundle: tpr_service
@@ -93,6 +93,7 @@ hidden:
field_metatags: true
field_sidebar_content: true
has_unit: true
+ hide_service_points: true
langcode: true
links: true
name_override: true
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
index 8ce8153e..7bb355fa 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -8,8 +8,8 @@ id: helfi_announcements
label: 'Helfi: Announcements'
label_plural: 'Helfi: Announcements'
description: ''
-generate_aliases: null
read_only: true
+generate_aliases: null
field_mapper_id: jsonpath
field_mapper_config:
field_mappings:
diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
index 7b6b923e..f60d928d 100644
--- a/conf/cmi/views.view.service_list.yml
+++ b/conf/cmi/views.view.service_list.yml
@@ -10,7 +10,7 @@ dependencies:
- text
- user
_core:
- default_config_hash: pUd-EuRjmmZcRI9CC31DmD1tyVIMUKNtqAHiBjxB9Q0
+ default_config_hash: MvCiaSrdVcljMT3wLlt5V47it0_DgXogcHidiHT4sug
id: service_list
label: 'Service list'
module: views
@@ -361,6 +361,12 @@ display:
position: 1
display_options:
display_extenders: { }
+ pager:
+ type: none
+ options:
+ offset: 0
+ defaults:
+ pager: false
cache_metadata:
max-age: -1
contexts:
diff --git a/conf/cmi/views.view.unit_services.yml b/conf/cmi/views.view.unit_services.yml
index 22d2e079..d9a7724a 100644
--- a/conf/cmi/views.view.unit_services.yml
+++ b/conf/cmi/views.view.unit_services.yml
@@ -8,7 +8,7 @@ dependencies:
- helfi_tpr
- user
_core:
- default_config_hash: GYMoCqFGp9UJCDJroJyIx4UVbaoO32pYdkm6p6oP2f8
+ default_config_hash: 42qkvrqMtYpQiMgt2YU8fcfrF2DGfBmfrwlRksq3laE
id: unit_services
label: 'Unit services'
module: views
@@ -77,26 +77,9 @@ display:
hide_alter_empty: true
view_mode: teaser
pager:
- type: full
+ type: none
options:
offset: 0
- items_per_page: 4
- total_pages: null
- id: 0
- tags:
- next: Next
- previous: Previous
- first: First
- last: Last
- expose:
- items_per_page: false
- items_per_page_label: 'Items per page'
- items_per_page_options: '5, 10, 25, 50'
- items_per_page_options_all: false
- items_per_page_options_all_label: '- All -'
- offset: false
- offset_label: Offset
- quantity: 9
exposed_form:
type: basic
options:
From fcca64f3a74df0f329a8cb4bb08a044c655c4507 Mon Sep 17 00:00:00 2001
From: actions-bot
Date: Tue, 26 Sep 2023 08:51:54 +0000
Subject: [PATCH 6/9] Update configuration
---
composer.lock | 12 ++++++------
...entity_form_display.tpr_unit.tpr_unit.default.yml | 12 ++++++------
conf/cmi/views.view.service_list.yml | 2 +-
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/composer.lock b/composer.lock
index 3fa436f8..3b3feee6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3982,16 +3982,16 @@
},
{
"name": "drupal/hdbt",
- "version": "5.6.9",
+ "version": "5.6.11",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "bd4ca8c055b0b3f64b5e49ad06e918576b815968"
+ "reference": "c60a99f2943db380fa3f409c36e4060a1b8ed69c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/bd4ca8c055b0b3f64b5e49ad06e918576b815968",
- "reference": "bd4ca8c055b0b3f64b5e49ad06e918576b815968",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c60a99f2943db380fa3f409c36e4060a1b8ed69c",
+ "reference": "c60a99f2943db380fa3f409c36e4060a1b8ed69c",
"shasum": ""
},
"require": {
@@ -4009,10 +4009,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.9",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.11",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2023-09-25T12:04:46+00:00"
+ "time": "2023-09-26T08:47:48+00:00"
},
{
"name": "drupal/hdbt_admin",
diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
index 79059f8b..fc1490ba 100644
--- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
+++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml
@@ -88,8 +88,8 @@ content:
third_party_settings: { }
contacts:
type: readonly_field_widget
- region: content
weight: 36
+ region: content
settings:
label: above
formatter_type: null
@@ -180,8 +180,8 @@ content:
third_party_settings: { }
highlights:
type: readonly_field_widget
- region: content
weight: 33
+ region: content
settings:
label: above
formatter_type: null
@@ -207,8 +207,8 @@ content:
third_party_settings: { }
links:
type: readonly_field_widget
- region: content
weight: 31
+ region: content
settings:
label: above
formatter_type: null
@@ -245,8 +245,8 @@ content:
third_party_settings: { }
opening_hours:
type: readonly_field_widget
- region: content
weight: 32
+ region: content
settings:
label: above
formatter_type: null
@@ -255,8 +255,8 @@ content:
third_party_settings: { }
other_info:
type: readonly_field_widget
- region: content
weight: 34
+ region: content
settings:
label: above
formatter_type: null
@@ -298,8 +298,8 @@ content:
third_party_settings: { }
price_info:
type: readonly_field_widget
- region: content
weight: 35
+ region: content
settings:
label: above
formatter_type: null
diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml
index f60d928d..c4871790 100644
--- a/conf/cmi/views.view.service_list.yml
+++ b/conf/cmi/views.view.service_list.yml
@@ -360,13 +360,13 @@ display:
display_plugin: block
position: 1
display_options:
- display_extenders: { }
pager:
type: none
options:
offset: 0
defaults:
pager: false
+ display_extenders: { }
cache_metadata:
max-age: -1
contexts:
From 7d348a5c64f8d336dc8d24d5d5990ff85755ca73 Mon Sep 17 00:00:00 2001
From: actions-bot
Date: Tue, 26 Sep 2023 09:53:11 +0000
Subject: [PATCH 7/9] Update configuration
---
composer.lock | 32 +++++++++----------
...field_override.node.announcement.title.yml | 20 ++++++++++++
...form_display.node.announcement.default.yml | 27 ++++++++++------
...view_display.node.announcement.default.yml | 11 ++++++-
..._view_display.node.announcement.teaser.yml | 4 ++-
...ternal_entity_type.helfi_announcements.yml | 8 +++--
....announcement.field_announcement_title.yml | 21 ++++++++++++
....storage.node.field_announcement_title.yml | 23 +++++++++++++
....announcement.field_announcement_title.yml | 2 ++
9 files changed, 118 insertions(+), 30 deletions(-)
create mode 100644 conf/cmi/core.base_field_override.node.announcement.title.yml
create mode 100644 conf/cmi/field.field.node.announcement.field_announcement_title.yml
create mode 100644 conf/cmi/field.storage.node.field_announcement_title.yml
create mode 100644 conf/cmi/language/fi/field.field.node.announcement.field_announcement_title.yml
diff --git a/composer.lock b/composer.lock
index 3b3feee6..ec2a63be 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3982,16 +3982,16 @@
},
{
"name": "drupal/hdbt",
- "version": "5.6.11",
+ "version": "5.6.12",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "c60a99f2943db380fa3f409c36e4060a1b8ed69c"
+ "reference": "c24eecd637d0373f9da2bcc01336feee376fcaf1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c60a99f2943db380fa3f409c36e4060a1b8ed69c",
- "reference": "c60a99f2943db380fa3f409c36e4060a1b8ed69c",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c24eecd637d0373f9da2bcc01336feee376fcaf1",
+ "reference": "c24eecd637d0373f9da2bcc01336feee376fcaf1",
"shasum": ""
},
"require": {
@@ -4009,10 +4009,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.11",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.12",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2023-09-26T08:47:48+00:00"
+ "time": "2023-09-26T09:47:13+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -4186,12 +4186,12 @@
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-tools.git",
- "reference": "640edf67a34bf37e44c24b75e45e946c7ddb8ef0"
+ "reference": "8dfd9dda99f0934070119547e7f950d3f90a9ebc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/640edf67a34bf37e44c24b75e45e946c7ddb8ef0",
- "reference": "640edf67a34bf37e44c24b75e45e946c7ddb8ef0",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/8dfd9dda99f0934070119547e7f950d3f90a9ebc",
+ "reference": "8dfd9dda99f0934070119547e7f950d3f90a9ebc",
"shasum": ""
},
"default-branch": true,
@@ -4204,7 +4204,7 @@
"source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main",
"issues": "https://github.com/City-of-Helsinki/drupal-tools/issues"
},
- "time": "2023-09-19T05:58:55+00:00"
+ "time": "2023-09-26T09:45:28+00:00"
},
{
"name": "drupal/helfi_navigation",
@@ -4242,16 +4242,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "3.4.14",
+ "version": "3.4.15",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "f3a9eff8df01870a1b3124a87465ae62bb7c47ba"
+ "reference": "4c85285f69a08e58e04f9da7e27e410881793896"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f3a9eff8df01870a1b3124a87465ae62bb7c47ba",
- "reference": "f3a9eff8df01870a1b3124a87465ae62bb7c47ba",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/4c85285f69a08e58e04f9da7e27e410881793896",
+ "reference": "4c85285f69a08e58e04f9da7e27e410881793896",
"shasum": ""
},
"require": {
@@ -4354,10 +4354,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.14",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.15",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2023-09-25T07:25:21+00:00"
+ "time": "2023-09-26T09:47:18+00:00"
},
{
"name": "drupal/helfi_proxy",
diff --git a/conf/cmi/core.base_field_override.node.announcement.title.yml b/conf/cmi/core.base_field_override.node.announcement.title.yml
new file mode 100644
index 00000000..cb569742
--- /dev/null
+++ b/conf/cmi/core.base_field_override.node.announcement.title.yml
@@ -0,0 +1,20 @@
+uuid: fbdb8254-ba6f-4ff9-a062-37e634d1813d
+langcode: en
+status: true
+dependencies:
+ config:
+ - node.type.announcement
+_core:
+ default_config_hash: v0rg9ztfYRnKz2PXAcGD_Q52rTcPbwqaZLw3tXWd4rM
+id: node.announcement.title
+field_name: title
+entity_type: node
+bundle: announcement
+label: 'Administrative title'
+description: ''
+required: true
+translatable: true
+default_value: { }
+default_value_callback: ''
+settings: { }
+field_type: string
diff --git a/conf/cmi/core.entity_form_display.node.announcement.default.yml b/conf/cmi/core.entity_form_display.node.announcement.default.yml
index f7d866b2..e6407474 100644
--- a/conf/cmi/core.entity_form_display.node.announcement.default.yml
+++ b/conf/cmi/core.entity_form_display.node.announcement.default.yml
@@ -8,6 +8,7 @@ dependencies:
- field.field.node.announcement.field_announcement_content_pages
- field.field.node.announcement.field_announcement_link
- field.field.node.announcement.field_announcement_service_pages
+ - field.field.node.announcement.field_announcement_title
- field.field.node.announcement.field_announcement_type
- field.field.node.announcement.field_announcement_unit_pages
- node.type.announcement
@@ -20,7 +21,7 @@ dependencies:
- select2
- text
_core:
- default_config_hash: le2Wzlas0qZ9Bj-o6WlJbHDeisFrucs9F4B3VOK8t_w
+ default_config_hash: 0ewsu2ZhpNhAo4t7wkUgEa9ABQAkcsF7IXtR-kFeDUg
id: node.announcement.default
targetEntityType: node
bundle: announcement
@@ -28,7 +29,7 @@ mode: default
content:
body:
type: text_textarea_with_summary
- weight: 15
+ weight: 18
region: content
settings:
rows: 9
@@ -44,14 +45,14 @@ content:
third_party_settings: { }
field_announcement_all_pages:
type: boolean_checkbox
- weight: 11
+ weight: 13
region: content
settings:
display_label: true
third_party_settings: { }
field_announcement_content_pages:
type: select2_entity_reference
- weight: 12
+ weight: 14
region: content
settings:
width: 100%
@@ -61,7 +62,7 @@ content:
third_party_settings: { }
field_announcement_link:
type: link_default
- weight: 16
+ weight: 19
region: content
settings:
placeholder_url: ''
@@ -69,7 +70,7 @@ content:
third_party_settings: { }
field_announcement_service_pages:
type: select2_entity_reference
- weight: 14
+ weight: 16
region: content
settings:
width: 100%
@@ -77,16 +78,24 @@ content:
match_operator: CONTAINS
match_limit: 20
third_party_settings: { }
+ field_announcement_title:
+ type: string_textfield
+ weight: 17
+ region: content
+ settings:
+ size: 60
+ placeholder: ''
+ third_party_settings: { }
field_announcement_type:
type: select2
- weight: 10
+ weight: 11
region: content
settings:
width: 100%
third_party_settings: { }
field_announcement_unit_pages:
type: select2_entity_reference
- weight: 13
+ weight: 15
region: content
settings:
width: 100%
@@ -125,7 +134,7 @@ content:
settings: { }
third_party_settings: { }
simple_sitemap:
- weight: 10
+ weight: 12
region: content
settings: { }
third_party_settings: { }
diff --git a/conf/cmi/core.entity_view_display.node.announcement.default.yml b/conf/cmi/core.entity_view_display.node.announcement.default.yml
index b9d1c2a5..fbce68c0 100644
--- a/conf/cmi/core.entity_view_display.node.announcement.default.yml
+++ b/conf/cmi/core.entity_view_display.node.announcement.default.yml
@@ -8,6 +8,7 @@ dependencies:
- field.field.node.announcement.field_announcement_content_pages
- field.field.node.announcement.field_announcement_link
- field.field.node.announcement.field_announcement_service_pages
+ - field.field.node.announcement.field_announcement_title
- field.field.node.announcement.field_announcement_type
- field.field.node.announcement.field_announcement_unit_pages
- node.type.announcement
@@ -17,7 +18,7 @@ dependencies:
- text
- user
_core:
- default_config_hash: IHF-sP4Gq6tdTyWDxQDDEdLbHz3-QzklMNE1QA2mQU0
+ default_config_hash: LQ9K_wCbd758UCcNEORQvFUQ7gNJddkukiwwYHrZv4c
id: node.announcement.default
targetEntityType: node
bundle: announcement
@@ -42,6 +43,14 @@ content:
third_party_settings: { }
weight: 3
region: content
+ field_announcement_title:
+ type: string
+ label: hidden
+ settings:
+ link_to_entity: false
+ third_party_settings: { }
+ weight: 4
+ region: content
field_announcement_type:
type: list_default
label: hidden
diff --git a/conf/cmi/core.entity_view_display.node.announcement.teaser.yml b/conf/cmi/core.entity_view_display.node.announcement.teaser.yml
index 8ec0f94d..d6c050dc 100644
--- a/conf/cmi/core.entity_view_display.node.announcement.teaser.yml
+++ b/conf/cmi/core.entity_view_display.node.announcement.teaser.yml
@@ -9,6 +9,7 @@ dependencies:
- field.field.node.announcement.field_announcement_content_pages
- field.field.node.announcement.field_announcement_link
- field.field.node.announcement.field_announcement_service_pages
+ - field.field.node.announcement.field_announcement_title
- field.field.node.announcement.field_announcement_type
- field.field.node.announcement.field_announcement_unit_pages
- node.type.announcement
@@ -16,7 +17,7 @@ dependencies:
- text
- user
_core:
- default_config_hash: FhIJpRvY90w782EYtR2V2Yfppyglwp191xkVdXEEbbM
+ default_config_hash: OwH532HYBVjDOUW0iJnoDWc2yFGZwwGJnAZEmZPjLCA
id: node.announcement.teaser
targetEntityType: node
bundle: announcement
@@ -40,6 +41,7 @@ hidden:
field_announcement_content_pages: true
field_announcement_link: true
field_announcement_service_pages: true
+ field_announcement_title: true
field_announcement_type: true
field_announcement_unit_pages: true
langcode: true
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
index 7bb355fa..a399baa5 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -3,13 +3,13 @@ langcode: en
status: true
dependencies: { }
_core:
- default_config_hash: zY_1slrvSjIWdILbI-0OWc8A1RRz0fRVj4Gtz4m6zS0
+ default_config_hash: ZjzZvHTvsEfBX_dhlTXEZmLbS_ELM5uV7xbXTaR7D7g
id: helfi_announcements
label: 'Helfi: Announcements'
label_plural: 'Helfi: Announcements'
description: ''
-read_only: true
generate_aliases: null
+read_only: true
field_mapper_id: jsonpath
field_mapper_config:
field_mappings:
@@ -37,9 +37,11 @@ field_mapper_config:
value: '$.attributes["field_announcement_link"]["title"]'
announcement_link_url:
value: '$.attributes["field_announcement_link"]["uri"]'
+ announcement_assistive_technology_close_button_title:
+ value: '$.attributes["field_announcement_title"]'
storage_client_id: helfi_announcements
storage_client_config: { }
-persistent_cache_max_age: -1
+persistent_cache_max_age: 600
annotation_entity_type_id: null
annotation_bundle_id: null
annotation_field_name: null
diff --git a/conf/cmi/field.field.node.announcement.field_announcement_title.yml b/conf/cmi/field.field.node.announcement.field_announcement_title.yml
new file mode 100644
index 00000000..99125e44
--- /dev/null
+++ b/conf/cmi/field.field.node.announcement.field_announcement_title.yml
@@ -0,0 +1,21 @@
+uuid: 997cf5d1-f535-4096-9e09-712ec13b0b8e
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.node.field_announcement_title
+ - node.type.announcement
+_core:
+ default_config_hash: f0piVjyoLRnZfc5fbRP6BdQ6_iMw7az35Req0V6Z4mg
+id: node.announcement.field_announcement_title
+field_name: field_announcement_title
+entity_type: node
+bundle: announcement
+label: 'Announcement title'
+description: 'This title is only available to users of assistive technology. '
+required: true
+translatable: false
+default_value: { }
+default_value_callback: ''
+settings: { }
+field_type: string
diff --git a/conf/cmi/field.storage.node.field_announcement_title.yml b/conf/cmi/field.storage.node.field_announcement_title.yml
new file mode 100644
index 00000000..87d1a374
--- /dev/null
+++ b/conf/cmi/field.storage.node.field_announcement_title.yml
@@ -0,0 +1,23 @@
+uuid: cb546711-ca0d-4672-9ae0-93ff87a2adb4
+langcode: en
+status: true
+dependencies:
+ module:
+ - node
+_core:
+ default_config_hash: dDVMTZxf5aD5P9HjLJX_6ThWFSclPORpZMThR3dd_XY
+id: node.field_announcement_title
+field_name: field_announcement_title
+entity_type: node
+type: string
+settings:
+ max_length: 255
+ case_sensitive: false
+ is_ascii: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/conf/cmi/language/fi/field.field.node.announcement.field_announcement_title.yml b/conf/cmi/language/fi/field.field.node.announcement.field_announcement_title.yml
new file mode 100644
index 00000000..8d33f85f
--- /dev/null
+++ b/conf/cmi/language/fi/field.field.node.announcement.field_announcement_title.yml
@@ -0,0 +1,2 @@
+label: 'Poikkeusilmoituksen otsikko'
+description: 'Tämä otsikko on avustavan teknologian käyttäjiä varten.'
From 9a2cdb0a13f8bad1c7ef079de2bfc35caafcb6f4 Mon Sep 17 00:00:00 2001
From: rpnykanen
Date: Wed, 27 Sep 2023 08:57:49 +0300
Subject: [PATCH 8/9] UHF-8921: added deployment cron prevention script to
base.sh
---
docker/openshift/crons/base.sh | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/docker/openshift/crons/base.sh b/docker/openshift/crons/base.sh
index ddf23420..1d3b5a88 100644
--- a/docker/openshift/crons/base.sh
+++ b/docker/openshift/crons/base.sh
@@ -1,5 +1,23 @@
#!/bin/bash
+# Checking if a new deployment is in progress, as we should not run cron while deploying.
+if [ ! -n "$OPENSHIFT_BUILD_NAME" ]; then
+ echo "OPENSHIFT_BUILD_NAME is not defined. Exiting early."
+ exit 1
+fi
+
+while [ "$(drush state:get deploy_id)" != "$OPENSHIFT_BUILD_NAME" ]
+do
+ echo "Current deploy_id $OPENSHIFT_BUILD_NAME not found in state. Probably a deployment is in progress - waiting for completion..."
+ sleep 60
+done
+
+while [ "$(drush state:get system.maintenance_mode)" = "1" ]
+do
+ echo "Maintenance mode on. Probably a deployment is in progress - waiting for completion..."
+ sleep 60
+done
+
echo "Starting cron: $(date)"
# You can add any additional cron "daemons" here:
From 4725b6053a450b1c2336daf5de43c7b05a5eb2c7 Mon Sep 17 00:00:00 2001
From: actions-bot
Date: Wed, 27 Sep 2023 08:17:56 +0000
Subject: [PATCH 9/9] Update configuration
---
composer.lock | 24 +++++++++----------
...ternal_entity_type.helfi_announcements.yml | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/composer.lock b/composer.lock
index ec2a63be..c8078d3e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4242,16 +4242,16 @@
},
{
"name": "drupal/helfi_platform_config",
- "version": "3.4.15",
+ "version": "3.4.17",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "4c85285f69a08e58e04f9da7e27e410881793896"
+ "reference": "46244701cdef62af87c7e376b4e43391ee6c870c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/4c85285f69a08e58e04f9da7e27e410881793896",
- "reference": "4c85285f69a08e58e04f9da7e27e410881793896",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/46244701cdef62af87c7e376b4e43391ee6c870c",
+ "reference": "46244701cdef62af87c7e376b4e43391ee6c870c",
"shasum": ""
},
"require": {
@@ -4354,10 +4354,10 @@
],
"description": "HELfi platform config",
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.15",
+ "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.17",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2023-09-26T09:47:18+00:00"
+ "time": "2023-09-27T08:15:04+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -16178,16 +16178,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.24.1",
+ "version": "1.24.2",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01"
+ "reference": "bcad8d995980440892759db0c32acae7c8e79442"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01",
- "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442",
+ "reference": "bcad8d995980440892759db0c32acae7c8e79442",
"shasum": ""
},
"require": {
@@ -16219,9 +16219,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.1"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2"
},
- "time": "2023-09-18T12:18:02+00:00"
+ "time": "2023-09-26T12:28:12+00:00"
},
{
"name": "phpunit/php-code-coverage",
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
index a399baa5..86c25a7b 100644
--- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
+++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -8,8 +8,8 @@ id: helfi_announcements
label: 'Helfi: Announcements'
label_plural: 'Helfi: Announcements'
description: ''
-generate_aliases: null
read_only: true
+generate_aliases: null
field_mapper_id: jsonpath
field_mapper_config:
field_mappings: