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.

Sign up for GitHub

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

Jump to bottom

Create new export modal #6171

Merged

Dagobert42 merged 41 commits into master from create-new-export-modal

May 19, 2022

Contributor

Dagobert42 commented Apr 27, 2022 •

edited

Loading

URL of deployed dev instance (used for testing):

https://createnewexportmodal.webknossos.xyz/

Steps to test:

open an annotation and select Download from the tracing actions
the new modal should show with tabs for Download, Export and Python Client

Issues:

fixes Build export dialog #5672

(Please delete unneeded items, merge only when none are left open)

Updated (unreleased) changelog
Ready for review

Dagobert42 added 2 commits

April 27, 2022 12:15


          add download modal to UI

b873153


          implement modal frontend component

Dagobert42 requested review from philippotto and jstriebel

April 27, 2022 10:22


          Merge branch 'master' into create-new-export-modal

eeeaa2f

Dagobert42 removed request for philippotto and jstriebel

April 27, 2022 10:22

Dagobert42 and others added 3 commits

April 27, 2022 13:19


          pretty

081703e


          Merge branch 'master' into create-new-export-modal

df96f5a


          add selection components to export page

a5a425d

philippotto changed the title ~~Create new export modal~~ [WIP] Create new export modal

hotzenklotz reviewed

View reviewed changes

frontend/javascripts/messages.ts Outdated Show resolved Hide resolved

hotzenklotz reviewed

View reviewed changes

frontend/javascripts/messages.ts Outdated Show resolved Hide resolved

hotzenklotz reviewed

View reviewed changes

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

hotzenklotz reviewed

View reviewed changes

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

hotzenklotz reviewed

View reviewed changes

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

hotzenklotz reviewed

View reviewed changes

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

hotzenklotz reviewed

View reviewed changes

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

Contributor Author

Dagobert42 commented Apr 28, 2022

Thanks for proof-reading and the suggestions @hotzenklotz ! I will adapt them asap.

Member

fm3 commented Apr 29, 2022 •

edited

Loading

Note that the back-end already supports an optional boolean skipVolumeData in the annotation download route.

TODO backend (I will implement this when I have time):

also omit the <volume> tags in the NML file in this case, replace them by explaining comment


          omit <volume> tags in NML when skipVolumeData is true in download

625f736

jstriebel reviewed

View reviewed changes

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

Dagobert42 added 8 commits

May 5, 2022 11:29


          improve wording

8470f72


          get rid of linter warning

f8a43f2


          add warnings, correctly adapt ok texts, pre-fill python snippet

9a7db89


          more wording

7308e08


          some refactoring

d4e68e9


          add flag for WKW download

e242334


          rename download function

bf0a627


          random correction

39f780d

Dagobert42 and others added 9 commits

May 12, 2022 14:47


          small correction

9bf8eb8


          split Select from FormItems to reuse in Download Modal

eee7390


          export functions for starting Jobs from DownloadModalView (export tab)

7a3fd81


          start export jobs from modal

f643903


          keep window open if desired

0c7ae03


          add links, improve messages

aa343d6


          improve warnings for export UX

7061cde


          Merge branch 'master' into create-new-export-modal

9eeede6


          improve some typing

1016d85

philippotto requested changes

View reviewed changes

Member

philippotto left a comment

Cool stuff! Already looks pretty good. I left a couple of comments which should be tackled before merging, but nothing major.

I pushed a small commit to improve some typing, since I saw some never annotations which didn't seem quite right (and I thought it would be quicker to fix than to explain it :)). You can have a look at it here: 1016d85

frontend/javascripts/admin/admin_rest_api.ts Outdated Show resolved Hide resolved

frontend/javascripts/admin/admin_rest_api.ts Outdated Show resolved Hide resolved

frontend/javascripts/messages.ts Outdated Show resolved Hide resolved

frontend/javascripts/oxalis/view/right-border-tabs/starting_job_modals.tsx Outdated Show resolved Hide resolved

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Show resolved Hide resolved

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

philippotto changed the title ~~[WIP] Create new export modal~~ Create new export modal

jstriebel reviewed

View reviewed changes

frontend/javascripts/oxalis/view/action-bar/download_modal_view.tsx Outdated Show resolved Hide resolved

Dagobert42 added 7 commits

May 18, 2022 15:02


          edit typos and remove comments/logs

d7c9c57


          sort imports

b5e0a12


          show download checkboxes according to tracing

626f99b


          code review change

bd50912


          Merge branch 'master' into create-new-export-modal

b5bb9c8

# Conflicts:
#	frontend/javascripts/oxalis/view/right-border-tabs/export_bounding_box_modal.tsx


          pretty after merge commit

76e1fb1


          add job description for neuron inferral

Contributor Author

Dagobert42 commented May 18, 2022

@MichaelBuessemeyer thanks for the help with b5bb9c8 :)


          inline default selection

1ab4cc5

jstriebel reviewed

View reviewed changes

Contributor

jstriebel left a comment •

edited

Loading

Just tested the Python snipplet for annotation download, works like a charm ✨

Dagobert42 and others added 5 commits

May 18, 2022 22:55


          Merge branch 'master' into create-new-export-modal

84902c3


          Merge branch 'master' into create-new-export-modal

634ac4e


          minor tweaks

bd96c8d


          integrate bounding box size limits in export modal UI

850eec4


          Merge branch 'create-new-export-modal' of github.com:scalableminds/we…

a0ccafd

…bknossos into create-new-export-modal

philippotto approved these changes

View reviewed changes

Member

philippotto left a comment

Great work :) Please update the changelog before merging, though. I also pushed a few changes, since I noticed that the size of the bounding boxes is not validated in the modals form.

It's not super pretty, but gets the job done:

frontend/javascripts/admin/job/job_list_view.tsx Show resolved Hide resolved

Dagobert42 merged commit fe1fd32 into master

Dagobert42 deleted the create-new-export-modal branch

May 19, 2022 14:15

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet