diff --git a/composer.lock b/composer.lock index b9ed82081..57190bf38 100644 --- a/composer.lock +++ b/composer.lock @@ -2650,17 +2650,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.1.2", + "version": "2.1.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.1.2" + "reference": "2.1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.2.zip", - "reference": "2.1.2", - "shasum": "ebd77063566def30be1c7c2fa684c5b05aaa7112" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.1.3.zip", + "reference": "2.1.3", + "shasum": "d050d25a6daf2cf59bfd9bcc9cdb9b060d9dc5f6" }, "require": { "drupal/core": "^9 || ^10" @@ -2668,8 +2668,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.2", - "datestamp": "1696531334", + "version": "2.1.3", + "datestamp": "1697057896", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3692,17 +3692,17 @@ }, { "name": "drupal/gin_toolbar", - "version": "1.0.0-rc3", + "version": "1.0.0-rc4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin_toolbar.git", - "reference": "8.x-1.0-rc3" + "reference": "8.x-1.0-rc4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc3.zip", - "reference": "8.x-1.0-rc3", - "shasum": "f9ae6c1c086f008a2911eb2ced4740ac5c307faf" + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc4.zip", + "reference": "8.x-1.0-rc4", + "shasum": "4f5fa958362b02804564302b0dfceb39e1b38119" }, "require": { "drupal/core": "^9 || ^10" @@ -3710,8 +3710,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc3", - "datestamp": "1688477564", + "version": "8.x-1.0-rc4", + "datestamp": "1697192878", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3751,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.16", + "version": "5.6.17", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c04c52069efd9befb75f3bdac754a52a88ab5f0f" + "reference": "227d2cc22318ad706d4c75417478423ea6c35ce2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c04c52069efd9befb75f3bdac754a52a88ab5f0f", - "reference": "c04c52069efd9befb75f3bdac754a52a88ab5f0f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/227d2cc22318ad706d4c75417478423ea6c35ce2", + "reference": "227d2cc22318ad706d4c75417478423ea6c35ce2", "shasum": "" }, "require": { @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.16", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.17", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-10-10T07:16:09+00:00" + "time": "2023-10-11T13:04:35+00:00" }, { "name": "drupal/hdbt_admin", @@ -4011,16 +4011,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.4.24", + "version": "3.4.25", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "e0bb476200b068015d2d64595a11ee85307d536c" + "reference": "68e859125538f820eb264a21342ad1fddc094b11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e0bb476200b068015d2d64595a11ee85307d536c", - "reference": "e0bb476200b068015d2d64595a11ee85307d536c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/68e859125538f820eb264a21342ad1fddc094b11", + "reference": "68e859125538f820eb264a21342ad1fddc094b11", "shasum": "" }, "require": { @@ -4124,10 +4124,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.24", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.25", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-10-10T06:52:38+00:00" + "time": "2023-10-13T10:46:22+00:00" }, { "name": "drupal/helfi_proxy", @@ -4175,16 +4175,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.2.7", + "version": "2.2.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "68a4e65acffc2038e5006f1d4b2763bc52017184" + "reference": "96e148e1e18bf62bc592ee30f65bfe360b3d2396" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/68a4e65acffc2038e5006f1d4b2763bc52017184", - "reference": "68a4e65acffc2038e5006f1d4b2763bc52017184", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/96e148e1e18bf62bc592ee30f65bfe360b3d2396", + "reference": "96e148e1e18bf62bc592ee30f65bfe360b3d2396", "shasum": "" }, "require": { @@ -4210,10 +4210,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.7", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.8", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-09-14T11:48:29+00:00" + "time": "2023-10-13T10:43:12+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -5277,17 +5277,17 @@ }, { "name": "drupal/purge", - "version": "3.4.0", + "version": "3.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/purge.git", - "reference": "8.x-3.4" + "reference": "8.x-3.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/purge-8.x-3.4.zip", - "reference": "8.x-3.4", - "shasum": "deb4eccfe88af35445e8064a9a4a8a056bfb917f" + "url": "https://ftp.drupal.org/files/projects/purge-8.x-3.5.zip", + "reference": "8.x-3.5", + "shasum": "3772c156be0a2fc1df179710d23b9d7bf645b112" }, "require": { "drupal/core": "^9.2 || ^10" @@ -5295,8 +5295,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.4", - "datestamp": "1663189449", + "version": "8.x-3.5", + "datestamp": "1697142035", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5304,6 +5304,11 @@ }, "branch-alias": { "dev-8.x-3.x": "3.x-dev" + }, + "drush": { + "services": { + "drush.services.yml": ">=9" + } } }, "notification-url": "https://packages.drupal.org/8/downloads", @@ -7960,16 +7965,16 @@ }, { "name": "laminas/laminas-feed", - "version": "2.21.0", + "version": "2.22.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-feed.git", - "reference": "52918789a417bc292ccd6fbb4b91bd78a65d50ab" + "reference": "669792b819fca7274698147ad7a2ecc1b0a9b141" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/52918789a417bc292ccd6fbb4b91bd78a65d50ab", - "reference": "52918789a417bc292ccd6fbb4b91bd78a65d50ab", + "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/669792b819fca7274698147ad7a2ecc1b0a9b141", + "reference": "669792b819fca7274698147ad7a2ecc1b0a9b141", "shasum": "" }, "require": { @@ -7977,24 +7982,24 @@ "ext-libxml": "*", "laminas/laminas-escaper": "^2.9", "laminas/laminas-stdlib": "^3.6", - "php": "~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "laminas/laminas-servicemanager": "<3.3", "zendframework/zend-feed": "*" }, "require-dev": { - "laminas/laminas-cache": "^2.13.2 || ^3.10.1", + "laminas/laminas-cache": "^2.13.2 || ^3.11", "laminas/laminas-cache-storage-adapter-memory": "^1.1.0 || ^2.2", "laminas/laminas-coding-standard": "~2.5.0", "laminas/laminas-db": "^2.18", "laminas/laminas-http": "^2.18", "laminas/laminas-servicemanager": "^3.21.0", - "laminas/laminas-validator": "^2.30.1", - "phpunit/phpunit": "^10.2.6", + "laminas/laminas-validator": "^2.38", + "phpunit/phpunit": "^10.3.1", "psalm/plugin-phpunit": "^0.18.4", "psr/http-message": "^2.0", - "vimeo/psalm": "^5.13.1" + "vimeo/psalm": "^5.14.1" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests", @@ -8036,7 +8041,7 @@ "type": "community_bridge" } ], - "time": "2023-07-24T09:21:16+00:00" + "time": "2023-10-11T20:16:37+00:00" }, { "name": "laminas/laminas-stdlib", 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 6e74b2221..8e4acadde 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 @@ -16,7 +16,7 @@ dependencies: - path - readonly_field_widget _core: - default_config_hash: RcjlFBYhitNunsd4AVtO6f3l-efOfSCW_nlNFMznzhk + default_config_hash: eepmIYNv6ShHO0W2uVzuu18Gashz0oos8xMyfTluiMI id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -354,6 +354,16 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + topical: + type: readonly_field_widget + region: content + weight: 31 + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } translation: weight: 5 region: content diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index ffd3f8c30..bbaf32758 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -18,7 +18,7 @@ dependencies: - telephone - text _core: - default_config_hash: wdJwarmtiJ0vb01WKk2D0Ze8oSHKTf0ni1WKSnYpfvE + default_config_hash: rsUs9_e1k9mgX9c276wA8WlLKzCLUoYk2npzo22UFh8 id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -30,7 +30,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 15 + weight: 14 region: content accessibility_phone: type: string @@ -38,14 +38,14 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 14 + weight: 13 region: content accessibility_sentences: type: tpr_accessibility_sentence label: hidden settings: { } third_party_settings: { } - weight: 20 + weight: 21 region: content accessibility_www: type: link @@ -57,14 +57,14 @@ content: rel: '' target: '' third_party_settings: { } - weight: 16 + weight: 15 region: content address: type: address_plain label: hidden settings: { } third_party_settings: { } - weight: 6 + weight: 5 region: content address_postal: type: string @@ -72,14 +72,21 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 10 + weight: 9 region: content call_charge_info: type: text_default label: above settings: { } third_party_settings: { } - weight: 12 + weight: 11 + region: content + contacts: + type: tpr_connection + label: hidden + settings: { } + third_party_settings: { } + weight: 26 region: content description: type: text_default @@ -94,7 +101,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 9 + weight: 8 region: content field_content: type: entity_reference_revisions_entity_view @@ -103,7 +110,7 @@ content: view_mode: default link: '' third_party_settings: { } - weight: 19 + weight: 20 region: content field_lower_content: type: entity_reference_revisions_entity_view @@ -112,14 +119,14 @@ content: view_mode: default link: '' third_party_settings: { } - weight: 21 + weight: 22 region: content field_metatags: type: metatag_empty_formatter label: above settings: { } third_party_settings: { } - weight: 18 + weight: 17 region: content highlights: type: tpr_connection @@ -136,6 +143,13 @@ content: third_party_settings: { } weight: 24 region: content + links: + type: tpr_connection + label: hidden + settings: { } + third_party_settings: { } + weight: 25 + region: content longitude: type: string label: hidden @@ -165,7 +179,14 @@ content: label: hidden settings: { } third_party_settings: { } - weight: 8 + weight: 7 + region: content + other_info: + type: tpr_connection + label: hidden + settings: { } + third_party_settings: { } + weight: 18 region: content phone: type: telephone_link @@ -173,7 +194,7 @@ content: settings: title: '' third_party_settings: { } - weight: 7 + weight: 6 region: content picture_url: type: imagecache_external_responsive_image @@ -193,13 +214,20 @@ content: third_party_settings: { } weight: 4 region: content + price_info: + type: tpr_connection + label: hidden + settings: { } + third_party_settings: { } + weight: 19 + region: content provided_languages: type: string label: hidden settings: link_to_entity: false third_party_settings: { } - weight: 22 + weight: 23 region: content service_map_embed: type: service_map_embed @@ -209,7 +237,7 @@ content: link_title: 'Open larger map' target: true third_party_settings: { } - weight: 11 + weight: 10 region: content services: type: entity_reference_label @@ -217,7 +245,14 @@ content: settings: link: true third_party_settings: { } - weight: 17 + weight: 16 + region: content + topical: + type: tpr_connection + label: hidden + settings: { } + third_party_settings: { } + weight: 27 region: content unit_picture_caption: type: basic_string @@ -236,17 +271,13 @@ content: rel: '' target: '' third_party_settings: { } - weight: 13 + weight: 12 region: content hidden: - contacts: true created: true field_unit_type: true hide_description: true langcode: true - links: true - other_info: true - price_info: true search_api_excerpt: true show_www: true streetview_entrance_url: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml index 34262fd27..c7c3b9026 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml @@ -74,5 +74,6 @@ hidden: services: true show_www: true streetview_entrance_url: true + topical: true unit_picture_caption: true www: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml index c548e2dd2..6ee02455b 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml @@ -92,5 +92,6 @@ hidden: services: true show_www: true streetview_entrance_url: true + topical: true unit_picture_caption: true www: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml index 9abbd6105..eb08980ec 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml @@ -93,5 +93,6 @@ hidden: services: true show_www: true streetview_entrance_url: true + topical: true unit_picture_caption: true www: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml index b9f6626ae..7b8796976 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -106,5 +106,6 @@ hidden: services: true show_www: true streetview_entrance_url: true + topical: true unit_picture_caption: true www: true