From d15b8978f8482af0c0ee95ce09aca9ca2314097b Mon Sep 17 00:00:00 2001
From: Tero Elonen <tero.elonen@druid.fi>
Date: Wed, 16 Mar 2022 14:54:16 +0200
Subject: [PATCH 1/9] UHF-4064: Update hdbt and hdbt_admin themes, add correct
 settings for site settings

---
 composer.lock                                        | 12 ++++++------
 conf/cmi/hdbt_admin_tools.site_settings.yml          |  2 +-
 .../language/fi/hdbt_admin_tools.site_settings.yml   |  2 +-
 .../language/sv/hdbt_admin_tools.site_settings.yml   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.lock b/composer.lock
index 14714db8..fcb9e947 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3906,16 +3906,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "2.2.11",
+            "version": "2.2.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "00fdffdcf4313948fd8502a7f2ec67362ff78dec"
+                "reference": "91eea1dea74372bf3e6d730ccfd03994f8397065"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/00fdffdcf4313948fd8502a7f2ec67362ff78dec",
-                "reference": "00fdffdcf4313948fd8502a7f2ec67362ff78dec",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/91eea1dea74372bf3e6d730ccfd03994f8397065",
+                "reference": "91eea1dea74372bf3e6d730ccfd03994f8397065",
                 "shasum": ""
             },
             "require": {
@@ -3930,10 +3930,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/2.2.11",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/2.2.14",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2022-03-04T08:16:13+00:00"
+            "time": "2022-03-16T07:39:17+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml
index fc2027db..3ad7c944 100644
--- a/conf/cmi/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/hdbt_admin_tools.site_settings.yml
@@ -4,7 +4,7 @@ langcode: en
 site_settings:
   default_icon: star-fill
   theme_color: gold
-  koro: vibration
+  koro: basic
 footer_settings:
   footer_color: dark
   footer_top_title: 'Contact us'
diff --git a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
index 3225c8c9..81ac4507 100644
--- a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
@@ -1,7 +1,7 @@
 site_settings:
   theme_color: gold
   default_icon: star-fill
-  koro: vibration
+  koro: basic
 footer_settings:
   footer_top_content:
     value: "<ul class=\"menu\">\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Kaupungin neuvonta – Helsinki-info\" data-protocol=\"false\" href=\"https://www.hel.fi/kanslia/neuvonta-fi/\">Kaupungin neuvonta – Helsinki-info</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Hae yhteystietoja ja numeroita\" data-protocol=\"false\" href=\"https://numerot.hel.fi/\">Hae yhteystietoja ja numeroita</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Anna palautetta\" data-protocol=\"false\" href=\"https://www.hel.fi/palaute\">Anna palautetta</a></li>\r\n</ul>\r\n"
diff --git a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
index 38255258..820ef232 100644
--- a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
@@ -1,7 +1,7 @@
 site_settings:
   theme_color: gold
   default_icon: star-fill
-  koro: vibration
+  koro: basic
 footer_settings:
   footer_top_content:
     value: "<ul class=\"menu\">\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Helsingfors-info\" data-protocol=\"false\" href=\"https://www.hel.fi/kanslia/neuvonta-sv/\">Helsingfors-info</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Sök kontaktuppgifter och telefonnummer\" data-protocol=\"false\" href=\"https://numerot.hel.fi/\">Sök kontaktuppgifter och telefonnummer</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Ge respons\" data-protocol=\"false\" href=\"https://www.hel.fi/respons/\">Ge respons</a></li>\r\n</ul>\r\n"

From a16356216a7d00fbb15d92c9676fe0c52fcbd819 Mon Sep 17 00:00:00 2001
From: Tero Elonen <tero.elonen@druid.fi>
Date: Wed, 16 Mar 2022 15:03:02 +0200
Subject: [PATCH 2/9] UHF-4064: Add misc configuration that is missing from the
 codebase

---
 conf/cmi/filter.format.full_html.yml                | 2 +-
 conf/cmi/filter.format.minimal.yml                  | 2 +-
 conf/cmi/language/fi/views.view.locked_content.yml  | 2 ++
 conf/cmi/language/fi/views.view.locked_services.yml | 4 ----
 conf/cmi/language/fi/views.view.locked_units.yml    | 4 ----
 conf/cmi/views.view.locked_services.yml             | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
index ca635027..21761dca 100644
--- a/conf/cmi/filter.format.full_html.yml
+++ b/conf/cmi/filter.format.full_html.yml
@@ -26,7 +26,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-icon data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <span role aria-* class="">'
+      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <span role aria-* class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/conf/cmi/filter.format.minimal.yml b/conf/cmi/filter.format.minimal.yml
index ccc5239a..d6ec5489 100644
--- a/conf/cmi/filter.format.minimal.yml
+++ b/conf/cmi/filter.format.minimal.yml
@@ -42,7 +42,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-icon data-protocol class="">'
+      allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/conf/cmi/language/fi/views.view.locked_content.yml b/conf/cmi/language/fi/views.view.locked_content.yml
index ac64fa27..cb8aeec2 100644
--- a/conf/cmi/language/fi/views.view.locked_content.yml
+++ b/conf/cmi/language/fi/views.view.locked_content.yml
@@ -46,6 +46,8 @@ display:
             group_items:
               1:
                 title: Julkaistu
+              2:
+                title: Julkaisematon
         type:
           expose:
             label: Sisältötyyppi
diff --git a/conf/cmi/language/fi/views.view.locked_services.yml b/conf/cmi/language/fi/views.view.locked_services.yml
index fed2e9cc..6fd0aced 100644
--- a/conf/cmi/language/fi/views.view.locked_services.yml
+++ b/conf/cmi/language/fi/views.view.locked_services.yml
@@ -4,10 +4,6 @@ display:
     display_title: Oletus
     display_options:
       title: 'Lukitut palvelut'
-      pager:
-        options:
-          tags: {  }
-          expose: {  }
       exposed_form:
         options:
           submit_button: Käytä
diff --git a/conf/cmi/language/fi/views.view.locked_units.yml b/conf/cmi/language/fi/views.view.locked_units.yml
index f20bc8c1..8c851064 100644
--- a/conf/cmi/language/fi/views.view.locked_units.yml
+++ b/conf/cmi/language/fi/views.view.locked_units.yml
@@ -4,10 +4,6 @@ display:
     display_title: Oletus
     display_options:
       title: 'Lukitut toimipisteet'
-      pager:
-        options:
-          tags: {  }
-          expose: {  }
       exposed_form:
         options:
           submit_button: Käytä
diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml
index a1ef50e6..eda3b5e5 100644
--- a/conf/cmi/views.view.locked_services.yml
+++ b/conf/cmi/views.view.locked_services.yml
@@ -514,7 +514,7 @@ display:
       filter_groups:
         operator: AND
         groups:
-          1: AND
+          - AND
       style:
         type: table
         options:

From 20ef14f42cf760bd867d6ea5cbc1545edf80404b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Wed, 16 Mar 2022 17:20:12 +0200
Subject: [PATCH 3/9] UHF-4064: Reverted configuration updates which are
 supposed to be run after whitelist PR is merged.

---
 conf/cmi/filter.format.full_html.yml | 2 +-
 conf/cmi/filter.format.minimal.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
index 21761dca..ca635027 100644
--- a/conf/cmi/filter.format.full_html.yml
+++ b/conf/cmi/filter.format.full_html.yml
@@ -26,7 +26,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <span role aria-* class="">'
+      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-icon data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <span role aria-* class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/conf/cmi/filter.format.minimal.yml b/conf/cmi/filter.format.minimal.yml
index d6ec5489..ccc5239a 100644
--- a/conf/cmi/filter.format.minimal.yml
+++ b/conf/cmi/filter.format.minimal.yml
@@ -42,7 +42,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class="">'
+      allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-icon data-protocol class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:

From de6a993afc20dd10134e10268540c34a6727b099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Wed, 16 Mar 2022 17:37:59 +0200
Subject: [PATCH 4/9] UHF-4064: Updated HDBT Admin module and removed
 site_settings from config ignore.

---
 composer.lock                       | 14 +++++++-------
 conf/cmi/config_ignore.settings.yml |  3 +--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/composer.lock b/composer.lock
index fcb9e947..da864b39 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3937,21 +3937,21 @@
         },
         {
             "name": "drupal/hdbt_admin",
-            "version": "1.4.7",
+            "version": "1.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git",
-                "reference": "eff7b7e3772f99e63a1d6d9243ca574eee97a718"
+                "reference": "2e90ab01c7c808ac6f3c35ca50aea49726e170b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/eff7b7e3772f99e63a1d6d9243ca574eee97a718",
-                "reference": "eff7b7e3772f99e63a1d6d9243ca574eee97a718",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/2e90ab01c7c808ac6f3c35ca50aea49726e170b4",
+                "reference": "2e90ab01c7c808ac6f3c35ca50aea49726e170b4",
                 "shasum": ""
             },
             "require": {
                 "drupal/admin_toolbar": "^2.3",
-                "drupal/gin": "^3.0"
+                "drupal/gin": "3.0.0-alpha37"
             },
             "type": "drupal-theme",
             "license": [
@@ -3962,10 +3962,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.4.7",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.4.11",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues"
             },
