From 39871fee91e8d9a31162b379b0b6e9ab6dc89311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20B=C3=BC=C3=9Femeyer?= Date: Wed, 25 Sep 2024 17:19:35 +0200 Subject: [PATCH 1/4] fix removing last name from path when moving uploaded non zipped dataset --- util/src/main/scala/com/scalableminds/util/io/PathUtils.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/src/main/scala/com/scalableminds/util/io/PathUtils.scala b/util/src/main/scala/com/scalableminds/util/io/PathUtils.scala index c08623d823..3f7ec0a057 100644 --- a/util/src/main/scala/com/scalableminds/util/io/PathUtils.scala +++ b/util/src/main/scala/com/scalableminds/util/io/PathUtils.scala @@ -181,7 +181,7 @@ trait PathUtils extends LazyLogging { private def removeOneName(path: Path): Path = if (path.getNameCount == 1) { Paths.get("") - } else path.subpath(0, path.getNameCount - 1) + } else path.getParent def deleteDirectoryRecursively(path: Path): Box[Unit] = { val directory = new Directory(new File(path.toString)) From 151047b47df17b7a47a7e09d67064ff6d8ba26f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20B=C3=BC=C3=9Femeyer?= Date: Wed, 25 Sep 2024 17:19:52 +0200 Subject: [PATCH 2/4] add error message to failed try to move uploaded dataset --- conf/messages | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/messages b/conf/messages index 781d7a1450..9bf059ca95 100644 --- a/conf/messages +++ b/conf/messages @@ -111,6 +111,7 @@ dataset.upload.couldNotLoadUnfinishedUploads=Could not load unfinished uploads o dataset.upload.noFiles=Tried to finish upload with no files. May be a retry of a failed finish request, see previous errors. dataset.upload.storageExceeded=Cannot upload dataset because the storage quota of the organization is exceeded. dataset.upload.finishFailed=Failed to finalize dataset upload. +dataset.upload.moveToTarget.failed=Failed to move uploaded dataset to target directory. dataset.explore.failed.readFile=Failed to read remote file dataset.explore.magDtypeMismatch=Element class must be the same for all mags of a layer. Got {0} dataset.explore.autoAdd.failed=Failed to automatically import the explored dataset. From 38ec5714d11e5aa743bfe17627bda2afcfeaf430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20B=C3=BC=C3=9Femeyer?= Date: Wed, 25 Sep 2024 17:20:04 +0200 Subject: [PATCH 3/4] remove redundant . --- frontend/javascripts/admin/dataset/dataset_add_view.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/javascripts/admin/dataset/dataset_add_view.tsx b/frontend/javascripts/admin/dataset/dataset_add_view.tsx index 524def9656..c1513f1f7c 100644 --- a/frontend/javascripts/admin/dataset/dataset_add_view.tsx +++ b/frontend/javascripts/admin/dataset/dataset_add_view.tsx @@ -303,7 +303,7 @@ const getPostUploadModal = ( }} > The dataset was {addTypeToVerb[datasetAddType]} successfully - {datasetNeedsConversion ? " and a conversion job was started." : null}. + {datasetNeedsConversion ? " and a conversion job was started" : null}.
Date: Wed, 25 Sep 2024 17:32:27 +0200 Subject: [PATCH 4/4] add pr to matching changelog entry --- CHANGELOG.unreleased.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index f58432f207..e931b4d0a4 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -18,7 +18,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released - Some mesh-related actions were disabled in proofreading-mode when using meshfiles that were created for a mapping rather than an oversegmentation. [#8091](https://github.com/scalableminds/webknossos/pull/8091) ### Fixed -- Fixed a bug during dataset upload in case the configured `datastore.baseFolder` is an absolute path. [#8098](https://github.com/scalableminds/webknossos/pull/8098) +- Fixed a bug during dataset upload in case the configured `datastore.baseFolder` is an absolute path. [#8098](https://github.com/scalableminds/webknossos/pull/8098) [#8103](https://github.com/scalableminds/webknossos/pull/8103) ### Removed