From 57cf5804b64dceed68b8e25e9c4270ec54cb85b4 Mon Sep 17 00:00:00 2001
From: Frederic Stahel <frederic.stahel@geowerkstatt.ch>
Date: Mon, 22 Jan 2024 07:03:39 +0100
Subject: [PATCH 1/3] Use borehole id from url as input for hydrogeology
 components

---
 src/client/src/commons/form/borehole/boreholeForm.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/client/src/commons/form/borehole/boreholeForm.js b/src/client/src/commons/form/borehole/boreholeForm.js
index 37000c8fb..6f0ef7508 100644
--- a/src/client/src/commons/form/borehole/boreholeForm.js
+++ b/src/client/src/commons/form/borehole/boreholeForm.js
@@ -406,7 +406,7 @@ class BoreholeForm extends React.Component {
             render={() => (
               <WaterIngress
                 isEditable={isEditable}
-                boreholeId={borehole.data.id}
+                boreholeId={parseInt(this.props.match.params.id, 10)}
               />
             )}
           />
@@ -419,7 +419,7 @@ class BoreholeForm extends React.Component {
             render={() => (
               <GroundwaterLevelMeasurement
                 isEditable={isEditable}
-                boreholeId={borehole.data.id}
+                boreholeId={parseInt(this.props.match.params.id, 10)}
               />
             )}
           />
@@ -432,7 +432,7 @@ class BoreholeForm extends React.Component {
             render={() => (
               <FieldMeasurement
                 isEditable={isEditable}
-                boreholeId={borehole.data.id}
+                boreholeId={parseInt(this.props.match.params.id, 10)}
               />
             )}
           />
@@ -442,7 +442,7 @@ class BoreholeForm extends React.Component {
             render={() => (
               <Hydrotest
                 isEditable={isEditable}
-                boreholeId={borehole.data.id}
+                boreholeId={parseInt(this.props.match.params.id, 10)}
               />
             )}
           />
@@ -455,7 +455,7 @@ class BoreholeForm extends React.Component {
             render={() => (
               <GroundwaterLevelMeasurement
                 isEditable={isEditable}
-                boreholeId={borehole.data.id}
+                boreholeId={parseInt(this.props.match.params.id, 10)}
               />
             )}
           />

From 60faac559872c50c72f70d0fb3b07f06be7e5c56 Mon Sep 17 00:00:00 2001
From: Frederic Stahel <frederic.stahel@geowerkstatt.ch>
Date: Mon, 22 Jan 2024 07:05:37 +0100
Subject: [PATCH 2/3] Update changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae7a73f2f..dad618c04 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@
 - Removed the functionality to edit user details (first name, surname and password) since they are now managed by the IAM.
 - Removed middle name from user details because it was not used until now.
 
+### Fixed
+
+- Ensure hydrogeology components are loaded properly when refreshed.
+
 ## v2.0.506 - 2023-12-21
 
 ### Added

From 631218277a7d57ac4884fc6899cdc8d114b6c3be Mon Sep 17 00:00:00 2001
From: Frederic Stahel <frederic.stahel@geowerkstatt.ch>
Date: Mon, 22 Jan 2024 08:16:44 +0100
Subject: [PATCH 3/3] Improve flaky display layer test

---
 src/client/cypress/e2e/viewer/displayLayer.cy.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/cypress/e2e/viewer/displayLayer.cy.js b/src/client/cypress/e2e/viewer/displayLayer.cy.js
index c151c6303..e088900a1 100644
--- a/src/client/cypress/e2e/viewer/displayLayer.cy.js
+++ b/src/client/cypress/e2e/viewer/displayLayer.cy.js
@@ -142,7 +142,7 @@ describe("Test for the borehole form.", () => {
 
     // Click on layer
     cy.get('[data-cy="stratigraphy-layer-0"]').scrollIntoView();
-    cy.get('[data-cy="stratigraphy-layer-0"]').click();
+    cy.get('[data-cy="stratigraphy-layer-0"]').click({ force: true });
 
     // Three detail rows are displayed - two by default plus one that was selected as default field.
     cy.get('[data-cy="stratigraphy-layer-details"] h6').should(