-            "time": "2022-02-23T09:38:59+00:00"
+            "time": "2022-03-16T11:19:51+00:00"
         },
         {
             "name": "drupal/helfi_ahjo",
diff --git a/conf/cmi/config_ignore.settings.yml b/conf/cmi/config_ignore.settings.yml
index 85b4ce7d..8abeb6aa 100644
--- a/conf/cmi/config_ignore.settings.yml
+++ b/conf/cmi/config_ignore.settings.yml
@@ -1,4 +1,3 @@
 _core:
   default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk
-ignored_config_entities:
-  - 'hdbt_admin_tools.site_settings:site_settings'
+ignored_config_entities: { }

From 4cadb48267fb0563c98a93b831d11cebc6cdc56e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= <markus.kalijarvi@druid.fi>
Date: Wed, 16 Mar 2022 17:44:01 +0200
Subject: [PATCH 5/9] UHF-4064: Undo the changes from config ignore.

---
 conf/cmi/config_ignore.settings.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conf/cmi/config_ignore.settings.yml b/conf/cmi/config_ignore.settings.yml
index 8abeb6aa..85b4ce7d 100644
--- a/conf/cmi/config_ignore.settings.yml
+++ b/conf/cmi/config_ignore.settings.yml
@@ -1,3 +1,4 @@
 _core:
   default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk
-ignored_config_entities: { }
+ignored_config_entities:
+  - 'hdbt_admin_tools.site_settings:site_settings'

From 3507844d3ecb138926466d06abd5196ecfac0a7c Mon Sep 17 00:00:00 2001
From: Tero Elonen <tero.elonen@druid.fi>
Date: Thu, 17 Mar 2022 10:54:11 +0200
Subject: [PATCH 6/9] UHF-4064: Update hdbt_admin and platform config modules
 to latest version

---
 composer.lock                                 | 141 +++++++++---------
 ...ction.tpr_errand_service_update_action.yml |   1 +
 .../fi/views.view.locked_services.yml         |   4 +
 .../language/fi/views.view.locked_units.yml   |   4 +
 ...ction.tpr_errand_service_update_action.yml |   1 +
 ...ction.tpr_errand_service_update_action.yml |  11 ++
 6 files changed, 94 insertions(+), 68 deletions(-)
 create mode 100644 conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml
 create mode 100644 conf/cmi/language/sv/system.action.tpr_errand_service_update_action.yml
 create mode 100644 conf/cmi/system.action.tpr_errand_service_update_action.yml

diff --git a/composer.lock b/composer.lock
index fcb9e947..adcf5797 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2198,16 +2198,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.3.7",
+            "version": "9.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "a768174b00fa088027d460a80a13550e624b9bf8"
+                "reference": "e8e3b7e5b3353f7ebf24de9d39087df75bd66afe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/a768174b00fa088027d460a80a13550e624b9bf8",
-                "reference": "a768174b00fa088027d460a80a13550e624b9bf8",
+                "url": "https://api.github.com/repos/drupal/core/zipball/e8e3b7e5b3353f7ebf24de9d39087df75bd66afe",
+                "reference": "e8e3b7e5b3353f7ebf24de9d39087df75bd66afe",
                 "shasum": ""
             },
             "require": {
@@ -2449,9 +2449,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.3.7"
+                "source": "https://github.com/drupal/core/tree/9.3.8"
             },
-            "time": "2022-03-03T09:23:53+00:00"
+            "time": "2022-03-16T15:34:53+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
@@ -2505,16 +2505,16 @@
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.3.7",
+            "version": "9.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "29f6f29672861a5719701a59aae26aafbb4c9495"
+                "reference": "98048032809157c723131ecc2394ff55421d5dc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/29f6f29672861a5719701a59aae26aafbb4c9495",
-                "reference": "29f6f29672861a5719701a59aae26aafbb4c9495",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/98048032809157c723131ecc2394ff55421d5dc6",
+                "reference": "98048032809157c723131ecc2394ff55421d5dc6",
                 "shasum": ""
             },
             "require": {
@@ -2523,7 +2523,7 @@
                 "doctrine/annotations": "1.13.2",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.3.7",
+                "drupal/core": "9.3.8",
                 "egulias/email-validator": "3.1.2",
                 "guzzlehttp/guzzle": "6.5.5",
                 "guzzlehttp/promises": "1.5.1",
@@ -2585,9 +2585,9 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.3.7"
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.8"
             },
