diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index a2298e16461..2f620aff16a 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -21,6 +21,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released ### Fixed - Fixed a bug that allowed the default newly created bounding box to appear outside the dataset. In case the whole bounding box would be outside it is created regardless. [#7892](https://github.com/scalableminds/webknossos/pull/7892) +- Fixed a rare bug that could cause hanging dataset uploads. [#7932](https://github.com/scalableminds/webknossos/pull/7932) ### Removed diff --git a/frontend/javascripts/admin/admin_rest_api.ts b/frontend/javascripts/admin/admin_rest_api.ts index cbbe6f19861..c2974a36e6d 100644 --- a/frontend/javascripts/admin/admin_rest_api.ts +++ b/frontend/javascripts/admin/admin_rest_api.ts @@ -1269,12 +1269,12 @@ export function createResumableUpload(datastoreUrl: string, uploadId: string): P new ResumableJS({ testChunks: false, target: `${datastoreUrl}/data/datasets?token=${token}`, - chunkSize: 10 * 1024 * 1024, - // set chunk size to 10MB + chunkSize: 10 * 1024 * 1024, // 10MB permanentErrors: [400, 403, 404, 409, 415, 500, 501], simultaneousUploads: 3, chunkRetryInterval: 2000, maxChunkRetries: undefined, + xhrTimeout: 10 * 60 * 1000, // 10m // @ts-expect-error ts-migrate(2322) FIXME: Type '(file: any) => string' is not assignable to ... Remove this comment to see the full error message generateUniqueIdentifier, }), diff --git a/frontend/javascripts/admin/dataset/dataset_add_view.tsx b/frontend/javascripts/admin/dataset/dataset_add_view.tsx index b88d5da68bc..2066ff14c25 100644 --- a/frontend/javascripts/admin/dataset/dataset_add_view.tsx +++ b/frontend/javascripts/admin/dataset/dataset_add_view.tsx @@ -317,7 +317,6 @@ const getPostUploadModal = ( - import ) : ( diff --git a/frontend/javascripts/admin/dataset/dataset_upload_view.tsx b/frontend/javascripts/admin/dataset/dataset_upload_view.tsx index 7dd2053c815..7c7572c58b6 100644 --- a/frontend/javascripts/admin/dataset/dataset_upload_view.tsx +++ b/frontend/javascripts/admin/dataset/dataset_upload_view.tsx @@ -476,8 +476,10 @@ class DatasetUploadView extends React.Component {
{isRetrying ? "Retrying to continue the upload …" : null}
- @@ -1028,7 +1030,7 @@ function FileUploadArea({
  • } trigger="hover"> - Single-Layer Image File Sequence (tif, jpg, png, dm3, dm4) + Single-Layer Image File Sequence (tif, jpg, png, dm3, dm4 etc.)
  • -
  • Single-file images (tif, czi, nifti, raw)
  • +
  • Single-file images (tif, czi, nifti, raw, ims etc.)
  • KNOSSOS file hierarchy