Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Delete dataset: also clear tables for additional axes, coordinate transforms #7495

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Delete dataset: also clear tables for additional axes, coordinate transforms #7495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f29d785
Delete dataset: also clear tables for additional axes, coordinate tra…
fm3 Dec 11, 2023
c2e4f67
changelog
fm3 Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Fixed several deprecation warning for using antd's Tabs.TabPane components. [#7469](https://github.com/scalableminds/webknossos/pull/7469)
- Fixed problems when requests for loading data failed (could impact volume data consistency and rendering). [#7477](https://github.com/scalableminds/webknossos/pull/7477)
- The settings page for non-wkw datasets no longer shows a wall of non-applying errors. [#7475](https://github.com/scalableminds/webknossos/pull/7475)
- Fixed a bug where dataset deletion for ND datasets and datasets with coordinate transforms would not free the name even if no referencing annotations exist. [#7495](https://github.com/scalableminds/webknossos/pull/7495)

### Removed

Expand Down
22 changes: 16 additions & 6 deletions app/models/dataset/Dataset.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,20 +562,30 @@ class DatasetDAO @Inject()(sqlClient: SqlClient, datasetLayerDAO: DatasetLayerDA

def deleteDataset(datasetId: ObjectId, onlyMarkAsDeleted: Boolean = false): Fox[Unit] = {
val deleteResolutionsQuery =
q"delete from webknossos.dataSet_resolutions where _dataset = $datasetId".asUpdate
q"DELETE FROM webknossos.dataSet_resolutions WHERE _dataset = $datasetId".asUpdate
val deleteCoordinateTransformsQuery =
q"DELETE FROM webknossos.dataSet_layer_coordinateTransformations WHERE _dataset = $datasetId".asUpdate
val deleteLayersQuery =
q"delete from webknossos.dataSet_layers where _dataset = $datasetId".asUpdate
val deleteAllowedTeamsQuery = q"delete from webknossos.dataSet_allowedTeams where _dataset = $datasetId".asUpdate
q"DELETE FROM webknossos.dataSet_layers WHERE _dataset = $datasetId".asUpdate
val deleteAllowedTeamsQuery = q"DELETE FROM webknossos.dataSet_allowedTeams WHERE _dataset = $datasetId".asUpdate
val deleteAdditionalAxesQuery =
q"DELETE FROM webknossos.dataSet_layer_additionalAxes WHERE _dataset = $datasetId".asUpdate
val deleteDatasetQuery =
if (onlyMarkAsDeleted)
q"update webknossos.datasets set status = $deletedByUserStatus, isUsable = false where _id = $datasetId".asUpdate
q"UPDATE webknossos.datasets SET status = $deletedByUserStatus, isUsable = false WHERE _id = $datasetId".asUpdate
else
q"delete from webknossos.datasets where _id = $datasetId".asUpdate
q"DELETE FROM webknossos.datasets WHERE _id = $datasetId".asUpdate

for {
_ <- run(
DBIO
.sequence(List(deleteResolutionsQuery, deleteLayersQuery, deleteAllowedTeamsQuery, deleteDatasetQuery))
.sequence(
List(deleteResolutionsQuery,
deleteAdditionalAxesQuery,
deleteLayersQuery,
deleteAllowedTeamsQuery,
deleteCoordinateTransformsQuery,
deleteDatasetQuery))
.transactionally)
} yield ()
}
Expand Down