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

Update Text in Upload Dataset View #7996

Merged
merged 19 commits into from
Sep 4, 2024
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Because of the way our models are trained, AI analysis and training is disabled for 2D and ND datasets, as well as for color layers with data type uInt24. [#7957](https://github.com/scalableminds/webknossos/pull/7957)
- The overall performance was improved (especially for the segments tab). [#7958](https://github.com/scalableminds/webknossos/pull/7958)
- The performance for the skeleton tab was improved. [#7989](https://github.com/scalableminds/webknossos/pull/7989)
- For self-hosted versions, the text in the data set upload view was updated to recommend switching to webknossos.org. [#7996](https://github.com/scalableminds/webknossos/pull/7996)
knollengewaechs marked this conversation as resolved.
Show resolved Hide resolved

### 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)
Expand Down
1 change: 1 addition & 0 deletions conf/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ features {
discussionBoardRequiresAdmin = false
hideNavbarLogin = false
isWkorgInstance = false
recommendWkorgInstance = true
taskReopenAllowedInSeconds = 30
allowDeleteDatasets = true
# to enable jobs for local development, use "yarn enable-jobs" to also activate it in the database
Expand Down
32 changes: 25 additions & 7 deletions frontend/javascripts/admin/dataset/dataset_upload_view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1010,21 +1010,41 @@ function FileUploadArea({
/>
<p
style={{
maxWidth: 800,
textAlign: "center",
display: "inline-block",
marginTop: 8,
}}
>
Drag your file(s) to this area to upload them. Either add individual image files, a zip
archive or a folder.{" "}
{features().recommendWkorgInstance && !isDatasetConversionEnabled ? (
<>
Drag and drop your files in WKW format.
<div
style={{
textAlign: "left",
display: "list-item",
maxWidth: 475,
marginTop: 10,
}}
>
Need to upload files in other formats? Switch to{" "}
<a href="https://webknossos.org">webknossos.org</a> for more file types support and
automatic conversion.
<a href="webknossos.org/self-hosted-upgrade"> Learn more!</a>
</div>
</>
) : (
<div style={{ marginTop: 8 }}>
Drag your file(s) to this area to upload them. Either add individual image files, a
zip archive or a folder.
</div>
)}
{isDatasetConversionEnabled ? (
<>
<br />
<br />
<div
style={{
textAlign: "left",
display: "inline-block",
marginTop: 10,
}}
>
The following file formats are supported:
Expand Down Expand Up @@ -1128,8 +1148,6 @@ function FileUploadArea({
</Popover>
</li>
<li>Single-file images (tif, czi, nifti, raw, ims etc.)</li>

<li>KNOSSOS file hierarchy</li>
</ul>
Have a look at{" "}
<a href="https://docs.webknossos.org/webknossos/data_formats.html">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Generated by [AVA](https://avajs.dev).
openIdConnectEnabled: false,
optInTabs: [],
publicDemoDatasetUrl: 'https://webknossos.org/datasets/scalable_minds/l4dense_motta_et_al_demo',
recommendWkorgInstance: true,
segmentAnythingEnabled: false,
taskReopenAllowedInSeconds: 30,
voxelyticsEnabled: false,
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Snapshot report for `public/test-bundle/test/sagas/volumetracing/volumetracing_saga_integration.spec.js`
# Snapshot report for `public-test/test-bundle/test/sagas/volumetracing/volumetracing_saga_integration.spec.js`

The actual snapshot is saved in `volumetracing_saga_integration.spec.js.snap`.

Expand Down
1 change: 1 addition & 0 deletions frontend/javascripts/types/api_flow_types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@ export type APIFeatureToggles = {
readonly discussionBoardRequiresAdmin: boolean;
readonly hideNavbarLogin: boolean;
readonly isWkorgInstance: boolean;
readonly recommendWkorgInstance: boolean;
readonly taskReopenAllowedInSeconds: number;
readonly allowDeleteDatasets: boolean;
readonly jobsEnabled: boolean;
Expand Down