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.

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

Allow to compose datasets without transforms or with bigwarp/NML landmarks #7395

Merged
merged 55 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
83fdff0
implement compose-dataset-view which accepts NMLs from different data…
philippotto Oct 17, 2023
739ce7e
wording
philippotto Oct 17, 2023
9722b8c
Add backend for composing datasets
frcroth Nov 20, 2023
2ce1031
Extract common method
frcroth Nov 20, 2023
24bc264
Merge branch 'master' into compose-datasets
frcroth Nov 20, 2023
0fa38a4
Use scale and check if directory is writeable
frcroth Nov 20, 2023
e7b7972
Validate user access to all included datasets
frcroth Nov 20, 2023
92224e1
Merge branch 'master' into compose-datasets
philippotto Nov 24, 2023
f131d7a
integrate new compose route
philippotto Nov 24, 2023
75471b2
temporarily disable most ci checks
philippotto Nov 24, 2023
47e4508
improve loading state
philippotto Nov 24, 2023
49cd2a6
Do not use datasource id for compose API
frcroth Nov 27, 2023
bc2d278
Refresh inbox after composing dataset
frcroth Nov 27, 2023
034c1b4
Rename id to datasetId
frcroth Nov 27, 2023
a47e04a
remove sleep and id workaround; also improve formatting of jumping-to…
philippotto Nov 27, 2023
92c3d6b
better error handling and don't crash if no transformation is necessa…
philippotto Nov 28, 2023
195908f
Merge branch 'master' of github.com:scalableminds/webknossos into com…
philippotto Dec 13, 2023
94fff83
implement wizard for dataset composition
philippotto Dec 14, 2023
3cbc54e
clean up a bit
philippotto Dec 14, 2023
911ebff
refactor dataset selection component into own module
philippotto Dec 14, 2023
19b222a
remove unused onNext/onPrev code
philippotto Dec 14, 2023
5721867
refactor into separate modules
philippotto Dec 14, 2023
43f92e8
iterate on styling etc
philippotto Dec 14, 2023
1721d64
tweak intro paragraphs in wizard
philippotto Dec 14, 2023
03410cb
refactor
philippotto Dec 18, 2023
c98b8e1
improve error handling
philippotto Dec 18, 2023
95eeb4b
respect enabled property in csv
philippotto Dec 18, 2023
ab8c715
remove console.log
philippotto Dec 18, 2023
e02125c
re-enable CI checks
philippotto Dec 18, 2023
60d58e2
update docs
philippotto Dec 18, 2023
4cbeb45
improve validation
philippotto Dec 18, 2023
37b4400
Merge branch 'master' of github.com:scalableminds/webknossos into com…
philippotto Dec 18, 2023
9254479
update changelog
philippotto Dec 18, 2023
552762f
Check inbox
frcroth Dec 18, 2023
96d2e51
remove 3s sleep because backend automatically checks DS inbox now
philippotto Dec 18, 2023
de295ca
Apply suggestions from code review
philippotto Jan 3, 2024
3ea914f
use title case
philippotto Jan 3, 2024
f9d4479
send potential error to airbrake
philippotto Jan 3, 2024
e41f453
use activeUser.organization instead of hardcoded string
philippotto Jan 3, 2024
2efa36f
Merge branch 'master' of github.com:scalableminds/webknossos into com…
philippotto Jan 3, 2024
d75877d
explain expected structure of NML/CSV and which dataset is transformed
philippotto Jan 3, 2024
ee7e15b
clear select suggestions to avoid confusion
philippotto Jan 3, 2024
cc5550c
explain how trees are matched
philippotto Jan 3, 2024
086afed
Merge branch 'compose-datasets' of github.com:scalableminds/webknosso…
philippotto Jan 3, 2024
80eced8
Make symlink trait a service
frcroth Jan 8, 2024
3766288
Remove check inbox
frcroth Jan 8, 2024
2f5f948
Reorganize uploading services
frcroth Jan 8, 2024
9b6c80f
format
fm3 Jan 9, 2024
adb4a82
Merge branch 'master' into compose-datasets
philippotto Jan 10, 2024
e142d5f
change default tab back to UPLOAD
philippotto Jan 10, 2024
72733c0
allow trees with multiple nodes during composition instead of expecti…
philippotto Jan 10, 2024
8474006
remove unused import
philippotto Jan 10, 2024
13b2c9b
Merge branch 'master' into compose-datasets
fm3 Jan 16, 2024
655b4e9
inline radio buttons in first step of compose-dataset-wizard
philippotto Jan 16, 2024
cc2ba26
Merge branch 'master' into compose-datasets
philippotto Jan 16, 2024
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
8 changes: 4 additions & 4 deletions .circleci/not-on-master.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash
set -Eeuo pipefail

if [ "${CIRCLE_BRANCH}" == "master" ]; then
# if [ "${CIRCLE_BRANCH}" == "master" ]; then
echo "Skipping this step on master..."
else
exec "$@"
fi
# else
# exec "$@"
# fi
17 changes: 17 additions & 0 deletions frontend/javascripts/admin/admin_rest_api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ import type {
MaintenanceInfo,
AdditionalCoordinate,
RenderAnimationOptions,
LayerLink,
} from "types/api_flow_types";
import { APIAnnotationTypeEnum } from "types/api_flow_types";
import type { LOG_LEVELS, Vector2, Vector3, Vector6 } from "oxalis/constants";
Expand Down Expand Up @@ -1501,6 +1502,22 @@ export function getDatasetAccessList(datasetId: APIDatasetId): Promise<Array<API
);
}

type DatasetCompositionArgs = {
newDatasetName: string;
targetFolderId: string;
organizationName: string;
scale: Vector3;
layers: LayerLink[];
};

export function createDatasetComposition(datastoreUrl: string, payload: DatasetCompositionArgs) {
return doWithToken((token) =>
Request.sendJSONReceiveJSON(`${datastoreUrl}/data/datasets/compose?token=${token}`, {
data: payload,
}),
);
}

export function createResumableUpload(datastoreUrl: string, uploadId: string): Promise<any> {
// @ts-expect-error ts-migrate(7006) FIXME: Parameter 'file' implicitly has an 'any' type.
const generateUniqueIdentifier = (file) => {
Expand Down
Loading