From c19d5c5f1a601b4037846ae3f6b442278bd0dedf Mon Sep 17 00:00:00 2001
From: hel-platta-automation
 <95360595+hel-platta-automation@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:07:51 +0000
Subject: [PATCH] Update configuration

---
 composer.lock                        | 62 ++++++++++++++--------------
 conf/cmi/raven.settings.yml          |  2 +-
 conf/cmi/user.role.anonymous.yml     |  2 +
 conf/cmi/user.role.authenticated.yml |  2 +
 public/sites/default/settings.php    |  5 +++
 5 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/composer.lock b/composer.lock
index 857d5092..5db2eb66 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4198,16 +4198,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "6.7.12",
+            "version": "6.7.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "84550be36284d8f8e12620710c942dd8d59d13ba"
+                "reference": "99b6c886eb568100f7a5e25305d2f299f834932f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/84550be36284d8f8e12620710c942dd8d59d13ba",
-                "reference": "84550be36284d8f8e12620710c942dd8d59d13ba",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/99b6c886eb568100f7a5e25305d2f299f834932f",
+                "reference": "99b6c886eb568100f7a5e25305d2f299f834932f",
                 "shasum": ""
             },
             "require": {
@@ -4226,10 +4226,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.12",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.14",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2024-10-17T07:58:13+00:00"
+            "time": "2024-10-18T10:29:43+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
@@ -4320,16 +4320,16 @@
         },
         {
             "name": "drupal/helfi_api_base",
-            "version": "2.7.9",
+            "version": "2.7.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git",
-                "reference": "189161e8d674072f0a345c45b93dd4c42896b52b"
+                "reference": "2327b07739cbead0d2e7d3482c074d717b786ba6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/189161e8d674072f0a345c45b93dd4c42896b52b",
-                "reference": "189161e8d674072f0a345c45b93dd4c42896b52b",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/2327b07739cbead0d2e7d3482c074d717b786ba6",
+                "reference": "2327b07739cbead0d2e7d3482c074d717b786ba6",
                 "shasum": ""
             },
             "require": {
@@ -4359,10 +4359,10 @@
             ],
             "description": "Helfi - API Base",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.9",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.10",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues"
             },
-            "time": "2024-10-10T08:24:13+00:00"
+            "time": "2024-10-18T12:57:18+00:00"
         },
         {
             "name": "drupal/helfi_azure_fs",
@@ -4534,16 +4534,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "4.6.16",
+            "version": "4.6.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "a34c636496d5795683b71867b847a8c33beded5f"
+                "reference": "83d83591264ec0da5d54b5da0db39764392c63ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a34c636496d5795683b71867b847a8c33beded5f",
-                "reference": "a34c636496d5795683b71867b847a8c33beded5f",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/83d83591264ec0da5d54b5da0db39764392c63ba",
+                "reference": "83d83591264ec0da5d54b5da0db39764392c63ba",
                 "shasum": ""
             },
             "require": {
@@ -4662,10 +4662,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.16",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.17",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2024-10-17T07:58:19+00:00"
+            "time": "2024-10-18T13:04:39+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -5208,17 +5208,17 @@
         },
         {
             "name": "drupal/linkit",
-            "version": "6.1.5",
+            "version": "6.1.6",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/linkit.git",
-                "reference": "6.1.5"
+                "reference": "6.1.6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/linkit-6.1.5.zip",
-                "reference": "6.1.5",
-                "shasum": "ce2e0f545e5213874e658a44ed3ef606b80b760d"
+                "url": "https://ftp.drupal.org/files/projects/linkit-6.1.6.zip",
+                "reference": "6.1.6",
+                "shasum": "113d8e569cfb92f8d7feb0a2f7713953c0715e92"
             },
             "require": {
                 "drupal/core": "^10.1"
@@ -5230,8 +5230,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "6.1.5",
-                    "datestamp": "1728680387",
+                    "version": "6.1.6",
+                    "datestamp": "1729189029",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -8874,16 +8874,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8"
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
-                "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
+                "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455",
                 "shasum": ""
             },
             "require": {
@@ -8937,7 +8937,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/2.0.3"
+                "source": "https://github.com/guzzle/promises/tree/2.0.4"
             },
             "funding": [
                 {
@@ -8953,7 +8953,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-18T10:29:17+00:00"
+            "time": "2024-10-17T10:06:22+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
diff --git a/conf/cmi/raven.settings.yml b/conf/cmi/raven.settings.yml
index 81ad5377..51a8298a 100644
--- a/conf/cmi/raven.settings.yml
+++ b/conf/cmi/raven.settings.yml
@@ -29,7 +29,7 @@ rate_limit: 0
 send_request_body: false
 request_tracing: true
 traces_sample_rate: 0.2
-browser_traces_sample_rate: null
+browser_traces_sample_rate: 0.2
 database_tracing: true
 twig_tracing: true
 auto_session_tracking: false
diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml
index 930b58d5..329eef74 100644
--- a/conf/cmi/user.role.anonymous.yml
+++ b/conf/cmi/user.role.anonymous.yml
@@ -9,6 +9,7 @@ dependencies:
     - external_entities
     - helfi_api_base
     - media
+    - raven
     - rest
     - system
 _core:
@@ -21,6 +22,7 @@ permissions:
   - 'access content'
   - 'display eu cookie compliance popup'
   - 'restful get helfi_global_mobile_menu'
+  - 'send javascript errors to sentry'
   - 'view helfi_announcements external entity'
   - 'view helfi_news external entity'
   - 'view helfi_news_groups external entity'
diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml
index d98100b5..7e38db2e 100644
--- a/conf/cmi/user.role.authenticated.yml
+++ b/conf/cmi/user.role.authenticated.yml
@@ -11,6 +11,7 @@ dependencies:
     - helfi_api_base
     - media
     - paragraphs
+    - raven
     - rest
     - system
     - tfa
@@ -28,6 +29,7 @@ permissions:
   - 'disable own tfa'
   - 'display eu cookie compliance popup'
   - 'restful get helfi_global_mobile_menu'
+  - 'send javascript errors to sentry'
   - 'setup own tfa'
   - 'view helfi_announcements external entity'
   - 'view helfi_news external entity'
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
index 872d57aa..2f8d1e8e 100755
--- a/public/sites/default/settings.php
+++ b/public/sites/default/settings.php
@@ -389,6 +389,11 @@ function drupal_get_env(string|array $variables) : mixed {
 $default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug';
 $settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level;
 
+// Turn sentry JS error tracking on if SENTRY_DSN_PUBLIC is defined.
+if (getenv('SENTRY_DSN_PUBLIC')) {
+  $config['raven.settings']['javascript_error_handler'] = TRUE;
+}
+
 /**
  * Deployment identifier.
  *