Hydro reload error (#973)

swisstopo · Jan 22, 2024 · f371fb6 · f371fb6
2 parents 5f331fe + 50ef193
commit f371fb6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git 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

diff --git 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(

diff --git 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)}
               />
             )}
           />