-            "time": "2022-03-03T09:23:53+00:00"
+            "time": "2022-03-16T15:34:53+00:00"
         },
         {
             "name": "drupal/crop",
@@ -3937,21 +3937,21 @@
         },
         {
             "name": "drupal/hdbt_admin",
-            "version": "1.4.7",
+            "version": "1.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git",
-                "reference": "eff7b7e3772f99e63a1d6d9243ca574eee97a718"
+                "reference": "2e90ab01c7c808ac6f3c35ca50aea49726e170b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/eff7b7e3772f99e63a1d6d9243ca574eee97a718",
-                "reference": "eff7b7e3772f99e63a1d6d9243ca574eee97a718",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/2e90ab01c7c808ac6f3c35ca50aea49726e170b4",
+                "reference": "2e90ab01c7c808ac6f3c35ca50aea49726e170b4",
                 "shasum": ""
             },
             "require": {
                 "drupal/admin_toolbar": "^2.3",
-                "drupal/gin": "^3.0"
+                "drupal/gin": "3.0.0-alpha37"
             },
             "type": "drupal-theme",
             "license": [
@@ -3962,10 +3962,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.4.7",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.4.11",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues"
             },
-            "time": "2022-02-23T09:38:59+00:00"
+            "time": "2022-03-16T11:19:51+00:00"
         },
         {
             "name": "drupal/helfi_ahjo",
@@ -4002,16 +4002,16 @@
         },
         {
             "name": "drupal/helfi_api_base",
-            "version": "2.1.5",
+            "version": "2.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
-                "reference": "4c5fcb736525a0b652761633e797f9230d29e341"
+                "reference": "46ea948294f69aaf70aae0d086b3f4c797576a53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/4c5fcb736525a0b652761633e797f9230d29e341",
-                "reference": "4c5fcb736525a0b652761633e797f9230d29e341",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/46ea948294f69aaf70aae0d086b3f4c797576a53",
+                "reference": "46ea948294f69aaf70aae0d086b3f4c797576a53",
                 "shasum": ""
             },
             "require": {
@@ -4024,6 +4024,7 @@
             },
             "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
+                "donatj/mock-webserver": "dev-master",
                 "drupal/coder": "^8.3"
             },
             "type": "drupal-module",
@@ -4032,10 +4033,10 @@
             ],
             "description": "Helfi - API Base",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.1.5",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.1.7",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
             },
