Remove obsolete getStratigraphiesByBorehole function (#882)

swisstopo · Dec 7, 2023 · d818ac4 · d818ac4
2 parents b43c76a + fcee1a9
commit d818ac4
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 313 deletions.
diff --git a/src/api-legacy/__init__.py b/src/api-legacy/__init__.py
@@ -35,7 +35,6 @@
 from bms.v1.borehole.identifier import IdentifierViewerHandler
 
 # Stratigraphy's ACTION Handlers
-from bms.v1.borehole.stratigraphy.viewer import StratigraphyViewerHandler
 from bms.v1.borehole.stratigraphy.producer import StratigraphyProducerHandler
 
 # Profiles's ACTION Handlers

diff --git a/src/api-legacy/main.py b/src/api-legacy/main.py
@@ -141,7 +141,6 @@ async def close(application):
         IdentifierViewerHandler,
 
         # Stratigraphy handlers
-        StratigraphyViewerHandler,
         StratigraphyProducerHandler,
 
         # Layer handlers
@@ -220,7 +219,6 @@ async def close(application):
         (r'/api/v1/feedback', FeedbackHandler),
 
         # Stratigraphy handlers (will be deprecated)
-        (r'/api/v1/borehole/stratigraphy', StratigraphyViewerHandler),
         (r'/api/v1/borehole/stratigraphy/edit', StratigraphyProducerHandler),
 
         # Layer handlers (will be deprecated)

diff --git a/src/api-legacy/v1/borehole/stratigraphy/__init__.py b/src/api-legacy/v1/borehole/stratigraphy/__init__.py
@@ -2,7 +2,6 @@
 
 # Actions
 from bms.v1.borehole.stratigraphy.addbedrock import AddBedrock
-from bms.v1.borehole.stratigraphy.list import ListStratigraphies
 from bms.v1.borehole.stratigraphy.create import CreateStratigraphy
 from bms.v1.borehole.stratigraphy.delete import DeleteStratigraphy
 from bms.v1.borehole.stratigraphy.clone import CloneStratigraphy

diff --git a/src/api-legacy/v1/borehole/stratigraphy/list.py b/src/api-legacy/v1/borehole/stratigraphy/list.py
diff --git a/src/api-legacy/v1/borehole/stratigraphy/viewer.py b/src/api-legacy/v1/borehole/stratigraphy/viewer.py
diff --git a/src/client/src/api-lib/actions/stratigraphy.js b/src/client/src/api-lib/actions/stratigraphy.js
@@ -1,14 +1,5 @@
 import { fetch } from "./index";
 
-export function getStratigraphiesByBorehole(id) {
-  return fetch("/borehole/stratigraphy", {
-    action: "LIST",
-    filter: {
-      borehole: id,
-    },
-  });
-}
-
 // Create a new stratigraphy for the given borehole id
 export function createStratigraphy(id, kind = null) {
   return fetch("/borehole/stratigraphy/edit", {

diff --git a/src/client/src/api-lib/index.js b/src/client/src/api-lib/index.js
@@ -76,7 +76,6 @@ import {
 } from "./actions/workflow";
 
 import {
-  getStratigraphiesByBorehole,
   createStratigraphy,
   deleteStratigraphy,
   addBedrock,
@@ -165,7 +164,6 @@ export {
   submitWorkflow,
   rejectWorkflow,
   resetWorkflow,
-  getStratigraphiesByBorehole,
   createStratigraphy,
   deleteStratigraphy,
   addBedrock,

diff --git a/src/client/src/commons/detail/detailsComponent.js b/src/client/src/commons/detail/detailsComponent.js
@@ -239,10 +239,7 @@ class DetailsComponent extends React.Component {
                 paddingBottom: "1em",
                 overflowY: "hidden",
               }}>
-              <StratigraphiesComponent
-                data={detail}
-                stratigraphies={detail.stratigraphies}
-              />
+              <StratigraphiesComponent data={detail} />
             </div>,
           ]
         ) : detail.isFetching === true ? (

diff --git a/src/client/src/commons/detail/detailsContainer.js b/src/client/src/commons/detail/detailsContainer.js
@@ -4,21 +4,19 @@ import { connect } from "react-redux";
 import _ from "lodash";
 import DetailsComponent from "./detailsComponent";
 
-import { getBorehole, getStratigraphiesByBorehole } from "../../api-lib/index";
+import { getBorehole } from "../../api-lib/index";
 
 class DetailsContainer extends React.Component {
   componentDidMount() {
     const { id } = this.props;
     if (!_.isNil(id)) {
       this.props.getBorehole(id);
-      // this.props.getStratigraphiesByBorehole(id);
     }
   }
   componentDidUpdate(prevProps) {
     const { id, detail } = this.props;
     if (detail.borehole !== null && id !== null && detail.borehole.id !== id) {
       this.props.getBorehole(id);
-      // this.props.getStratigraphiesByBorehole(id);
     } else if (detail.error !== null) {
     }
   }
@@ -38,7 +36,6 @@ DetailsContainer.propTypes = {
   detail: PropTypes.object,
   domains: PropTypes.object,
   getBorehole: PropTypes.func,
-  getStratigraphiesByBorehole: PropTypes.func,
   id: PropTypes.number,
 };
 
@@ -71,23 +68,6 @@ const mapDispatchToProps = dispatch => {
                 type: "GETBOREHOLEDETAILS_OK",
                 borehole: response.data.data,
               });
-              getStratigraphiesByBorehole(id)
-                .then(function (response) {
-                  if (response.data.success) {
-                    dispatch({
-                      type: "GET_BOREHOLE_STRATIGRAPHIES_OK",
-                      stratigraphies: response.data.data,
-                    });
-                  } else {
-                    dispatch({
-                      type: "GET_BOREHOLE_STRATIGRAPHIES_ERROR",
-                      message: response.message,
-                    });
-                  }
-                })
-                .catch(function (error) {
-                  console.log(error);
-                });
             } else {
               dispatch({
                 type: "GETBOREHOLEDETAILS_ERROR",
@@ -100,28 +80,6 @@ const mapDispatchToProps = dispatch => {
           });
       }
     },
-    getStratigraphiesByBorehole: id => {
-      dispatch({
-        type: "GET_BOREHOLE_STRATIGRAPHIES",
-      });
-      getStratigraphiesByBorehole(id)
-        .then(function (response) {
-          if (response.data.success) {
-            dispatch({
-              type: "GET_BOREHOLE_STRATIGRAPHIES_OK",
-              stratigraphies: response.data.data,
-            });
-          } else {
-            dispatch({
-              type: "GET_BOREHOLE_STRATIGRAPHIES_ERROR",
-              message: response.message,
-            });
-          }
-        })
-        .catch(function (error) {
-          console.log(error);
-        });
-    },
   };
 };