Skip to content

Commit

Permalink
Merge branch 'master' of github.com:scalableminds/webknossos into all…
Browse files Browse the repository at this point in the history
…ow-perma-dataset-rotation
  • Loading branch information
Michael Büßemeyer authored and Michael Büßemeyer committed Dec 19, 2024
2 parents 7c1f5db + 32257f1 commit c22372d
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 10 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Fixed a bug that uploading a zarr dataset with an already existing `datasource-properties.json` file failed. [#8268](https://github.com/scalableminds/webknossos/pull/8268)
- Fixed the organization switching feature for datasets opened via old links. [#8257](https://github.com/scalableminds/webknossos/pull/8257)
- Fixed that uploading an NML file without an organization id failed. Now the user's organization is used as fallback. [#8277](https://github.com/scalableminds/webknossos/pull/8277)
- Fixed that the frontend did not ensure a minium length for annotation layer names. Moreover, names starting with a `.` are also disallowed now. [#8244](https://github.com/scalableminds/webknossos/pull/8244)
- Fixed that the frontend did not ensure a minimum length for annotation layer names. Moreover, names starting with a `.` are also disallowed now. [#8244](https://github.com/scalableminds/webknossos/pull/8244)
- Fixed a bug where in the add remote dataset view the dataset name setting was not in sync with the datasource setting of the advanced tab making the form not submittable. [#8245](https://github.com/scalableminds/webknossos/pull/8245)
- Fix read and update dataset route for versions 8 and lower. [#8263](https://github.com/scalableminds/webknossos/pull/8263)
- Fixed that task bounding boxes are again converted to user bounding boxes when uploading annotations via nmls. [#8280](https://github.com/scalableminds/webknossos/pull/8280)
- Added missing legacy support for `isValidNewName` route. [#8252](https://github.com/scalableminds/webknossos/pull/8252)
- Fixed some layout issues in the upload view. [#8231](https://github.com/scalableminds/webknossos/pull/8231)
- Fixed `FATAL: role "postgres" does not exist` error message in Docker compose. [#8240](https://github.com/scalableminds/webknossos/pull/8240)
- Fixed the Zarr 3 implementation not accepting BytesCodec without "configuration" key. [#8282](https://github.com/scalableminds/webknossos/pull/8282)

### Removed
- Removed support for HTTP API versions 3 and 4. [#8075](https://github.com/scalableminds/webknossos/pull/8075)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import urljoin from "url-join";
import "test/mocks/lz4";
import type { PartialDatasetConfiguration } from "oxalis/store";
import path from "node:path";
Expand Down Expand Up @@ -27,7 +28,7 @@ process.on("unhandledRejection", (err, promise) => {
console.error("Unhandled rejection (promise: ", promise, ", reason: ", err, ").");
});
const BASE_PATH = path.join(__dirname, "../../../../frontend/javascripts/test/screenshots");
let URL = "https://master.webknossos.xyz";
let URL = "https://master.webknossos.xyz/";

if (!process.env.URL) {
console.warn(
Expand Down Expand Up @@ -114,7 +115,8 @@ test.before("Retrieve dataset ids", async () => {
3,
async () => {
const options = getDefaultRequestOptions(URL);
const url = `${URL}/api/datasets/disambiguate/sample_organization/${datasetName}/toId`;
const path = `/api/datasets/disambiguate/sample_organization/${datasetName}/toId`;
const url = urljoin(URL, path);
const response = await fetch(url, options);
const { id } = await response.json();
datasetNameToId[datasetName] = id;
Expand All @@ -124,7 +126,7 @@ test.before("Retrieve dataset ids", async () => {
);
}
});
test("Dataset IDs were retrieved successfully", (t) => {
test.serial("Dataset IDs were retrieved successfully", (t) => {
for (const datasetName of datasetNames) {
t.truthy(datasetNameToId[datasetName], `Dataset ID not found for "${datasetName}"`);
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/javascripts/test/screenshots/ROI2017_wkw_fallback.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/javascripts/test/screenshots/dsA_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/javascripts/test/screenshots/float_test_dataset.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,19 @@ object Zarr3ArrayHeader extends JsonImplicits {
val codecSpecs = rawCodecSpecs.map(c => {
for {
spec: CodecConfiguration <- c("name") match {
case JsString(BytesCodecConfiguration.name) => c(configurationKey).validate[BytesCodecConfiguration]
case JsString(BytesCodecConfiguration.legacyName) => c(configurationKey).validate[BytesCodecConfiguration]
case JsString(TransposeCodecConfiguration.name) => c(configurationKey).validate[TransposeCodecConfiguration]
case JsString(GzipCodecConfiguration.name) => c(configurationKey).validate[GzipCodecConfiguration]
case JsString(BloscCodecConfiguration.name) => c(configurationKey).validate[BloscCodecConfiguration]
case JsString(ZstdCodecConfiguration.name) => c(configurationKey).validate[ZstdCodecConfiguration]
// BytesCodec may have no "configuration" key
case JsString(BytesCodecConfiguration.name) =>
(c \ configurationKey).toOption
.map(_.validate[BytesCodecConfiguration])
.getOrElse(JsSuccess(BytesCodecConfiguration(None)))
case JsString(BytesCodecConfiguration.legacyName) =>
(c \ configurationKey).toOption
.map(_.validate[BytesCodecConfiguration])
.getOrElse(JsSuccess(BytesCodecConfiguration(None)))
case JsString(TransposeCodecConfiguration.name) => c(configurationKey).validate[TransposeCodecConfiguration]
case JsString(GzipCodecConfiguration.name) => c(configurationKey).validate[GzipCodecConfiguration]
case JsString(BloscCodecConfiguration.name) => c(configurationKey).validate[BloscCodecConfiguration]
case JsString(ZstdCodecConfiguration.name) => c(configurationKey).validate[ZstdCodecConfiguration]
case JsString(Crc32CCodecConfiguration.name) =>
JsSuccess(Crc32CCodecConfiguration) // Crc32 codec has no configuration
case JsString(ShardingCodecConfiguration.name) => readShardingCodecConfiguration(c(configurationKey))
Expand Down

0 comments on commit c22372d

Please sign in to comment.