-            "time": "2022-03-03T11:15:30+00:00"
+            "time": "2022-03-15T07:26:51+00:00"
         },
         {
             "name": "drupal/helfi_azure_fs",
@@ -4199,16 +4200,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "2.5.10",
+            "version": "2.5.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "e2e1c24069931b11395abe2dcf5403570f390baa"
+                "reference": "c695b9b935ac790c5552367c686b89ec5f63ccbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/e2e1c24069931b11395abe2dcf5403570f390baa",
-                "reference": "e2e1c24069931b11395abe2dcf5403570f390baa",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c695b9b935ac790c5552367c686b89ec5f63ccbb",
+                "reference": "c695b9b935ac790c5552367c686b89ec5f63ccbb",
                 "shasum": ""
             },
             "require": {
@@ -4231,10 +4232,11 @@
                 "drupal/features": "^3.12",
                 "drupal/field_group": "^3.1",
                 "drupal/focal_point": "^1.5",
-                "drupal/gin_toolbar": "^1.0@beta",
+                "drupal/gin_toolbar": "1.0-beta20",
+                "drupal/helfi_api_base": "*",
                 "drupal/helfi_media_formtool": "*",
                 "drupal/helfi_media_map": "*",
-                "drupal/helfi_tpr": "^2.0",
+                "drupal/helfi_tpr": "*",
                 "drupal/image_style_quality": "^1.4",
                 "drupal/imagecache_external": "^3.0",
                 "drupal/linkit": "^6.0@beta",
@@ -4266,6 +4268,9 @@
             "type": "drupal-module",
             "extra": {
                 "patches": {
+                    "drupal/content_lock": {
+                        "[#UHF-4553] Fix unlock content button redirect": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/82081691e4a6d05b3716052d5fff46a04027bdc3/patches/content-lock-uhf-4553.patch"
+                    },
                     "drupal/core": {
                         "[#UHF-181] Hide untranslated menu links": "https://www.drupal.org/files/issues/2021-03-05/3091246-allow-menu-tree-manipulators-alter-12-1.patch",
                         "[#UHF-920] Token for base URL (https://www.drupal.org/project/drupal/issues/1088112).": "https://www.drupal.org/files/issues/2020-10-06/1088112-63.patch",
@@ -4302,10 +4307,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.5.10",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.5.12",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2022-03-04T08:26:58+00:00"
+            "time": "2022-03-16T13:12:04+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -4347,16 +4352,16 @@
         },
         {
             "name": "drupal/helfi_tpr",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git",
-                "reference": "d09a5e24046034af5d2941fbf047dbc6f58e2c12"
+                "reference": "295407e9a61164580884ca7d2b68b4d23be4aec4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/d09a5e24046034af5d2941fbf047dbc6f58e2c12",
-                "reference": "d09a5e24046034af5d2941fbf047dbc6f58e2c12",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/295407e9a61164580884ca7d2b68b4d23be4aec4",
+                "reference": "295407e9a61164580884ca7d2b68b4d23be4aec4",
                 "shasum": ""
             },
             "require": {
@@ -4378,10 +4383,10 @@
             ],
             "description": "TPR integration",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.0.3",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.0.4",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues"
             },
-            "time": "2022-02-28T09:00:16+00:00"
+            "time": "2022-03-15T09:26:12+00:00"
         },
         {
             "name": "drupal/helfi_tunnistamo",
@@ -4622,17 +4627,17 @@
         },
         {
             "name": "drupal/matomo",
-            "version": "1.16.0",
+            "version": "1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/matomo.git",
-                "reference": "8.x-1.16"
+                "reference": "8.x-1.17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.16.zip",
-                "reference": "8.x-1.16",
-                "shasum": "0b9fa0bb01afca0821d0233d99b710c004b45039"
+                "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.17.zip",
+                "reference": "8.x-1.17",
+                "shasum": "091f946ec7a09d6b4463e5d75adca9cdcdff2918"
             },
             "require": {
                 "drupal/core": "^8.8.0 || ^9.0.0"
@@ -4648,8 +4653,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.16",
-                    "datestamp": "1646049531",
+                    "version": "8.x-1.17",
+                    "datestamp": "1647206848",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -15081,16 +15086,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.14",
+            "version": "9.2.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4"
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9f4d60b6afe5546421462b76cd4e633ebc364ab4",
-                "reference": "9f4d60b6afe5546421462b76cd4e633ebc364ab4",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
                 "shasum": ""
             },
             "require": {
@@ -15146,7 +15151,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.14"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
             },
             "funding": [
                 {
@@ -15154,7 +15159,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-28T12:38:02+00:00"
+            "time": "2022-03-07T09:28:20+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -15399,16 +15404,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.17",
+            "version": "9.5.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "5c5abcfaa2cbd44b2203995d7a339ef910fe0c8f"
+                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5c5abcfaa2cbd44b2203995d7a339ef910fe0c8f",
-                "reference": "5c5abcfaa2cbd44b2203995d7a339ef910fe0c8f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
+                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
                 "shasum": ""
             },
             "require": {
@@ -15438,7 +15443,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3.4",
+                "sebastian/type": "^3.0",
                 "sebastian/version": "^3.0.2"
             },
             "require-dev": {
@@ -15486,7 +15491,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.17"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
             },
             "funding": [
                 {
@@ -15498,7 +15503,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-05T16:54:31+00:00"
+            "time": "2022-03-15T09:57:31+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -16357,28 +16362,28 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.4",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -16401,7 +16406,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
             },
             "funding": [
                 {
@@ -16409,7 +16414,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-15T12:49:02+00:00"
+            "time": "2022-03-15T09:54:48+00:00"
         },
         {
             "name": "sebastian/version",
diff --git a/conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml b/conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml
new file mode 100644
index 00000000..717de724
--- /dev/null
+++ b/conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml
@@ -0,0 +1 @@
+label: Päivitä
diff --git a/conf/cmi/language/fi/views.view.locked_services.yml b/conf/cmi/language/fi/views.view.locked_services.yml
index 6fd0aced..fed2e9cc 100644
--- a/conf/cmi/language/fi/views.view.locked_services.yml
+++ b/conf/cmi/language/fi/views.view.locked_services.yml
@@ -4,6 +4,10 @@ display:
     display_title: Oletus
     display_options:
       title: 'Lukitut palvelut'
+      pager:
+        options:
+          tags: {  }
+          expose: {  }
       exposed_form:
         options:
           submit_button: Käytä
diff --git a/conf/cmi/language/fi/views.view.locked_units.yml b/conf/cmi/language/fi/views.view.locked_units.yml
index 8c851064..f20bc8c1 100644
--- a/conf/cmi/language/fi/views.view.locked_units.yml
+++ b/conf/cmi/language/fi/views.view.locked_units.yml
@@ -4,6 +4,10 @@ display:
     display_title: Oletus
     display_options:
       title: 'Lukitut toimipisteet'
+      pager:
+        options:
+          tags: {  }
+          expose: {  }
       exposed_form:
         options:
           submit_button: Käytä
diff --git a/conf/cmi/language/sv/system.action.tpr_errand_service_update_action.yml b/conf/cmi/language/sv/system.action.tpr_errand_service_update_action.yml
new file mode 100644
index 00000000..808e4ef3
--- /dev/null
+++ b/conf/cmi/language/sv/system.action.tpr_errand_service_update_action.yml
@@ -0,0 +1 @@
+label: Uppdatera
diff --git a/conf/cmi/system.action.tpr_errand_service_update_action.yml b/conf/cmi/system.action.tpr_errand_service_update_action.yml
new file mode 100644
index 00000000..a03bd062
--- /dev/null
+++ b/conf/cmi/system.action.tpr_errand_service_update_action.yml
@@ -0,0 +1,11 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - helfi_tpr
+    - helfi_api_base
+id: tpr_errand_service_update_action
+label: Update
+type: tpr_errand_service
+plugin: 'remote_entity:migration_update:tpr_errand_service'
+configuration: {  }

From 9266955b9d3c547773bf6f4b05cf0e9401f806d8 Mon Sep 17 00:00:00 2001
From: actions-bot <actions-bot@users.noreply.github.com>
Date: Fri, 18 Mar 2022 09:47:20 +0000
Subject: [PATCH 7/9] Update configuration

---
 composer.lock                                 | 65 +++++++++----------
 conf/cmi/hdbt_admin_tools.site_settings.yml   |  2 +-
 .../fi/hdbt_admin_tools.site_settings.yml     |  2 +-
 .../fi/views.view.locked_services.yml         |  4 --
 .../sv/hdbt_admin_tools.site_settings.yml     |  2 +-
 conf/cmi/simple_sitemap.sitemap.default.yml   | 11 ++++
 .../simple_sitemap.type.default_hreflang.yml  | 13 ++++
 ...mple_sitemap.variants.default_hreflang.yml |  6 --
 docker-compose.yml                            |  1 +
 public/sites/default/settings.php             |  9 +++
 tools/make/project/install.mk                 | 16 ++---
 11 files changed, 76 insertions(+), 55 deletions(-)
 create mode 100644 conf/cmi/simple_sitemap.sitemap.default.yml
 create mode 100644 conf/cmi/simple_sitemap.type.default_hreflang.yml
 delete mode 100644 conf/cmi/simple_sitemap.variants.default_hreflang.yml

diff --git a/composer.lock b/composer.lock
index adcf5797..16582040 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3906,16 +3906,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "2.2.14",
+            "version": "2.2.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "91eea1dea74372bf3e6d730ccfd03994f8397065"
+                "reference": "d017cc30ec7bce75feda4ef914e5b5c47d708b62"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/91eea1dea74372bf3e6d730ccfd03994f8397065",
-                "reference": "91eea1dea74372bf3e6d730ccfd03994f8397065",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d017cc30ec7bce75feda4ef914e5b5c47d708b62",
+                "reference": "d017cc30ec7bce75feda4ef914e5b5c47d708b62",
                 "shasum": ""
             },
             "require": {
@@ -3930,10 +3930,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/2.2.14",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/2.2.15",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2022-03-16T07:39:17+00:00"
+            "time": "2022-03-17T15:59:24+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
@@ -4076,12 +4076,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-tools.git",
-                "reference": "c2a1d0d02d85648987036ed0ec46d67963211325"
+                "reference": "b4ac99b58379a30b414aa0f8f3d64cd0b9461c6a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/c2a1d0d02d85648987036ed0ec46d67963211325",
-                "reference": "c2a1d0d02d85648987036ed0ec46d67963211325",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/b4ac99b58379a30b414aa0f8f3d64cd0b9461c6a",
+                "reference": "b4ac99b58379a30b414aa0f8f3d64cd0b9461c6a",
                 "shasum": ""
             },
             "default-branch": true,
@@ -4094,7 +4094,7 @@
                 "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main",
                 "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues"
             },
-            "time": "2022-03-04T11:38:29+00:00"
+            "time": "2022-03-09T10:47:55+00:00"
         },
         {
             "name": "drupal/helfi_hauki",
@@ -4200,16 +4200,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "2.5.12",
+            "version": "2.5.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "c695b9b935ac790c5552367c686b89ec5f63ccbb"
+                "reference": "c06b23ee5f41cf0dab8adfe84525a6decbc66920"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c695b9b935ac790c5552367c686b89ec5f63ccbb",
-                "reference": "c695b9b935ac790c5552367c686b89ec5f63ccbb",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c06b23ee5f41cf0dab8adfe84525a6decbc66920",
+                "reference": "c06b23ee5f41cf0dab8adfe84525a6decbc66920",
                 "shasum": ""
             },
             "require": {
@@ -4256,7 +4256,7 @@
                 "drupal/scheduler": "^1.3",
                 "drupal/search_api": "^1.0",
                 "drupal/select2": "^1.12",
-                "drupal/simple_sitemap": "^3.0",
+                "drupal/simple_sitemap": "^4.1",
                 "drupal/siteimprove": "^1.11",
                 "drupal/social_media": "^1.8",
                 "drupal/token": "^1.9",
@@ -4307,23 +4307,23 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.5.12",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.5.13",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2022-03-16T13:12:04+00:00"
+            "time": "2022-03-18T07:47:47+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
-            "version": "2.1.0",
+            "version": "2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git",
-                "reference": "c28e56dc3224e840cd4a6cda6545576ba91a5d25"
+                "reference": "8033d630ddf4446aef570da8cd34c95512141552"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/c28e56dc3224e840cd4a6cda6545576ba91a5d25",
-                "reference": "c28e56dc3224e840cd4a6cda6545576ba91a5d25",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/8033d630ddf4446aef570da8cd34c95512141552",
+                "reference": "8033d630ddf4446aef570da8cd34c95512141552",
                 "shasum": ""
             },
             "require": {
@@ -4345,10 +4345,10 @@
             ],
             "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.1.0",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.1.2",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues"
             },
-            "time": "2022-02-21T05:37:54+00:00"
+            "time": "2022-03-16T11:39:34+00:00"
         },
         {
             "name": "drupal/helfi_tpr",
@@ -5847,27 +5847,27 @@
         },
         {
             "name": "drupal/simple_sitemap",
-            "version": "3.11.0",
+            "version": "4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/simple_sitemap.git",
-                "reference": "8.x-3.11"
+                "reference": "4.1.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/simple_sitemap-8.x-3.11.zip",
-                "reference": "8.x-3.11",
-                "shasum": "5fdd4ed5af5e37e3c707e401d094a179f52e7711"
+                "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.1.zip",
+                "reference": "4.1.1",
+                "shasum": "ac23939364505d2e6b9d8c741b306c1b84059dfc"
             },
             "require": {
-                "drupal/core": "^8 || ^9",
+                "drupal/core": "^8.7.7 || ^9",
                 "ext-xmlwriter": "*"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-3.11",
-                    "datestamp": "1634344305",
+                    "version": "4.1.1",
+                    "datestamp": "1645003699",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5899,8 +5899,7 @@
             "homepage": "https://drupal.org/project/simple_sitemap",
             "support": {
                 "source": "https://cgit.drupalcode.org/simple_sitemap",
-                "issues": "https://drupal.org/project/issues/simple_sitemap",
-                "irc": "irc://irc.freenode.org/drupal-contribute"
+                "issues": "https://drupal.org/project/issues/simple_sitemap"
             }
         },
         {
diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml
index 3ad7c944..fc2027db 100644
--- a/conf/cmi/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/hdbt_admin_tools.site_settings.yml
@@ -4,7 +4,7 @@ langcode: en
 site_settings:
   default_icon: star-fill
   theme_color: gold
-  koro: basic
+  koro: vibration
 footer_settings:
   footer_color: dark
   footer_top_title: 'Contact us'
diff --git a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
index 81ac4507..3225c8c9 100644
--- a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
@@ -1,7 +1,7 @@
 site_settings:
   theme_color: gold
   default_icon: star-fill
-  koro: basic
+  koro: vibration
 footer_settings:
   footer_top_content:
     value: "<ul class=\"menu\">\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Kaupungin neuvonta – Helsinki-info\" data-protocol=\"false\" href=\"https://www.hel.fi/kanslia/neuvonta-fi/\">Kaupungin neuvonta – Helsinki-info</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Hae yhteystietoja ja numeroita\" data-protocol=\"false\" href=\"https://numerot.hel.fi/\">Hae yhteystietoja ja numeroita</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Anna palautetta\" data-protocol=\"false\" href=\"https://www.hel.fi/palaute\">Anna palautetta</a></li>\r\n</ul>\r\n"
diff --git a/conf/cmi/language/fi/views.view.locked_services.yml b/conf/cmi/language/fi/views.view.locked_services.yml
index fed2e9cc..6fd0aced 100644
--- a/conf/cmi/language/fi/views.view.locked_services.yml
+++ b/conf/cmi/language/fi/views.view.locked_services.yml
@@ -4,10 +4,6 @@ display:
     display_title: Oletus
     display_options:
       title: 'Lukitut palvelut'
-      pager:
-        options:
-          tags: {  }
-          expose: {  }
       exposed_form:
         options:
           submit_button: Käytä
diff --git a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
index 820ef232..38255258 100644
--- a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
@@ -1,7 +1,7 @@
 site_settings:
   theme_color: gold
   default_icon: star-fill
-  koro: basic
+  koro: vibration
 footer_settings:
   footer_top_content:
     value: "<ul class=\"menu\">\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Helsingfors-info\" data-protocol=\"false\" href=\"https://www.hel.fi/kanslia/neuvonta-sv/\">Helsingfors-info</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Sök kontaktuppgifter och telefonnummer\" data-protocol=\"false\" href=\"https://numerot.hel.fi/\">Sök kontaktuppgifter och telefonnummer</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Ge respons\" data-protocol=\"false\" href=\"https://www.hel.fi/respons/\">Ge respons</a></li>\r\n</ul>\r\n"
diff --git a/conf/cmi/simple_sitemap.sitemap.default.yml b/conf/cmi/simple_sitemap.sitemap.default.yml
new file mode 100644
index 00000000..50dff28f
--- /dev/null
+++ b/conf/cmi/simple_sitemap.sitemap.default.yml
@@ -0,0 +1,11 @@
+uuid: d1ace091-0157-4d87-949a-ab4154d3ee48
+langcode: fi
+status: true
+dependencies:
+  config:
+    - simple_sitemap.type.default_hreflang
+id: default
+label: Default
+description: null
+type: default_hreflang
+weight: 0
diff --git a/conf/cmi/simple_sitemap.type.default_hreflang.yml b/conf/cmi/simple_sitemap.type.default_hreflang.yml
new file mode 100644
index 00000000..f3e990d1
--- /dev/null
+++ b/conf/cmi/simple_sitemap.type.default_hreflang.yml
@@ -0,0 +1,13 @@
+uuid: b9c88e0d-b915-421f-ae9e-ac221120b5d5
+langcode: fi
+status: true
+dependencies: {  }
+id: default_hreflang
+label: 'Default hreflang'
+description: 'The default hreflang sitemap type.'
+sitemap_generator: default
+url_generators:
+  - custom
+  - entity
+  - entity_menu_link_content
+  - arbitrary
diff --git a/conf/cmi/simple_sitemap.variants.default_hreflang.yml b/conf/cmi/simple_sitemap.variants.default_hreflang.yml
deleted file mode 100644
index 0a36e893..00000000
--- a/conf/cmi/simple_sitemap.variants.default_hreflang.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-_core:
-  default_config_hash: nQAXscP-SDpsmqHlQ6u0iBvcuJPrAikb09c3cP2_n0k
-variants:
-  default:
-    label: Default
-    weight: 0
diff --git a/docker-compose.yml b/docker-compose.yml
index 7a87e3c9..bfb4bcf8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,6 +22,7 @@ services:
       # permission issues.
       SIMPLETEST_BASE_URL: "http://127.0.0.1:8888"
       SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal"
+      BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}"
       DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish"
       DRUPAL_VARNISH_PORT: 6081
       REDIS_HOST: redis
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
index 2095f1b5..4ea4aa9d 100644
--- a/public/sites/default/settings.php
+++ b/public/sites/default/settings.php
@@ -189,6 +189,15 @@
   $config['stage_file_proxy.settings']['use_imagecache_root'] = FALSE;
 }
 
