diff --git a/composer.lock b/composer.lock
index f89a69db..e1b8ec82 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2035,16 +2035,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": {
@@ -2196,9 +2196,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",
@@ -3747,16 +3747,16 @@
},
{
"name": "drupal/hdbt",
- "version": "5.6.1",
+ "version": "5.6.6",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
- "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09"
+ "reference": "14106ddadc5b6b4792e3c932a438e00ccf7d2691"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d4eeff38bc61f431613c8fa9a4d92a8755f66b09",
- "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09",
+ "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/14106ddadc5b6b4792e3c932a438e00ccf7d2691",
+ "reference": "14106ddadc5b6b4792e3c932a438e00ccf7d2691",
"shasum": ""
},
"require": {
@@ -3774,10 +3774,10 @@
"Drupal"
],
"support": {
- "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.1",
+ "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.6",
"issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
},
- "time": "2023-09-11T12:42:43+00:00"
+ "time": "2023-09-21T11:31:49+00:00"
},
{
"name": "drupal/hdbt_admin",
@@ -3866,16 +3866,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": {
@@ -3901,10 +3901,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",
@@ -3951,12 +3951,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,
@@ -3969,20 +3969,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.1",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git",
- "reference": "c2497e87c7b4242354c323aad5c21ec09e37d3a7"
+ "reference": "5c0f648a21220a6e8b6c14543f8e60b4b843a918"
},
"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/5c0f648a21220a6e8b6c14543f8e60b4b843a918",
+ "reference": "5c0f648a21220a6e8b6c14543f8e60b4b843a918",
"shasum": ""
},
"require": {
@@ -4000,23 +4000,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.1",
"issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues"
},
- "time": "2023-09-13T05:51:44+00:00"
+ "time": "2023-09-21T08:34:22+00:00"
},
{
"name": "drupal/helfi_platform_config",
- "version": "3.4.5",
+ "version": "3.4.12",
"source": {
"type": "git",
"url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
- "reference": "90394a0feab45409ed2c2101ef3d48c02906714e"
+ "reference": "fa485c4557bd6227a10ab253ddb85790615f80dc"
},
"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/fa485c4557bd6227a10ab253ddb85790615f80dc",
+ "reference": "fa485c4557bd6227a10ab253ddb85790615f80dc",
"shasum": ""
},
"require": {
@@ -4119,10 +4119,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.12",
"issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
},
- "time": "2023-09-13T06:57:57+00:00"
+ "time": "2023-09-21T11:31:56+00:00"
},
{
"name": "drupal/helfi_proxy",
@@ -4170,16 +4170,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": {
@@ -4205,10 +4205,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",
@@ -8002,30 +8002,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": {
@@ -8057,7 +8057,7 @@
"type": "community_bridge"
}
],
- "time": "2023-03-20T13:51:37+00:00"
+ "time": "2023-09-19T10:15:21+00:00"
},
{
"name": "league/container",
@@ -15842,16 +15842,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": {
@@ -15883,9 +15883,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": "phpstan/phpstan",
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 f0d76361..1f3ce48c 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 f5f1e1ce..5eab4a8c 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
@@ -84,8 +84,8 @@ content:
third_party_settings: { }
contacts:
type: readonly_field_widget
- weight: 36
region: content
+ weight: 36
settings:
label: above
formatter_type: null
@@ -176,8 +176,8 @@ content:
third_party_settings: { }
highlights:
type: readonly_field_widget
- weight: 33
region: content
+ weight: 33
settings:
label: above
formatter_type: null
@@ -203,8 +203,8 @@ content:
third_party_settings: { }
links:
type: readonly_field_widget
- weight: 31
region: content
+ weight: 31
settings:
label: above
formatter_type: null
@@ -241,8 +241,8 @@ content:
third_party_settings: { }
opening_hours:
type: readonly_field_widget
- weight: 32
region: content
+ weight: 32
settings:
label: above
formatter_type: null
@@ -251,8 +251,8 @@ content:
third_party_settings: { }
other_info:
type: readonly_field_widget
- weight: 34
region: content
+ weight: 34
settings:
label: above
formatter_type: null
@@ -294,8 +294,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 082bb07c..1cc35f09 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
service_id: 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 e631d613..7768b92b 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 7f4f9f7f..31b5baa6 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/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