From 03fac7ef797755793cbe990dd260eac31a231f08 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 30 Jan 2025 12:13:53 +0000 Subject: [PATCH 1/9] Update configuration --- composer.lock | 156 +++++++++--------- ...ld.field.media.image.field_media_image.yml | 4 +- conf/cmi/language/fi/views.view.files.yml | 1 + 3 files changed, 81 insertions(+), 80 deletions(-) diff --git a/composer.lock b/composer.lock index 189e3b4b..176da7a9 100644 --- a/composer.lock +++ b/composer.lock @@ -4065,16 +4065,16 @@ }, { "name": "drupal/hdbt", - "version": "6.9.4", + "version": "6.9.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "aa5d86120d9a7c605f6339a0bce8613bc84ddd65" + "reference": "2042bfc4bed397dcc60eec22dc7d5d06a0705418" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/aa5d86120d9a7c605f6339a0bce8613bc84ddd65", - "reference": "aa5d86120d9a7c605f6339a0bce8613bc84ddd65", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2042bfc4bed397dcc60eec22dc7d5d06a0705418", + "reference": "2042bfc4bed397dcc60eec22dc7d5d06a0705418", "shasum": "" }, "require": { @@ -4093,10 +4093,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.4", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.5", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-01-28T14:27:33+00:00" + "time": "2025-01-29T10:36:09+00:00" }, { "name": "drupal/hdbt_admin", @@ -4402,16 +4402,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.12.12", + "version": "4.12.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "b60ca835a667e8a6a2c90350bf0de34f0a9ee74e" + "reference": "5603ea1b27ff7c4ef87299ca63ab4347545b8227" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b60ca835a667e8a6a2c90350bf0de34f0a9ee74e", - "reference": "b60ca835a667e8a6a2c90350bf0de34f0a9ee74e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/5603ea1b27ff7c4ef87299ca63ab4347545b8227", + "reference": "5603ea1b27ff7c4ef87299ca63ab4347545b8227", "shasum": "" }, "require": { @@ -4535,10 +4535,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.12", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.13", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2025-01-28T14:33:21+00:00" + "time": "2025-01-30T12:08:45+00:00" }, { "name": "drupal/helfi_proxy", @@ -11576,16 +11576,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.17", + "version": "v6.4.18", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c" + "reference": "e8d3b5b1975e67812a54388b1ba8e9ec28eb770e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/37ad2380e8c1a8cf62a1200a5c10080b679b446c", - "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/e8d3b5b1975e67812a54388b1ba8e9ec28eb770e", + "reference": "e8d3b5b1975e67812a54388b1ba8e9ec28eb770e", "shasum": "" }, "require": { @@ -11631,7 +11631,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.17" + "source": "https://github.com/symfony/error-handler/tree/v6.4.18" }, "funding": [ { @@ -11647,7 +11647,7 @@ "type": "tidelift" } ], - "time": "2024-12-06T13:30:51+00:00" + "time": "2025-01-06T09:38:16+00:00" }, { "name": "symfony/event-dispatcher", @@ -11937,16 +11937,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.16", + "version": "v6.4.18", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57" + "reference": "d0492d6217e5ab48f51fca76f64cf8e78919d0db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/431771b7a6f662f1575b3cfc8fd7617aa9864d57", - "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d0492d6217e5ab48f51fca76f64cf8e78919d0db", + "reference": "d0492d6217e5ab48f51fca76f64cf8e78919d0db", "shasum": "" }, "require": { @@ -11994,7 +11994,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.16" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.18" }, "funding": [ { @@ -12010,20 +12010,20 @@ "type": "tidelift" } ], - "time": "2024-11-13T18:58:10+00:00" + "time": "2025-01-09T15:48:56+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.17", + "version": "v6.4.18", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710" + "reference": "fca7197bfe9e99dfae7fb1ad3f7f5bd9ef80e1b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c5647393c5ce11833d13e4b70fff4b571d4ac710", - "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fca7197bfe9e99dfae7fb1ad3f7f5bd9ef80e1b7", + "reference": "fca7197bfe9e99dfae7fb1ad3f7f5bd9ef80e1b7", "shasum": "" }, "require": { @@ -12108,7 +12108,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.17" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.18" }, "funding": [ { @@ -12124,20 +12124,20 @@ "type": "tidelift" } ], - "time": "2024-12-31T14:49:31+00:00" + "time": "2025-01-29T07:25:58+00:00" }, { "name": "symfony/mailer", - "version": "v6.4.13", + "version": "v6.4.18", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "c2f7e0d8d7ac8fe25faccf5d8cac462805db2663" + "reference": "e93a6ae2767d7f7578c2b7961d9d8e27580b2b11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/c2f7e0d8d7ac8fe25faccf5d8cac462805db2663", - "reference": "c2f7e0d8d7ac8fe25faccf5d8cac462805db2663", + "url": "https://api.github.com/repos/symfony/mailer/zipball/e93a6ae2767d7f7578c2b7961d9d8e27580b2b11", + "reference": "e93a6ae2767d7f7578c2b7961d9d8e27580b2b11", "shasum": "" }, "require": { @@ -12188,7 +12188,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.4.13" + "source": "https://github.com/symfony/mailer/tree/v6.4.18" }, "funding": [ { @@ -12204,20 +12204,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2025-01-24T15:27:15+00:00" }, { "name": "symfony/mime", - "version": "v6.4.17", + "version": "v6.4.18", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232" + "reference": "917d77981eb1ea963608d5cda4d9c0cf72eaa68e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232", - "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232", + "url": "https://api.github.com/repos/symfony/mime/zipball/917d77981eb1ea963608d5cda4d9c0cf72eaa68e", + "reference": "917d77981eb1ea963608d5cda4d9c0cf72eaa68e", "shasum": "" }, "require": { @@ -12273,7 +12273,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.17" + "source": "https://github.com/symfony/mime/tree/v6.4.18" }, "funding": [ { @@ -12289,7 +12289,7 @@ "type": "tidelift" } ], - "time": "2024-12-02T11:09:41+00:00" + "time": "2025-01-23T13:10:52+00:00" }, { "name": "symfony/options-resolver", @@ -13281,16 +13281,16 @@ }, { "name": "symfony/routing", - "version": "v6.4.16", + "version": "v6.4.18", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220" + "reference": "e9bfc94953019089acdfb9be51c1b9142c4afa68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/91e02e606b4b705c2f4fb42f7e7708b7923a3220", - "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220", + "url": "https://api.github.com/repos/symfony/routing/zipball/e9bfc94953019089acdfb9be51c1b9142c4afa68", + "reference": "e9bfc94953019089acdfb9be51c1b9142c4afa68", "shasum": "" }, "require": { @@ -13344,7 +13344,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.16" + "source": "https://github.com/symfony/routing/tree/v6.4.18" }, "funding": [ { @@ -13360,20 +13360,20 @@ "type": "tidelift" } ], - "time": "2024-11-13T15:31:34+00:00" + "time": "2025-01-09T08:51:02+00:00" }, { "name": "symfony/serializer", - "version": "v6.4.15", + "version": "v6.4.18", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "9d862d66198f3c2e30404228629ef4c18d5d608e" + "reference": "6ad986f62276da4c8c69754decfaa445a89cb6e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/9d862d66198f3c2e30404228629ef4c18d5d608e", - "reference": "9d862d66198f3c2e30404228629ef4c18d5d608e", + "url": "https://api.github.com/repos/symfony/serializer/zipball/6ad986f62276da4c8c69754decfaa445a89cb6e3", + "reference": "6ad986f62276da4c8c69754decfaa445a89cb6e3", "shasum": "" }, "require": { @@ -13442,7 +13442,7 @@ "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/serializer/tree/v6.4.15" + "source": "https://github.com/symfony/serializer/tree/v6.4.18" }, "funding": [ { @@ -13458,7 +13458,7 @@ "type": "tidelift" } ], - "time": "2024-10-23T13:25:59+00:00" + "time": "2025-01-28T18:47:02+00:00" }, { "name": "symfony/service-contracts", @@ -13709,16 +13709,16 @@ }, { "name": "symfony/validator", - "version": "v6.4.17", + "version": "v6.4.18", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "a3c19a0e542d427c207e22242043ef35b5b99a2c" + "reference": "ce20367d07b2592202e9c266b16a93fa50145207" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/a3c19a0e542d427c207e22242043ef35b5b99a2c", - "reference": "a3c19a0e542d427c207e22242043ef35b5b99a2c", + "url": "https://api.github.com/repos/symfony/validator/zipball/ce20367d07b2592202e9c266b16a93fa50145207", + "reference": "ce20367d07b2592202e9c266b16a93fa50145207", "shasum": "" }, "require": { @@ -13786,7 +13786,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v6.4.17" + "source": "https://github.com/symfony/validator/tree/v6.4.18" }, "funding": [ { @@ -13802,20 +13802,20 @@ "type": "tidelift" } ], - "time": "2024-12-29T12:50:19+00:00" + "time": "2025-01-27T16:05:44+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.15", + "version": "v6.4.18", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80" + "reference": "4ad10cf8b020e77ba665305bb7804389884b4837" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", - "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4ad10cf8b020e77ba665305bb7804389884b4837", + "reference": "4ad10cf8b020e77ba665305bb7804389884b4837", "shasum": "" }, "require": { @@ -13871,7 +13871,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.15" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.18" }, "funding": [ { @@ -13887,7 +13887,7 @@ "type": "tidelift" } ], - "time": "2024-11-08T15:28:48+00:00" + "time": "2025-01-17T11:26:11+00:00" }, { "name": "symfony/var-exporter", @@ -13967,16 +13967,16 @@ }, { "name": "symfony/yaml", - "version": "v6.4.13", + "version": "v6.4.18", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "e99b4e94d124b29ee4cf3140e1b537d2dad8cec9" + "reference": "bf598c9d9bb4a22f495a4e26e4c4fce2f8ecefc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/e99b4e94d124b29ee4cf3140e1b537d2dad8cec9", - "reference": "e99b4e94d124b29ee4cf3140e1b537d2dad8cec9", + "url": "https://api.github.com/repos/symfony/yaml/zipball/bf598c9d9bb4a22f495a4e26e4c4fce2f8ecefc5", + "reference": "bf598c9d9bb4a22f495a4e26e4c4fce2f8ecefc5", "shasum": "" }, "require": { @@ -14019,7 +14019,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.13" + "source": "https://github.com/symfony/yaml/tree/v6.4.18" }, "funding": [ { @@ -14035,7 +14035,7 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2025-01-07T09:44:41+00:00" }, { "name": "t4web/composer-lock-parser", @@ -14138,16 +14138,16 @@ }, { "name": "twig/twig", - "version": "v3.18.0", + "version": "v3.19.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50" + "reference": "d4f8c2b86374f08efc859323dbcd95c590f7124e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50", - "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d4f8c2b86374f08efc859323dbcd95c590f7124e", + "reference": "d4f8c2b86374f08efc859323dbcd95c590f7124e", "shasum": "" }, "require": { @@ -14202,7 +14202,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.18.0" + "source": "https://github.com/twigphp/Twig/tree/v3.19.0" }, "funding": [ { @@ -14214,7 +14214,7 @@ "type": "tidelift" } ], - "time": "2024-12-29T10:51:50+00:00" + "time": "2025-01-29T07:06:14+00:00" }, { "name": "twistor/flysystem-stream-wrapper", diff --git a/conf/cmi/field.field.media.image.field_media_image.yml b/conf/cmi/field.field.media.image.field_media_image.yml index e3f5ab05..c263229c 100644 --- a/conf/cmi/field.field.media.image.field_media_image.yml +++ b/conf/cmi/field.field.media.image.field_media_image.yml @@ -15,7 +15,7 @@ third_party_settings: title: title file: '0' _core: - default_config_hash: uuOLryur4r1samXCVX2yDZ5xFTBOK5d5vtciBb0wMBk + default_config_hash: sqUCzZKbsacNIaBSbqEOIYmTe71GQajeaFPNIVlSXVE id: media.image.field_media_image field_name: field_media_image entity_type: media @@ -30,7 +30,7 @@ settings: handler: 'default:file' handler_settings: { } file_directory: '' - file_extensions: 'png gif jpg jpeg' + file_extensions: 'png jpg jpeg' max_filesize: '' max_resolution: '' min_resolution: '' diff --git a/conf/cmi/language/fi/views.view.files.yml b/conf/cmi/language/fi/views.view.files.yml index 912252dc..79d8ca52 100644 --- a/conf/cmi/language/fi/views.view.files.yml +++ b/conf/cmi/language/fi/views.view.files.yml @@ -41,6 +41,7 @@ display: label: Muutospäivämäärä count: label: Käytetään + format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz filters: filename: expose: From b648699ed723b2407ac84ab73f34338c4aea88a7 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 30 Jan 2025 18:35:29 +0200 Subject: [PATCH 2/9] UHF-10374: Change the color-silver-light to color-black-5 in the list of plans and project list components --- .../custom/hdbt_subtheme/dist/css/styles.min.css | 2 +- public/themes/custom/hdbt_subtheme/package-lock.json | 12 ++++++------ .../06_components/paragraphs/_list-of-plans.scss | 2 +- .../scss/06_components/paragraphs/_project-list.scss | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css index cfe43fb3..445763e8 100644 --- a/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css +++ b/public/themes/custom/hdbt_subtheme/dist/css/styles.min.css @@ -1 +1 @@ -.district-teaser{background-color:#fff;margin-bottom:16px;position:relative}@media(min-width: 768px){.district-teaser{display:flex}}.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{height:32px;width:32px;transition:transform .2s linear}@media(min-width: 768px){.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{bottom:32px;position:absolute;right:24px}}@media(prefers-reduced-motion){.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{transition:none}}.district-teaser:hover .hel-icon--arrow-right{transform:translateX(4px)}.district-teaser__data{display:flex;flex-direction:column;padding:32px 24px 32px 24px}@media(min-width: 768px){.district-teaser__data{padding:24px 32px 24px 32px;width:60%}}.district-teaser__data .content-tags{margin-bottom:8px}.district-teaser__data .content-tags__tags__tag:last-child{margin-bottom:0}.district-teaser__data .metadata__item{margin-bottom:16px;margin-top:0;width:100%}@media(min-width: 768px){.district-teaser__data .metadata__item>div{display:flex;flex-wrap:wrap}}.district-teaser__data .metadata__item .metadata__item-label::after{content:":";margin-right:4px}.district-teaser__image{min-width:220px;overflow:hidden}@media(min-width: 768px){.district-teaser__image{max-width:380px;width:40%}}.district-teaser__image img{display:block;height:auto;width:100%}.district-teaser__image .image-placeholder{height:100%;padding-bottom:aspect-ratio-padding(1.5)}.district-teaser__link{display:block;margin-bottom:16px;text-decoration:none}.district-teaser__link::after{content:"";inset:0;position:absolute}.district-teaser__link h3{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:inline-block;margin-top:0}@media(min-width: 992px){.district-teaser__link h3{--line-height: 1.25;font-size:1.5rem;font-weight:500}}.district__content-container{display:flex;flex-direction:column-reverse;margin:auto;margin-top:64px;max-width:1296px;padding-left:16px;padding-right:16px}@media(min-width: 992px){.district__content-container{flex-direction:row}}@media(min-width: 768px){.district__content-container{max-width:1328px}}@media(min-width: 768px){.district__content-container{padding-left:32px;padding-right:32px}}.district__content{margin-bottom:32px;width:100%}@media(min-width: 992px){.district__content{margin-bottom:0;margin-bottom:initial}}@media(min-width: 992px){.district__content.has-sidebar{margin-left:64px}}.district__content.has-sidebar .table-of-contents{margin:0}.district__content .table-of-contents,.district__content .component{padding:0 !important}@media(min-width: 992px){.district__sidebar-content{width:340px}}.node--type-district .hero__arrow{display:none}.node--type-district .metadata__item-content .label:not(:last-of-type)::after{content:", "}.page-type--district .lower-content .component--list-of-links:last-of-type{background-color:#f2f2f2;margin-bottom:calc((50px + 64px)*-1);padding-bottom:96px;padding-top:96px}.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{max-width:1296px;padding-left:16px;padding-right:16px;margin-left:auto;margin-right:auto}@media(min-width: 768px){.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{max-width:1328px}}@media(min-width: 768px){.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{padding-left:32px;padding-right:32px}}.page-type--project .project__image-container picture{display:block;max-width:860px}.page-type--project .project__image-container picture img{display:block;height:auto;max-width:100%;overflow:hidden;box-shadow:inset 0 0 0 1px #e6e6e6}.node--type-project .content-tags{margin-top:32px}.node--type-project .lead-in{margin-bottom:32px}.node--type-project .lower-content .component--list-of-links{background-color:#ccc}.node--type-project .metadata-container{max-width:860px}.node--type-project .metadata__item-content .label:not(:last-of-type)::after,.node--type-project .metadata__item--schedule--plan-schedule *:last-child::after,.node--type-project .card__meta__content .label:not(:last-of-type)::after,.node--type-project .card__meta__content .label--schedule:not(:last-of-type) *:last-child::after{content:", "}.node--type-project .project-metadata__schedule{display:block}.project-teaser .content-tags{margin-top:0}.component--journey-planner .media-oembed-content{border:1px solid #ccc;border-radius:10px;height:252px;width:100%}@media(min-width: 768px){.component--journey-planner .media-oembed-content{width:500px}}.component--list-of-plans{padding-left:16px;padding-right:16px;background-color:#f7f7f8}@media(min-width: 768px){.component--list-of-plans{padding-left:32px;padding-right:32px}}.layout-main-wrapper>*:last-child .component--list-of-plans:last-child{margin-bottom:-115px;padding-bottom:55px}.list-of-plans__count-container{--line-height: 1.5;font-size:1.25rem;font-weight:400;line-height:var(--line-height)}@media(min-width: 992px){.list-of-plans__count-container{--line-height: 1.5;font-size:1.375rem;font-weight:400}}.list-of-plans__count-container .list-of-plans__count{font-weight:700}.list-of-plans__list{margin-top:24px}.list-of-plans__subscribe-link{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);margin-top:32px}.list-of-plans__pager{margin-top:32px}@media(min-width: 768px){.list-of-plans__pager{margin-top:64px;text-align:center}}.list-of-plans__pager-button{width:100%}@media(min-width: 768px){.list-of-plans__pager-button{width:auto}}.plan{background-color:#fff;margin-top:8px;padding-left:24px;padding-top:24px;padding-right:24px;padding-bottom:calc(24px + 28px + 8px);position:relative}@media(min-width: 992px){.plan{padding-left:32px;padding-top:32px;padding-right:32px;padding-bottom:60px}}.plan:first-child{margin-top:0}.plan__title{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-top:0}@media(min-width: 992px){.plan__title{--line-height: 1.25;font-size:1.5rem;font-weight:500}}.plan__link::before{content:"";display:block;inset:0;position:absolute}.plan__published{--line-height: 1.5;font-size:1rem;font-weight:400;line-height:var(--line-height);color:#595959;margin-top:24px}.component--project-list{padding-left:16px;padding-right:16px;background-color:#f7f7f8}@media(min-width: 768px){.component--project-list{padding-left:32px;padding-right:32px}}.project-list_count{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.project-list_count{--line-height: 1.25;font-size:1.5rem;font-weight:500}}.project-list_count-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.project-list__count-container{margin-bottom:24px}.views--project-list .views-row:last-child .project-teaser{margin-bottom:0}.project-list__buttons{display:flex;flex-direction:column}@media(min-width: 768px){.project-list__buttons{flex-direction:row}}.project-list__buttons .hds-pagination-container{width:100%}.project-list__list .project-teaser .content-tags{display:none} +.district-teaser{background-color:#fff;margin-bottom:16px;position:relative}@media(min-width: 768px){.district-teaser{display:flex}}.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{height:32px;width:32px;transition:transform .2s linear}@media(min-width: 768px){.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{bottom:32px;position:absolute;right:24px}}@media(prefers-reduced-motion){.district-teaser .hel-icon--arrow-right,.district-teaser .hel-icon--link-external{transition:none}}.district-teaser:hover .hel-icon--arrow-right{transform:translateX(4px)}.district-teaser__data{display:flex;flex-direction:column;padding:32px 24px 32px 24px}@media(min-width: 768px){.district-teaser__data{padding:24px 32px 24px 32px;width:60%}}.district-teaser__data .content-tags{margin-bottom:8px}.district-teaser__data .content-tags__tags__tag:last-child{margin-bottom:0}.district-teaser__data .metadata__item{margin-bottom:16px;margin-top:0;width:100%}@media(min-width: 768px){.district-teaser__data .metadata__item>div{display:flex;flex-wrap:wrap}}.district-teaser__data .metadata__item .metadata__item-label::after{content:":";margin-right:4px}.district-teaser__image{min-width:220px;overflow:hidden}@media(min-width: 768px){.district-teaser__image{max-width:380px;width:40%}}.district-teaser__image img{display:block;height:auto;width:100%}.district-teaser__image .image-placeholder{height:100%;padding-bottom:aspect-ratio-padding(1.5)}.district-teaser__link{display:block;margin-bottom:16px;text-decoration:none}.district-teaser__link::after{content:"";inset:0;position:absolute}.district-teaser__link h3{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);display:inline-block;margin-top:0}@media(min-width: 992px){.district-teaser__link h3{--line-height: 1.25;font-size:1.5rem;font-weight:500}}.district__content-container{display:flex;flex-direction:column-reverse;margin:auto;margin-top:64px;max-width:1296px;padding-left:16px;padding-right:16px}@media(min-width: 992px){.district__content-container{flex-direction:row}}@media(min-width: 768px){.district__content-container{max-width:1328px}}@media(min-width: 768px){.district__content-container{padding-left:32px;padding-right:32px}}.district__content{margin-bottom:32px;width:100%}@media(min-width: 992px){.district__content{margin-bottom:0;margin-bottom:initial}}@media(min-width: 992px){.district__content.has-sidebar{margin-left:64px}}.district__content.has-sidebar .table-of-contents{margin:0}.district__content .table-of-contents,.district__content .component{padding:0 !important}@media(min-width: 992px){.district__sidebar-content{width:340px}}.node--type-district .hero__arrow{display:none}.node--type-district .metadata__item-content .label:not(:last-of-type)::after{content:", "}.page-type--district .lower-content .component--list-of-links:last-of-type{background-color:#f2f2f2;margin-bottom:calc((50px + 64px)*-1);padding-bottom:96px;padding-top:96px}.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{max-width:1296px;padding-left:16px;padding-right:16px;margin-left:auto;margin-right:auto}@media(min-width: 768px){.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{max-width:1328px}}@media(min-width: 768px){.page-type--project .project__image-container,.page-type--project .content-tags,.page-type--project .project__metadata-wrapper{padding-left:32px;padding-right:32px}}.page-type--project .project__image-container picture{display:block;max-width:860px}.page-type--project .project__image-container picture img{display:block;height:auto;max-width:100%;overflow:hidden;box-shadow:inset 0 0 0 1px #e6e6e6}.node--type-project .content-tags{margin-top:32px}.node--type-project .lead-in{margin-bottom:32px}.node--type-project .lower-content .component--list-of-links{background-color:#ccc}.node--type-project .metadata-container{max-width:860px}.node--type-project .metadata__item-content .label:not(:last-of-type)::after,.node--type-project .metadata__item--schedule--plan-schedule *:last-child::after,.node--type-project .card__meta__content .label:not(:last-of-type)::after,.node--type-project .card__meta__content .label--schedule:not(:last-of-type) *:last-child::after{content:", "}.node--type-project .project-metadata__schedule{display:block}.project-teaser .content-tags{margin-top:0}.component--journey-planner .media-oembed-content{border:1px solid #ccc;border-radius:10px;height:252px;width:100%}@media(min-width: 768px){.component--journey-planner .media-oembed-content{width:500px}}.component--list-of-plans{padding-left:16px;padding-right:16px;background-color:#f2f2f2}@media(min-width: 768px){.component--list-of-plans{padding-left:32px;padding-right:32px}}.layout-main-wrapper>*:last-child .component--list-of-plans:last-child{margin-bottom:-115px;padding-bottom:55px}.list-of-plans__count-container{--line-height: 1.5;font-size:1.25rem;font-weight:400;line-height:var(--line-height)}@media(min-width: 992px){.list-of-plans__count-container{--line-height: 1.5;font-size:1.375rem;font-weight:400}}.list-of-plans__count-container .list-of-plans__count{font-weight:700}.list-of-plans__list{margin-top:24px}.list-of-plans__subscribe-link{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height);margin-top:32px}.list-of-plans__pager{margin-top:32px}@media(min-width: 768px){.list-of-plans__pager{margin-top:64px;text-align:center}}.list-of-plans__pager-button{width:100%}@media(min-width: 768px){.list-of-plans__pager-button{width:auto}}.plan{background-color:#fff;margin-top:8px;padding-left:24px;padding-top:24px;padding-right:24px;padding-bottom:calc(24px + 28px + 8px);position:relative}@media(min-width: 992px){.plan{padding-left:32px;padding-top:32px;padding-right:32px;padding-bottom:60px}}.plan:first-child{margin-top:0}.plan__title{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height);margin-top:0}@media(min-width: 992px){.plan__title{--line-height: 1.25;font-size:1.5rem;font-weight:500}}.plan__link::before{content:"";display:block;inset:0;position:absolute}.plan__published{--line-height: 1.5;font-size:1rem;font-weight:400;line-height:var(--line-height);color:#595959;margin-top:24px}.component--project-list{padding-left:16px;padding-right:16px;background-color:#f2f2f2}@media(min-width: 768px){.component--project-list{padding-left:32px;padding-right:32px}}.project-list_count{--line-height: 1.5;font-size:1.25rem;font-weight:500;line-height:var(--line-height)}@media(min-width: 992px){.project-list_count{--line-height: 1.25;font-size:1.5rem;font-weight:500}}.project-list_count-text{--line-height: 1.5555555556;font-size:1.125rem;font-weight:400;line-height:var(--line-height)}.project-list__count-container{margin-bottom:24px}.views--project-list .views-row:last-child .project-teaser{margin-bottom:0}.project-list__buttons{display:flex;flex-direction:column}@media(min-width: 768px){.project-list__buttons{flex-direction:row}}.project-list__buttons .hds-pagination-container{width:100%}.project-list__list .project-teaser .content-tags{display:none} diff --git a/public/themes/custom/hdbt_subtheme/package-lock.json b/public/themes/custom/hdbt_subtheme/package-lock.json index 3a679551..9508f7b3 100644 --- a/public/themes/custom/hdbt_subtheme/package-lock.json +++ b/public/themes/custom/hdbt_subtheme/package-lock.json @@ -3349,9 +3349,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001692", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz", - "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==", + "version": "1.0.30001696", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz", + "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==", "funding": [ { "type": "opencollective", @@ -13200,9 +13200,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001692", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz", - "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==" + "version": "1.0.30001696", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz", + "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==" }, "chalk": { "version": "2.4.2", diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_list-of-plans.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_list-of-plans.scss index 7dc8c366..b15e5f57 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_list-of-plans.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_list-of-plans.scss @@ -1,6 +1,6 @@ .component--list-of-plans { @include component-side-padding; - background-color: $color-silver-light; + background-color: $color-black-5; } // If the unit-search is just before footer. diff --git a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_project-list.scss b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_project-list.scss index 02ba2de4..8d493f9b 100644 --- a/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_project-list.scss +++ b/public/themes/custom/hdbt_subtheme/src/scss/06_components/paragraphs/_project-list.scss @@ -1,6 +1,6 @@ .component--project-list { @include component-side-padding; - background-color: $color-silver-light; + background-color: $color-black-5; } .project-list_count { From 2cded25bdbb2de5aa6944f05c5a218835e823c30 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:22:09 +0000 Subject: [PATCH 3/9] Update configuration --- composer.lock | 42 ++++++++++++++----------- conf/cmi/views.view.er_tpr_unit.yml | 2 +- conf/cmi/views.view.locked_services.yml | 2 +- conf/cmi/views.view.locked_units.yml | 2 +- conf/cmi/views.view.service_list.yml | 4 +-- conf/cmi/views.view.service_units.yml | 2 +- conf/cmi/views.view.unit_search.yml | 2 +- 7 files changed, 30 insertions(+), 26 deletions(-) diff --git a/composer.lock b/composer.lock index 176da7a9..fe22afad 100644 --- a/composer.lock +++ b/composer.lock @@ -4011,17 +4011,17 @@ }, { "name": "drupal/hal", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/hal.git", - "reference": "2.0.3" + "reference": "2.0.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/hal-2.0.3.zip", - "reference": "2.0.3", - "shasum": "81bc4b0bfdc6c3b7c2ec50f5eb4739451ff5c2ae" + "url": "https://ftp.drupal.org/files/projects/hal-2.0.4.zip", + "reference": "2.0.4", + "shasum": "5d98f2ebbc7952d183278351d24d3e51ea18c8ee" }, "require": { "drupal/core": "^10 || ^11" @@ -4035,8 +4035,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.3", - "datestamp": "1721252595", + "version": "2.0.4", + "datestamp": "1738532063", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4065,16 +4065,16 @@ }, { "name": "drupal/hdbt", - "version": "6.9.5", + "version": "6.9.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "2042bfc4bed397dcc60eec22dc7d5d06a0705418" + "reference": "e997096e0446fa8e2994c2c8b17494c099de89c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2042bfc4bed397dcc60eec22dc7d5d06a0705418", - "reference": "2042bfc4bed397dcc60eec22dc7d5d06a0705418", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e997096e0446fa8e2994c2c8b17494c099de89c1", + "reference": "e997096e0446fa8e2994c2c8b17494c099de89c1", "shasum": "" }, "require": { @@ -4093,10 +4093,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.5", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.6", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-01-29T10:36:09+00:00" + "time": "2025-02-04T10:09:34+00:00" }, { "name": "drupal/hdbt_admin", @@ -5822,6 +5822,10 @@ "name": "dgtlmoon", "homepage": "https://www.drupal.org/user/25027" }, + { + "name": "dpiet", + "homepage": "https://www.drupal.org/user/3626504" + }, { "name": "jstoller", "homepage": "https://www.drupal.org/user/99012" @@ -11261,16 +11265,16 @@ }, { "name": "stomp-php/stomp-php", - "version": "5.1.1", + "version": "5.1.2", "source": { "type": "git", "url": "https://github.com/stomp-php/stomp-php.git", - "reference": "942d93563eefc9dee40e836e594ee16dd08653f0" + "reference": "85e7ad490aeda7d23f8dd7c570aab08e096e40b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stomp-php/stomp-php/zipball/942d93563eefc9dee40e836e594ee16dd08653f0", - "reference": "942d93563eefc9dee40e836e594ee16dd08653f0", + "url": "https://api.github.com/repos/stomp-php/stomp-php/zipball/85e7ad490aeda7d23f8dd7c570aab08e096e40b6", + "reference": "85e7ad490aeda7d23f8dd7c570aab08e096e40b6", "shasum": "" }, "require": { @@ -11318,7 +11322,7 @@ ], "support": { "issues": "https://github.com/stomp-php/stomp-php/issues", - "source": "https://github.com/stomp-php/stomp-php/tree/5.1.1" + "source": "https://github.com/stomp-php/stomp-php/tree/5.1.2" }, "funding": [ { @@ -11330,7 +11334,7 @@ "type": "github" } ], - "time": "2024-12-13T08:48:49+00:00" + "time": "2025-02-03T12:32:51+00:00" }, { "name": "symfony/console", diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index 0e69d1e4..4efaf137 100644 --- a/conf/cmi/views.view.er_tpr_unit.yml +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -91,6 +91,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -105,7 +106,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml index 965ff071..1550583a 100644 --- a/conf/cmi/views.view.locked_services.yml +++ b/conf/cmi/views.view.locked_services.yml @@ -381,6 +381,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -398,7 +399,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml index 5f92270e..bc0dbcee 100644 --- a/conf/cmi/views.view.locked_units.yml +++ b/conf/cmi/views.view.locked_units.yml @@ -381,6 +381,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -398,7 +399,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index e2ccbdeb..7e190ab5 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -109,6 +109,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 4 total_pages: null id: 0 @@ -126,7 +127,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: @@ -646,6 +646,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 5 total_pages: null id: 0 @@ -663,7 +664,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index ce78017e..631f7dee 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -93,6 +93,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 8 total_pages: null id: 0 @@ -110,7 +111,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml index 72a7edf1..101b4532 100644 --- a/conf/cmi/views.view.unit_search.yml +++ b/conf/cmi/views.view.unit_search.yml @@ -286,6 +286,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -303,7 +304,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: From 7aaa81e746bf30240936af2bd36225d845c1e386 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 4 Feb 2025 11:42:08 +0000 Subject: [PATCH 4/9] Update configuration --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index fe22afad..b9fce936 100644 --- a/composer.lock +++ b/composer.lock @@ -4065,16 +4065,16 @@ }, { "name": "drupal/hdbt", - "version": "6.9.6", + "version": "6.9.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "e997096e0446fa8e2994c2c8b17494c099de89c1" + "reference": "29c715152e394d007e7d6760ff9f447173118c5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e997096e0446fa8e2994c2c8b17494c099de89c1", - "reference": "e997096e0446fa8e2994c2c8b17494c099de89c1", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/29c715152e394d007e7d6760ff9f447173118c5a", + "reference": "29c715152e394d007e7d6760ff9f447173118c5a", "shasum": "" }, "require": { @@ -4093,10 +4093,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.6", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.10", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-02-04T10:09:34+00:00" + "time": "2025-02-04T11:38:07+00:00" }, { "name": "drupal/hdbt_admin", From 34917e07c68012a5bce47c5d73ef7721d60a9de5 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:19:45 +0000 Subject: [PATCH 5/9] Update configuration --- composer.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index b9fce936..9a95f46a 100644 --- a/composer.lock +++ b/composer.lock @@ -4065,16 +4065,16 @@ }, { "name": "drupal/hdbt", - "version": "6.9.10", + "version": "6.9.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "29c715152e394d007e7d6760ff9f447173118c5a" + "reference": "d5be6d7bdb6d100566b603cfc0f66d904385b88d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/29c715152e394d007e7d6760ff9f447173118c5a", - "reference": "29c715152e394d007e7d6760ff9f447173118c5a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d5be6d7bdb6d100566b603cfc0f66d904385b88d", + "reference": "d5be6d7bdb6d100566b603cfc0f66d904385b88d", "shasum": "" }, "require": { @@ -4093,10 +4093,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.10", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.12", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-02-04T11:38:07+00:00" + "time": "2025-02-05T07:19:52+00:00" }, { "name": "drupal/hdbt_admin", @@ -4186,16 +4186,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.21", + "version": "2.7.22", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "4f747fe4aed94ed98f6fa18c87578aebd2b84560" + "reference": "0ee94f8a401ecad58811c89ebaeafa2255168341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/4f747fe4aed94ed98f6fa18c87578aebd2b84560", - "reference": "4f747fe4aed94ed98f6fa18c87578aebd2b84560", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/0ee94f8a401ecad58811c89ebaeafa2255168341", + "reference": "0ee94f8a401ecad58811c89ebaeafa2255168341", "shasum": "" }, "require": { @@ -4227,10 +4227,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.21", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.22", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-12-17T09:15:47+00:00" + "time": "2025-02-05T09:19:31+00:00" }, { "name": "drupal/helfi_azure_fs", From 201ada258da8cac4c78ee67ce044764dffaffc15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Wed, 5 Feb 2025 16:04:51 +0200 Subject: [PATCH 6/9] UHF-11329: Added cookie consent groups to journey planner template. --- .../templates/paragraph/paragraph--journey-planner.html.twig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--journey-planner.html.twig b/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--journey-planner.html.twig index 6421890b..daa54aa7 100644 --- a/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--journey-planner.html.twig +++ b/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--journey-planner.html.twig @@ -11,12 +11,14 @@ {% set after_planner_id = media_id ~ random() ~ '-after'|clean_id %} {% set before_planner_id = media_id ~ random() ~ '-before'|clean_id %} + {% set cookie_consent_groups = ['preferences', 'statistics'] %} {% include '@hdbt/misc/embedded-content-cookie-compliance.twig' with { media_url: media_url, media_id: media_id, media_service_url: media_service_url, privacy_policy_url: privacy_policy_url, + cookie_consent_groups: cookie_consent_groups, } %} {% set drupal_settings = { @@ -29,6 +31,7 @@ 'type': 'journey_planner', 'skipLinkAfterId' : after_planner_id, 'skipLinkBeforeId' : before_planner_id, + 'cookieConsentGroups' : cookie_consent_groups, } } } @@ -39,4 +42,4 @@ {% endblock component_content %} {% endembed %} -{% endblock paragraph %} \ No newline at end of file +{% endblock paragraph %} From 0d7f5a08a520d366e006a48df6b5d3d03ab48f8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 6 Feb 2025 13:38:01 +0200 Subject: [PATCH 7/9] UHF-11329: Moved translations to hdbt-theme and unified naming conventions of skiplinks. --- .../paragraph/paragraph--journey-planner.html.twig | 8 ++++---- public/themes/custom/hdbt_subtheme/translations/fi.po | 8 -------- public/themes/custom/hdbt_subtheme/translations/sv.po | 8 -------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--journey-planner.html.twig b/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--journey-planner.html.twig index daa54aa7..aaaab2de 100644 --- a/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--journey-planner.html.twig +++ b/public/themes/custom/hdbt_subtheme/templates/paragraph/paragraph--journey-planner.html.twig @@ -9,8 +9,8 @@ %} {% block component_content %} - {% set after_planner_id = media_id ~ random() ~ '-after'|clean_id %} - {% set before_planner_id = media_id ~ random() ~ '-before'|clean_id %} + {% set skip_link_after = media_id ~ random() ~ '-after'|clean_id %} + {% set skip_link_before = media_id ~ random() ~ '-before'|clean_id %} {% set cookie_consent_groups = ['preferences', 'statistics'] %} {% include '@hdbt/misc/embedded-content-cookie-compliance.twig' with { @@ -29,8 +29,8 @@ 'src': media_url, 'title': 'Digitransit UI embedded search'|t({}, {'context': 'Journey planner'}), 'type': 'journey_planner', - 'skipLinkAfterId' : after_planner_id, - 'skipLinkBeforeId' : before_planner_id, + 'skipLinkAfterId' : skip_link_after, + 'skipLinkBeforeId' : skip_link_before, 'cookieConsentGroups' : cookie_consent_groups, } } diff --git a/public/themes/custom/hdbt_subtheme/translations/fi.po b/public/themes/custom/hdbt_subtheme/translations/fi.po index 92632dce..701cbd4e 100644 --- a/public/themes/custom/hdbt_subtheme/translations/fi.po +++ b/public/themes/custom/hdbt_subtheme/translations/fi.po @@ -23,14 +23,6 @@ msgctxt "Journey planner" msgid "Digitransit UI embedded search" msgstr "Digitransit UI upotettu haku" -msgctxt "Skip link after the journey planner for the journey planner paragraph" -msgid "Continue above the journey planner" -msgstr "Siirry reittioppaan yläpuolelle" - -msgctxt "Skip link before the journey planner for the journey planner paragraph" -msgid "Continue below the journey planner" -msgstr "Siirry reittioppaan alapuolelle" - msgctxt "District and project search fallback" msgid "search result" msgid_plural "search results" diff --git a/public/themes/custom/hdbt_subtheme/translations/sv.po b/public/themes/custom/hdbt_subtheme/translations/sv.po index e79f0dd8..b6b6650c 100644 --- a/public/themes/custom/hdbt_subtheme/translations/sv.po +++ b/public/themes/custom/hdbt_subtheme/translations/sv.po @@ -23,14 +23,6 @@ msgctxt "Journey planner" msgid "Digitransit UI embedded search" msgstr "Digitransit UI inbäddad sökning" -msgctxt "Skip link after the journey planner for the journey planner paragraph" -msgid "Continue above the journey planner" -msgstr "Gå förbi reseplaneraren uppåt" - -msgctxt "Skip link before the journey planner for the journey planner paragraph" -msgid "Continue below the journey planner" -msgstr "Gå förbi reseplaneraren nedåt" - msgctxt "District and project search fallback" msgid "search result" msgid_plural "search results" From f4d42ac53cf8a16cb194e452f2024f04ace1792c Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 6 Feb 2025 13:44:16 +0000 Subject: [PATCH 8/9] Update configuration --- composer.lock | 62 +++++++++---------- ...form_display.media.helfi_chart.default.yml | 2 +- ...isplay.media.helfi_chart.media_library.yml | 2 +- ...view_display.media.helfi_chart.default.yml | 13 ++-- ...isplay.media.helfi_chart.media_library.yml | 2 +- ...ia.helfi_chart.field_helfi_chart_title.yml | 2 +- ...lfi_chart.field_helfi_chart_transcript.yml | 2 +- ...edia.helfi_chart.field_helfi_chart_url.yml | 2 +- ....storage.media.field_helfi_chart_title.yml | 2 +- ...age.media.field_helfi_chart_transcript.yml | 2 +- ...ld.storage.media.field_helfi_chart_url.yml | 2 +- ...age.content_settings.media.helfi_chart.yml | 2 +- conf/cmi/media.type.helfi_chart.yml | 2 +- 13 files changed, 51 insertions(+), 46 deletions(-) diff --git a/composer.lock b/composer.lock index 9a95f46a..02d7895c 100644 --- a/composer.lock +++ b/composer.lock @@ -2249,16 +2249,16 @@ }, { "name": "drupal/core", - "version": "10.4.1", + "version": "10.4.2", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "0aeb6303b33d813a68ea78c40466715d9fcfac46" + "reference": "a895b261aec81a2f52ed1f9123118d08e4616805" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/0aeb6303b33d813a68ea78c40466715d9fcfac46", - "reference": "0aeb6303b33d813a68ea78c40466715d9fcfac46", + "url": "https://api.github.com/repos/drupal/core/zipball/a895b261aec81a2f52ed1f9123118d08e4616805", + "reference": "a895b261aec81a2f52ed1f9123118d08e4616805", "shasum": "" }, "require": { @@ -2407,13 +2407,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.4.1" + "source": "https://github.com/drupal/core/tree/10.4.2" }, - "time": "2025-01-06T23:26:38+00:00" + "time": "2025-02-05T22:51:59+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "10.4.1", + "version": "10.4.2", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2457,7 +2457,7 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.1" + "source": "https://github.com/drupal/core-composer-scaffold/tree/10.4.2" }, "time": "2024-08-22T14:31:30+00:00" }, @@ -4065,16 +4065,16 @@ }, { "name": "drupal/hdbt", - "version": "6.9.12", + "version": "6.9.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "d5be6d7bdb6d100566b603cfc0f66d904385b88d" + "reference": "fb4210ba65715165f8db930dfda4704f5f649f09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d5be6d7bdb6d100566b603cfc0f66d904385b88d", - "reference": "d5be6d7bdb6d100566b603cfc0f66d904385b88d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/fb4210ba65715165f8db930dfda4704f5f649f09", + "reference": "fb4210ba65715165f8db930dfda4704f5f649f09", "shasum": "" }, "require": { @@ -4093,10 +4093,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.12", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.13", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-02-05T07:19:52+00:00" + "time": "2025-02-06T13:35:32+00:00" }, { "name": "drupal/hdbt_admin", @@ -4402,16 +4402,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.12.13", + "version": "4.12.14", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "5603ea1b27ff7c4ef87299ca63ab4347545b8227" + "reference": "5ed16fbdc3125c346ce6df4a0140c1f5e27a0452" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/5603ea1b27ff7c4ef87299ca63ab4347545b8227", - "reference": "5603ea1b27ff7c4ef87299ca63ab4347545b8227", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/5ed16fbdc3125c346ce6df4a0140c1f5e27a0452", + "reference": "5ed16fbdc3125c346ce6df4a0140c1f5e27a0452", "shasum": "" }, "require": { @@ -4535,10 +4535,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.13", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.14", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2025-01-30T12:08:45+00:00" + "time": "2025-02-06T13:36:51+00:00" }, { "name": "drupal/helfi_proxy", @@ -9637,16 +9637,16 @@ }, { "name": "open-telemetry/api", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/api.git", - "reference": "74b1a03263be8c5acb578f41da054b4bac3af4a0" + "reference": "8b925df3047628968bc5be722468db1b98b82d51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/74b1a03263be8c5acb578f41da054b4bac3af4a0", - "reference": "74b1a03263be8c5acb578f41da054b4bac3af4a0", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/8b925df3047628968bc5be722468db1b98b82d51", + "reference": "8b925df3047628968bc5be722468db1b98b82d51", "shasum": "" }, "require": { @@ -9703,7 +9703,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2025-01-20T23:35:16+00:00" + "time": "2025-02-03T21:49:11+00:00" }, { "name": "open-telemetry/context", @@ -16389,20 +16389,20 @@ }, { "name": "open-telemetry/sem-conv", - "version": "1.27.1", + "version": "1.30.0", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/sem-conv.git", - "reference": "1dba705fea74bc0718d04be26090e3697e56f4e6" + "reference": "4178c9f390da8e4dbca9b181a9d1efd50cf7ee0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/1dba705fea74bc0718d04be26090e3697e56f4e6", - "reference": "1dba705fea74bc0718d04be26090e3697e56f4e6", + "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/4178c9f390da8e4dbca9b181a9d1efd50cf7ee0a", + "reference": "4178c9f390da8e4dbca9b181a9d1efd50cf7ee0a", "shasum": "" }, "require": { - "php": "^8.1" + "php": "^8.0" }, "type": "library", "extra": { @@ -16442,7 +16442,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-08-28T09:20:31+00:00" + "time": "2025-02-06T00:21:48+00:00" }, { "name": "phar-io/manifest", diff --git a/conf/cmi/core.entity_form_display.media.helfi_chart.default.yml b/conf/cmi/core.entity_form_display.media.helfi_chart.default.yml index a1912066..a2b06e91 100644 --- a/conf/cmi/core.entity_form_display.media.helfi_chart.default.yml +++ b/conf/cmi/core.entity_form_display.media.helfi_chart.default.yml @@ -11,7 +11,7 @@ dependencies: - link - text _core: - default_config_hash: gdwGWJ777jQK9Sp9u3B8_ezV69VGMbEqOiKax-7vUM8 + default_config_hash: RPiB_poa2hBtdepgZvpwegxerpRhNyCkRIr_OEt_l-M id: media.helfi_chart.default targetEntityType: media bundle: helfi_chart diff --git a/conf/cmi/core.entity_form_display.media.helfi_chart.media_library.yml b/conf/cmi/core.entity_form_display.media.helfi_chart.media_library.yml index 92a34579..af4bbee8 100644 --- a/conf/cmi/core.entity_form_display.media.helfi_chart.media_library.yml +++ b/conf/cmi/core.entity_form_display.media.helfi_chart.media_library.yml @@ -11,7 +11,7 @@ dependencies: module: - text _core: - default_config_hash: 15dE9cINIClD6CbC9j7i4xZaZ4eI95MVmLKSkvXb1P4 + default_config_hash: 7I7JgqwSLHKPVnnYpmVSQ0-RS8tUb0ayNGVynJiS_Jg id: media.helfi_chart.media_library targetEntityType: media bundle: helfi_chart diff --git a/conf/cmi/core.entity_view_display.media.helfi_chart.default.yml b/conf/cmi/core.entity_view_display.media.helfi_chart.default.yml index 716b4ec9..3dfeabe9 100644 --- a/conf/cmi/core.entity_view_display.media.helfi_chart.default.yml +++ b/conf/cmi/core.entity_view_display.media.helfi_chart.default.yml @@ -8,10 +8,10 @@ dependencies: - field.field.media.helfi_chart.field_helfi_chart_url - media.type.helfi_chart module: - - helfi_media_chart + - link - text _core: - default_config_hash: 1xd_Ay1Sm-oy3t_qPIo9gRcIHleOgRxGwiLk41gA6Yw + default_config_hash: FUv-BgecAAz5WBHKaQdV8sD8uNcYSfMUOpMez76--HA id: media.helfi_chart.default targetEntityType: media bundle: helfi_chart @@ -33,9 +33,14 @@ content: weight: 2 region: content field_helfi_chart_url: - type: helfi_chart + type: link label: hidden - settings: { } + settings: + trim_length: 80 + url_only: true + url_plain: false + rel: '' + target: '' third_party_settings: { } weight: 1 region: content diff --git a/conf/cmi/core.entity_view_display.media.helfi_chart.media_library.yml b/conf/cmi/core.entity_view_display.media.helfi_chart.media_library.yml index 464e2f4f..02d79dfd 100644 --- a/conf/cmi/core.entity_view_display.media.helfi_chart.media_library.yml +++ b/conf/cmi/core.entity_view_display.media.helfi_chart.media_library.yml @@ -11,7 +11,7 @@ dependencies: module: - helfi_media_chart _core: - default_config_hash: FHz7mlEZIIXRsyZiI6EMFXkkmC4Qtdt1d4kzEN_fSY0 + default_config_hash: 28nwEZaRGXg0zD-nmyYusiqAx3gMir52iQG7f5pcyJM id: media.helfi_chart.media_library targetEntityType: media bundle: helfi_chart diff --git a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_title.yml b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_title.yml index 8ee82b46..137cde94 100644 --- a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_title.yml +++ b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_title.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.media.field_helfi_chart_title - media.type.helfi_chart _core: - default_config_hash: NkVp00nT1XM4LgzHMR5KpcZejQka35JJzP47xH7r1yE + default_config_hash: 1-AJXcAy0ANS-0BXwAAz8RiB9_s6MfjOP7Mh02yl1X4 id: media.helfi_chart.field_helfi_chart_title field_name: field_helfi_chart_title entity_type: media diff --git a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_transcript.yml b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_transcript.yml index a5aeb8c6..ebbc439c 100644 --- a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_transcript.yml +++ b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_transcript.yml @@ -13,7 +13,7 @@ third_party_settings: allowed_formats: - minimal _core: - default_config_hash: eYXYJE9ziG8ujmLaO266WejbGDf4DUbUQU6QJac4zXY + default_config_hash: 59V-xqzI9H6QWi8JxWcfumBdgctyJuIKKQwy-fIz8xA id: media.helfi_chart.field_helfi_chart_transcript field_name: field_helfi_chart_transcript entity_type: media diff --git a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_url.yml b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_url.yml index b0a29179..f8cb0053 100644 --- a/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_url.yml +++ b/conf/cmi/field.field.media.helfi_chart.field_helfi_chart_url.yml @@ -8,7 +8,7 @@ dependencies: module: - link _core: - default_config_hash: V1HwyhpRiVfBUpG1VW9xYqhX2nyWcObeJLStCHAWJ0U + default_config_hash: fLnEZJ-Xn6hrPAbX1Rm-QF5wD7iFzgfGYmC7ZHQb3Uo id: media.helfi_chart.field_helfi_chart_url field_name: field_helfi_chart_url entity_type: media diff --git a/conf/cmi/field.storage.media.field_helfi_chart_title.yml b/conf/cmi/field.storage.media.field_helfi_chart_title.yml index cc848786..5162acc5 100644 --- a/conf/cmi/field.storage.media.field_helfi_chart_title.yml +++ b/conf/cmi/field.storage.media.field_helfi_chart_title.yml @@ -5,7 +5,7 @@ dependencies: module: - media _core: - default_config_hash: yLiblI3eUbV0Sc4-XQIRmuXcC_86RLrjM1x7hpE7sgM + default_config_hash: E9vNuq40qcDWpbVXzhJZIT-bS2dY1UtXzBLkSzXX5cM id: media.field_helfi_chart_title field_name: field_helfi_chart_title entity_type: media diff --git a/conf/cmi/field.storage.media.field_helfi_chart_transcript.yml b/conf/cmi/field.storage.media.field_helfi_chart_transcript.yml index 9ab51fea..8e65ff5e 100644 --- a/conf/cmi/field.storage.media.field_helfi_chart_transcript.yml +++ b/conf/cmi/field.storage.media.field_helfi_chart_transcript.yml @@ -6,7 +6,7 @@ dependencies: - media - text _core: - default_config_hash: uqaIgIT9IhvV9B6Q2Lv7oC-6c3Tdc6DKqKrL5tenzWE + default_config_hash: XBAZ5mxW37dvu50a4J6YRsS1nIMmSrrbp6o123TjEPU id: media.field_helfi_chart_transcript field_name: field_helfi_chart_transcript entity_type: media diff --git a/conf/cmi/field.storage.media.field_helfi_chart_url.yml b/conf/cmi/field.storage.media.field_helfi_chart_url.yml index 36015937..bd531495 100644 --- a/conf/cmi/field.storage.media.field_helfi_chart_url.yml +++ b/conf/cmi/field.storage.media.field_helfi_chart_url.yml @@ -6,7 +6,7 @@ dependencies: - link - media _core: - default_config_hash: 5_rvFqrv3gOFWntv-K-YqlVVzLGf2qMtMHNV5JRlOAQ + default_config_hash: TFCN5mPRa-KucnPSitp_Q9YBEVittmV1k3IB-cdhq6I id: media.field_helfi_chart_url field_name: field_helfi_chart_url entity_type: media diff --git a/conf/cmi/language.content_settings.media.helfi_chart.yml b/conf/cmi/language.content_settings.media.helfi_chart.yml index eb4fede3..3bbd6443 100644 --- a/conf/cmi/language.content_settings.media.helfi_chart.yml +++ b/conf/cmi/language.content_settings.media.helfi_chart.yml @@ -5,7 +5,7 @@ dependencies: config: - media.type.helfi_chart _core: - default_config_hash: 2BVN4f7oVA6fKcWq9zF90vKpBQ122PgyhnrbvoSn_gk + default_config_hash: Ohvg1161oVX8a2EjOkWgQumATkIUd0YaZeQfqCSZ-d8 id: media.helfi_chart target_entity_type_id: media target_bundle: helfi_chart diff --git a/conf/cmi/media.type.helfi_chart.yml b/conf/cmi/media.type.helfi_chart.yml index 9a7b91f4..94cdcf43 100644 --- a/conf/cmi/media.type.helfi_chart.yml +++ b/conf/cmi/media.type.helfi_chart.yml @@ -5,7 +5,7 @@ dependencies: module: - helfi_media_chart _core: - default_config_hash: 1503jEWhXt0uww_73X1tsvrKBnZlbrduYrVR0J4IugA + default_config_hash: fE_5vzXaso2zcPNu6y4-ltGFLCUYWlG98COd3d7SbIk id: helfi_chart label: 'Chart embed' description: 'Media type Chart can be used to present interactive charts. Supports Microsoft Power BI.' From 8510fc8111254be4568307787f39c137fbb2df13 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 11 Feb 2025 07:17:21 +0000 Subject: [PATCH 9/9] Update configuration --- composer.lock | 133 ++++++++++++++++++++++++------------ conf/cmi/core.extension.yml | 1 + 2 files changed, 92 insertions(+), 42 deletions(-) diff --git a/composer.lock b/composer.lock index 02d7895c..1e2e6a63 100644 --- a/composer.lock +++ b/composer.lock @@ -2957,20 +2957,20 @@ }, { "name": "drupal/elasticsearch_connector", - "version": "8.0.0-alpha2", + "version": "8.0.0-alpha3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/elasticsearch_connector.git", - "reference": "8.0.0-alpha2" + "reference": "8.0.0-alpha3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/elasticsearch_connector-8.0.0-alpha2.zip", - "reference": "8.0.0-alpha2", - "shasum": "35928100f913b7a1d57a362b528071034f2ae1ff" + "url": "https://ftp.drupal.org/files/projects/elasticsearch_connector-8.0.0-alpha3.zip", + "reference": "8.0.0-alpha3", + "shasum": "6743642017ed64be903526f8acf925f1351124e8" }, "require": { - "drupal/core": "^9 || ^10 | ^11", + "drupal/core": "^9 || ^10 || ^11", "drupal/search_api": "^1.23", "elasticsearch/elasticsearch": "^8", "makinacorpus/php-lucene": "^1.1", @@ -2992,8 +2992,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.0.0-alpha2", - "datestamp": "1722668348", + "version": "8.0.0-alpha3", + "datestamp": "1738945053", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -3026,7 +3026,7 @@ "homepage": "https://www.drupal.org/user/257311" } ], - "description": "Provides an ElasticSearch backend for Search API.", + "description": "Provides a Search API backend for Elasticsearch (a powerful, distributed, RESTful search and analytics engine), using the official Elasticsearch PHP Client.", "homepage": "https://www.drupal.org/project/elasticsearch_connector", "support": { "source": "https://git.drupalcode.org/project/elasticsearch_connector" @@ -3521,6 +3521,10 @@ "name": "clemens.tolboom", "homepage": "https://www.drupal.org/user/125814" }, + { + "name": "colan", + "homepage": "https://www.drupal.org/user/58704" + }, { "name": "guignonv", "homepage": "https://www.drupal.org/user/423148" @@ -4065,16 +4069,16 @@ }, { "name": "drupal/hdbt", - "version": "6.9.13", + "version": "6.9.16", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "fb4210ba65715165f8db930dfda4704f5f649f09" + "reference": "b30f5a708ee6a9fbf5b777683667a35473103fa7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/fb4210ba65715165f8db930dfda4704f5f649f09", - "reference": "fb4210ba65715165f8db930dfda4704f5f649f09", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b30f5a708ee6a9fbf5b777683667a35473103fa7", + "reference": "b30f5a708ee6a9fbf5b777683667a35473103fa7", "shasum": "" }, "require": { @@ -4093,10 +4097,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.13", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.16", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-02-06T13:35:32+00:00" + "time": "2025-02-11T07:11:26+00:00" }, { "name": "drupal/hdbt_admin", @@ -4186,16 +4190,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.22", + "version": "2.7.23", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "0ee94f8a401ecad58811c89ebaeafa2255168341" + "reference": "3b923419ffdec7cbf492a8bf01fb426f3cbda1af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/0ee94f8a401ecad58811c89ebaeafa2255168341", - "reference": "0ee94f8a401ecad58811c89ebaeafa2255168341", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/3b923419ffdec7cbf492a8bf01fb426f3cbda1af", + "reference": "3b923419ffdec7cbf492a8bf01fb426f3cbda1af", "shasum": "" }, "require": { @@ -4227,10 +4231,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.22", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.23", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2025-02-05T09:19:31+00:00" + "time": "2025-02-10T08:43:36+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4402,16 +4406,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.12.14", + "version": "4.12.16", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "5ed16fbdc3125c346ce6df4a0140c1f5e27a0452" + "reference": "f903111158324d608b3d60f837472934d3d93f2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/5ed16fbdc3125c346ce6df4a0140c1f5e27a0452", - "reference": "5ed16fbdc3125c346ce6df4a0140c1f5e27a0452", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f903111158324d608b3d60f837472934d3d93f2d", + "reference": "f903111158324d608b3d60f837472934d3d93f2d", "shasum": "" }, "require": { @@ -4535,10 +4539,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.14", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.16", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2025-02-06T13:36:51+00:00" + "time": "2025-02-10T15:16:22+00:00" }, { "name": "drupal/helfi_proxy", @@ -5008,6 +5012,50 @@ "source": "https://git.drupalcode.org/project/jquery_ui_draggable" } }, + { + "name": "drupal/js_cookie", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/js_cookie.git", + "reference": "1.0.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/js_cookie-1.0.1.zip", + "reference": "1.0.1", + "shasum": "e010b3de64a0d57eef9c1773c4dd7e3d9bd9118c" + }, + "require": { + "drupal/core": "^9 || ^10 || ^11" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "1.0.1", + "datestamp": "1693951097", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Dave Reid", + "homepage": "https://www.drupal.org/user/53892" + } + ], + "description": "Provides the js-cookie library as a dependency.", + "homepage": "https://www.drupal.org/project/js_cookie", + "support": { + "source": "https://git.drupalcode.org/project/js_cookie" + } + }, { "name": "drupal/key", "version": "1.19.0", @@ -5915,17 +5963,17 @@ }, { "name": "drupal/raven", - "version": "6.0.14", + "version": "6.0.15", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "6.0.14" + "reference": "6.0.15" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-6.0.14.zip", - "reference": "6.0.14", - "shasum": "4533faf65caad0068c6bb818f29b3151645a9686" + "url": "https://ftp.drupal.org/files/projects/raven-6.0.15.zip", + "reference": "6.0.15", + "shasum": "aaecb396c77dfbd230b336579ec2728c3a094ddb" }, "require": { "drupal/core": "^10.2 || ^11", @@ -5940,8 +5988,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.14", - "datestamp": "1735930900", + "version": "6.0.15", + "datestamp": "1738870775", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6587,20 +6635,21 @@ }, { "name": "drupal/siteimprove", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/siteimprove.git", - "reference": "2.0.2" + "reference": "2.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/siteimprove-2.0.2.zip", - "reference": "2.0.2", - "shasum": "9e716fcd5ae3e7b23a1c8a9bdc6a0980085c2642" + "url": "https://ftp.drupal.org/files/projects/siteimprove-2.0.3.zip", + "reference": "2.0.3", + "shasum": "d5b46baf312161d294cccac3bb5767dea3e1630d" }, "require": { - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.2 || ^10", + "drupal/js_cookie": "^1.0" }, "require-dev": { "drupal/domain_access": "*" @@ -6608,8 +6657,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1704376526", + "version": "2.0.3", + "datestamp": "1738928590", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 3187448c..ac63715c 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -100,6 +100,7 @@ module: inline_form_errors: 0 jquery_ui: 0 jquery_ui_draggable: 0 + js_cookie: 0 key: 0 language: 0 link: 0