Skip to content

Commit

Permalink
Only load boreholes for valid feature ids
Browse files Browse the repository at this point in the history
  • Loading branch information
tschumpr committed Jul 31, 2024
1 parent 8f6e37c commit 164e70b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
- Users can now only import or add new boreholes to workgroups where they have an editor role.
- Label for description quality was wrong in lithology filter and settings.
- Boreholes could not be deleted in the detail view if the publication status was not `Change in progess`.
- Boreholes table loaded all boreholes instead of none when a filter combination with polygon was used that did not
return any boreholes.

## v2.1.772 - 2024-06-27

Expand Down
2 changes: 1 addition & 1 deletion src/client/src/commons/menu/mainView/mapView.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ class MapView extends React.Component {
direction: direction,
});
}}
featureIds={featureIds}
featureIds={filterPolygon ? featureIds : null}
sort={sort}
scrollPosition={this.state.tableScrollPosition}
onScrollChange={position => {
Expand Down
4 changes: 3 additions & 1 deletion src/client/src/commons/table/boreholeEditorTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,9 @@ const mapDispatchToProps = dispatch => {
});
},
loadData: (page, filter = {}, feature_ids = null, orderby = null, direction = null) => {
dispatch(loadEditingBoreholes(page, 100, filter, orderby, direction, feature_ids));
if (!(feature_ids?.length === 0)) {
dispatch(loadEditingBoreholes(page, 100, filter, orderby, direction, feature_ids));
}
},
};
};
Expand Down

0 comments on commit 164e70b

Please sign in to comment.