+// Override session suffix when present.
+if ($session_suffix = getenv('DRUPAL_SESSION_SUFFIX')) {
+  $config['helfi_proxy.settings']['session_suffix'] = $session_suffix;
+}
+
+if ($robots_header_enabled = getenv('DRUPAL_X_ROBOTS_TAG_HEADER')) {
+  $config['helfi_proxy.settings']['robots_header_enabled'] = (bool) $robots_header_enabled;
+}
+
 if (
   ($redis_host = getenv('REDIS_HOST')) &&
   file_exists('modules/contrib/redis/example.services.yml') &&
diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk
index 1371118d..857117d3 100644
--- a/tools/make/project/install.mk
+++ b/tools/make/project/install.mk
@@ -1,11 +1,9 @@
-ifeq ($(DRUPAL_VERSION),8)
-	ifeq ($(DRUPAL_CONF_EXISTS),yes)
-	    DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-uli
-	else
-	    DRUPAL_NEW_TARGETS := up build drush-si drush-enable-modules drush-locale-update drush-uli
-	endif
-    DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-uli
+ifeq ($(DRUPAL_CONF_EXISTS),yes)
+	DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-uli
+else
+	DRUPAL_NEW_TARGETS := up build drush-si helfi-drush-enable-modules drush-locale-update drush-uli
 endif
+DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-uli
 
 OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token')
 SYNC_TARGETS := oc-login oc-sync
@@ -23,8 +21,8 @@ oc-sync:
 	$(call drush,cim -y)
 	$(call drush,cr)
 
-PHONY += drush-enable-modules
-drush-enable-modules: ## Enable modules and base configurations.
+PHONY += helfi-drush-enable-modules
+helfi-drush-enable-modules: ## Enable modules and base configurations.
 	$(call step,Install base configurations...)
 	$(call drush,cr)
 	$(call drush,en -y helfi_platform_config helfi_base_config)

From b8f6ef124138c93ab5e45dbfd30dee775ffb0c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Risto-Pekka=20Nyka=CC=88nen?= <risto.nykanen@druid.fi>
Date: Fri, 18 Mar 2022 15:40:15 +0200
Subject: [PATCH 8/9] updated simple sitemap site specific configuration

---
 ...undle_settings.default.menu_link_content.main.yml |  4 ++++
 ...map.bundle_settings.default.node.landing_page.yml |  4 ++++
 ...itemap.bundle_settings.default.node.news_item.yml |  4 ++++
 ...ple_sitemap.bundle_settings.default.node.page.yml |  4 ++++
 ...ndle_settings.default.tpr_service.tpr_service.yml |  4 ++++
 ...map.bundle_settings.default.tpr_unit.tpr_unit.yml |  4 ++++
 conf/cmi/simple_sitemap.custom_links.default.yml     |  7 -------
 conf/cmi/simple_sitemap.settings.yml                 | 12 +++++++-----
 8 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml
 create mode 100644 conf/cmi/simple_sitemap.bundle_settings.default.node.landing_page.yml
 create mode 100644 conf/cmi/simple_sitemap.bundle_settings.default.node.news_item.yml
 create mode 100644 conf/cmi/simple_sitemap.bundle_settings.default.node.page.yml
 create mode 100644 conf/cmi/simple_sitemap.bundle_settings.default.tpr_service.tpr_service.yml
 create mode 100644 conf/cmi/simple_sitemap.bundle_settings.default.tpr_unit.tpr_unit.yml
 delete mode 100644 conf/cmi/simple_sitemap.custom_links.default.yml

diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml b/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml
new file mode 100644
index 00000000..8e55877d
--- /dev/null
+++ b/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.node.landing_page.yml b/conf/cmi/simple_sitemap.bundle_settings.default.node.landing_page.yml
new file mode 100644
index 00000000..8e55877d
--- /dev/null
+++ b/conf/cmi/simple_sitemap.bundle_settings.default.node.landing_page.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.node.news_item.yml b/conf/cmi/simple_sitemap.bundle_settings.default.node.news_item.yml
new file mode 100644
index 00000000..8e55877d
--- /dev/null
+++ b/conf/cmi/simple_sitemap.bundle_settings.default.node.news_item.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.node.page.yml b/conf/cmi/simple_sitemap.bundle_settings.default.node.page.yml
new file mode 100644
index 00000000..8e55877d
--- /dev/null
+++ b/conf/cmi/simple_sitemap.bundle_settings.default.node.page.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.tpr_service.tpr_service.yml b/conf/cmi/simple_sitemap.bundle_settings.default.tpr_service.tpr_service.yml
new file mode 100644
index 00000000..8e55877d
--- /dev/null
+++ b/conf/cmi/simple_sitemap.bundle_settings.default.tpr_service.tpr_service.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.tpr_unit.tpr_unit.yml b/conf/cmi/simple_sitemap.bundle_settings.default.tpr_unit.tpr_unit.yml
new file mode 100644
index 00000000..8e55877d
--- /dev/null
+++ b/conf/cmi/simple_sitemap.bundle_settings.default.tpr_unit.tpr_unit.yml
@@ -0,0 +1,4 @@
+index: true
+priority: '0.5'
+changefreq: ''
+include_images: false
diff --git a/conf/cmi/simple_sitemap.custom_links.default.yml b/conf/cmi/simple_sitemap.custom_links.default.yml
deleted file mode 100644
index 18a8d459..00000000
--- a/conf/cmi/simple_sitemap.custom_links.default.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-_core:
-  default_config_hash: 25hWeYa4sasuJtHqKKcEN_nYiuEC1lMPYHsn5dawJEw
-links:
-  -
-    path: /
-    priority: '1.0'
-    changefreq: daily
diff --git a/conf/cmi/simple_sitemap.settings.yml b/conf/cmi/simple_sitemap.settings.yml
index 6798cd26..097873a4 100644
--- a/conf/cmi/simple_sitemap.settings.yml
+++ b/conf/cmi/simple_sitemap.settings.yml
@@ -1,18 +1,20 @@
 _core:
   default_config_hash: fFCOUWimqdj2E7qYCcYmI2LH7rwpaLEUOfi69hUFuXk
-max_links: 2000
+max_links: 10000
 cron_generate: true
-cron_generate_interval: 0
+cron_generate_interval: 24
 generate_duration: 10000
 remove_duplicates: true
 skip_untranslated: true
-xsl: true
+disable_language_hreflang: false
+xsl: false
 base_url: ''
 default_variant: default
 custom_links_include_images: false
 excluded_languages: {  }
 enabled_entity_types:
   - node
-  - taxonomy_term
   - menu_link_content
-entities_per_queue_item: 50
+  - tpr_service
+  - tpr_unit
+entities_per_queue_item: 100

From 48af3f3d5379a7f4323bf497dfed3d3130fac5fe Mon Sep 17 00:00:00 2001
From: actions-bot <actions-bot@users.noreply.github.com>
Date: Mon, 21 Mar 2022 11:45:09 +0000
Subject: [PATCH 9/9] Update configuration

---
 composer.lock                                 | 63 ++++++++++---------
 conf/cmi/filter.format.full_html.yml          |  2 +-
 conf/cmi/filter.format.minimal.yml            |  2 +-
 conf/cmi/hdbt_admin_tools.site_settings.yml   |  2 +-
 .../fi/hdbt_admin_tools.site_settings.yml     |  1 -
 .../sv/hdbt_admin_tools.site_settings.yml     |  1 -
 ...ction.tpr_errand_service_update_action.yml |  1 +
 7 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/composer.lock b/composer.lock
index 16582040..bb6760d3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3906,16 +3906,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "2.2.15",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "d017cc30ec7bce75feda4ef914e5b5c47d708b62"
+                "reference": "b2dab6d61b68fd023292d69f8d7dc5b03035f59a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d017cc30ec7bce75feda4ef914e5b5c47d708b62",
-                "reference": "d017cc30ec7bce75feda4ef914e5b5c47d708b62",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b2dab6d61b68fd023292d69f8d7dc5b03035f59a",
+                "reference": "b2dab6d61b68fd023292d69f8d7dc5b03035f59a",
                 "shasum": ""
             },
             "require": {
@@ -3930,23 +3930,23 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/2.2.15",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/2.3.0",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2022-03-17T15:59:24+00:00"
+            "time": "2022-03-21T11:38:20+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
-            "version": "1.4.11",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git",
-                "reference": "2e90ab01c7c808ac6f3c35ca50aea49726e170b4"
+                "reference": "0bb7819c2df3a8cbd1042b9b3a01d69735d5f79d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/2e90ab01c7c808ac6f3c35ca50aea49726e170b4",
-                "reference": "2e90ab01c7c808ac6f3c35ca50aea49726e170b4",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/0bb7819c2df3a8cbd1042b9b3a01d69735d5f79d",
+                "reference": "0bb7819c2df3a8cbd1042b9b3a01d69735d5f79d",
                 "shasum": ""
             },
             "require": {
@@ -3962,10 +3962,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.4.11",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.5.0",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues"
             },
-            "time": "2022-03-16T11:19:51+00:00"
+            "time": "2022-03-21T11:37:37+00:00"
         },
         {
             "name": "drupal/helfi_ahjo",
@@ -4002,16 +4002,16 @@
         },
         {
             "name": "drupal/helfi_api_base",
-            "version": "2.1.7",
+            "version": "2.1.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
-                "reference": "46ea948294f69aaf70aae0d086b3f4c797576a53"
+                "reference": "b4646c6051ba64603c5274052409e3ec53d7083a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/46ea948294f69aaf70aae0d086b3f4c797576a53",
-                "reference": "46ea948294f69aaf70aae0d086b3f4c797576a53",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/b4646c6051ba64603c5274052409e3ec53d7083a",
+                "reference": "b4646c6051ba64603c5274052409e3ec53d7083a",
                 "shasum": ""
             },
             "require": {
@@ -4033,10 +4033,10 @@
             ],
             "description": "Helfi - API Base",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.1.7",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.1.8",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
             },
-            "time": "2022-03-15T07:26:51+00:00"
+            "time": "2022-03-21T09:13:08+00:00"
         },
         {
             "name": "drupal/helfi_azure_fs",
@@ -4200,16 +4200,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "2.5.13",
+            "version": "2.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "c06b23ee5f41cf0dab8adfe84525a6decbc66920"
+                "reference": "5ba17f53a86c4b77f5a9f58fe653ee259d5a828b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c06b23ee5f41cf0dab8adfe84525a6decbc66920",
-                "reference": "c06b23ee5f41cf0dab8adfe84525a6decbc66920",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/5ba17f53a86c4b77f5a9f58fe653ee259d5a828b",
+                "reference": "5ba17f53a86c4b77f5a9f58fe653ee259d5a828b",
                 "shasum": ""
             },
             "require": {
@@ -4275,7 +4275,8 @@
                         "[#UHF-181] Hide untranslated menu links": "https://www.drupal.org/files/issues/2021-03-05/3091246-allow-menu-tree-manipulators-alter-12-1.patch",
                         "[#UHF-920] Token for base URL (https://www.drupal.org/project/drupal/issues/1088112).": "https://www.drupal.org/files/issues/2020-10-06/1088112-63.patch",
                         "[#UHF-3812] Ajax exposed filters not working for multiple instances of the same Views block placed on one page (https://www.drupal.org/project/drupal/issues/3163299).": "https://www.drupal.org/files/issues/2022-01-03/3163299-49.patch",
-                        "[#UHF-3087] Non-published menu links as parent (https://www.drupal.org/project/drupal/issues/2807629)": "https://www.drupal.org/files/issues/2021-07-09/2807629-45.patch"
+                        "[#UHF-3087] Non-published menu links as parent (https://www.drupal.org/project/drupal/issues/2807629)": "https://www.drupal.org/files/issues/2021-07-09/2807629-45.patch",
+                        "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/f7c0e380e2deb9a1b46bdf779fb27a945b466575/patches/drupal_core_strip_debug_mode_whitespaces_9.3.x.patch"
                     },
                     "drupal/default_content": {
                         "https://www.drupal.org/project/default_content/issues/2698425#comment-13809863": "https://www.drupal.org/files/issues/2020-09-02/default_content-integrity_constrait_violation-3162987-2.patch"
@@ -4307,10 +4308,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.5.13",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.6.0",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2022-03-18T07:47:47+00:00"
+            "time": "2022-03-21T11:39:10+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -4352,16 +4353,16 @@
         },
         {
             "name": "drupal/helfi_tpr",
-            "version": "2.0.4",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git",
-                "reference": "295407e9a61164580884ca7d2b68b4d23be4aec4"
+                "reference": "bf6d435b5b0d887d263078ad70cc5fdfd3563b61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/295407e9a61164580884ca7d2b68b4d23be4aec4",
-                "reference": "295407e9a61164580884ca7d2b68b4d23be4aec4",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/bf6d435b5b0d887d263078ad70cc5fdfd3563b61",
+                "reference": "bf6d435b5b0d887d263078ad70cc5fdfd3563b61",
                 "shasum": ""
             },
             "require": {
@@ -4383,10 +4384,10 @@
             ],
             "description": "TPR integration",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.0.4",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.0.5",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues"
             },
-            "time": "2022-03-15T09:26:12+00:00"
+            "time": "2022-03-18T10:46:31+00:00"
         },
         {
             "name": "drupal/helfi_tunnistamo",
diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml
index ca635027..21761dca 100644
--- a/conf/cmi/filter.format.full_html.yml
+++ b/conf/cmi/filter.format.full_html.yml
@@ -26,7 +26,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-icon data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <span role aria-* class="">'
+      allowed_html: '<em> <strong> <cite> <blockquote role aria-* cite class=""> <code> <ul type class=""> <ol start type> <li class=""> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p class=""> <footer class=""> <br> <div role aria-* class=""> <img src alt height width data-entity-type data-entity-uuid data-align data-caption data-responsive-image-style> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""> <pre> <s> <sup> <sub> <table> <caption> <tbody> <thead> <tfoot> <th> <td> <tr> <hr> <span role aria-* class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/conf/cmi/filter.format.minimal.yml b/conf/cmi/filter.format.minimal.yml
index ccc5239a..ce23d530 100644
--- a/conf/cmi/filter.format.minimal.yml
+++ b/conf/cmi/filter.format.minimal.yml
@@ -42,7 +42,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-icon data-protocol class="">'
+      allowed_html: '<em> <strong> <ul type> <ol start type> <li> <p class=""> <a href hreflang !href accesskey id rel target title data-design data-link-text data-selected-icon data-is-external data-protocol class=""><span role aria-* class="">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml
index fc2027db..3ad7c944 100644
--- a/conf/cmi/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/hdbt_admin_tools.site_settings.yml
@@ -4,7 +4,7 @@ langcode: en
 site_settings:
   default_icon: star-fill
   theme_color: gold
-  koro: vibration
+  koro: basic
 footer_settings:
   footer_color: dark
   footer_top_title: 'Contact us'
diff --git a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
index 3225c8c9..cc820284 100644
--- a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml
@@ -1,7 +1,6 @@
 site_settings:
   theme_color: gold
   default_icon: star-fill
-  koro: vibration
 footer_settings:
   footer_top_content:
     value: "<ul class=\"menu\">\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Kaupungin neuvonta – Helsinki-info\" data-protocol=\"false\" href=\"https://www.hel.fi/kanslia/neuvonta-fi/\">Kaupungin neuvonta – Helsinki-info</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Hae yhteystietoja ja numeroita\" data-protocol=\"false\" href=\"https://numerot.hel.fi/\">Hae yhteystietoja ja numeroita</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Anna palautetta\" data-protocol=\"false\" href=\"https://www.hel.fi/palaute\">Anna palautetta</a></li>\r\n</ul>\r\n"
diff --git a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
index 38255258..b9c994fd 100644
--- a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
+++ b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml
@@ -1,7 +1,6 @@
 site_settings:
   theme_color: gold
   default_icon: star-fill
-  koro: vibration
 footer_settings:
   footer_top_content:
     value: "<ul class=\"menu\">\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Helsingfors-info\" data-protocol=\"false\" href=\"https://www.hel.fi/kanslia/neuvonta-sv/\">Helsingfors-info</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Sök kontaktuppgifter och telefonnummer\" data-protocol=\"false\" href=\"https://numerot.hel.fi/\">Sök kontaktuppgifter och telefonnummer</a></li>\r\n\t<li class=\"menu__item menu__item--external\"><a class=\"link\" data-design=\"link\" data-link-text=\"Ge respons\" data-protocol=\"false\" href=\"https://www.hel.fi/respons/\">Ge respons</a></li>\r\n</ul>\r\n"
diff --git a/conf/cmi/system.action.tpr_errand_service_update_action.yml b/conf/cmi/system.action.tpr_errand_service_update_action.yml
index a03bd062..c6e199d0 100644
--- a/conf/cmi/system.action.tpr_errand_service_update_action.yml
+++ b/conf/cmi/system.action.tpr_errand_service_update_action.yml
@@ -1,3 +1,4 @@
+uuid: e21004c6-6044-4c59-ae34-205cf44ff9ac
 langcode: en
 status: true
 dependencies: