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.

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

Fix Dataset Configurations #4845

Merged
merged 51 commits into from Oct 29, 2020
Merged

Fix Dataset Configurations #4845

merged 51 commits into from Oct 29, 2020

Conversation

youri-k
Copy link
Contributor

@youri-k youri-k commented Oct 1, 2020 •
edited

URL of deployed dev instance (used for testing):

  • https://___.webknossos.xyz

Steps to test:

  • open Dataset in View Mode and change segmentation settings (e.g. opacity)
  • open Volume tracing without fallback on the same dataset and change volume layer settings (e.g. opacity)
  • reopen Dataset in View Mode => segmentation settings should persist
  • reopen tracing => volume layer settings should persist

Issues:

@youri-k youri-k self-assigned this Oct 5, 2020
fm3
fm3 approved these changes Oct 5, 2020
View reviewed changes
Copy link
Member

@fm3 fm3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backend looks good to me, I think this is a clean solution :) I just added a few minor comments.

CHANGELOG.unreleased.md Outdated Show resolved Hide resolved
conf/evolutions/056-add-layer-specific-view-configs.sql Outdated Show resolved Hide resolved
app/models/user/UserService.scala Outdated Show resolved Hide resolved
youri-k and others added 3 commits October 5, 2020 14:47
@youri-k @fm3
Apply suggestions from code review
59f80a9 
Co-authored-by: Florian M <fm3@users.noreply.github.com>
remove unnecessary invalidation of user
9f54474
Merge branch 'fix-dataset-configurations' of github.com:scalableminds…
644ff27 
…/webknossos into fix-dataset-configurations
philippotto
philippotto requested changes Oct 6, 2020
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great stuff! Also kudos for cleaning up the obsolete quality-setting and fighting through the front-end tests :)

I'm just a bit unclear about why it is necessary to send the dataset layers to the back-end when requesting the settings. Since the volume-vs-fallback-layer-specific logic is now duplicated, I'd prefer to refactor this a bit. See my other comment for context/details :)

frontend/javascripts/oxalis/model_initialization.js Outdated Show resolved Hide resolved
philippotto
philippotto approved these changes Oct 8, 2020
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent :)

@youri-k
Copy link
Contributor Author

youri-k commented Oct 8, 2020

@fm3 Could you have a look at the backend again after the newest frontend changes. I don't know how to feel about the abstraction level in the ConfigurationController.

@youri-k
Copy link
Contributor Author

youri-k commented Oct 12, 2020 •
edited

ToDo:

  • migration for defaultConfiguration in DataSet
  • reversions for complete evolution
  • fix e2e tests
  • write additional tests for new schema

fm3
fm3 approved these changes Oct 16, 2020
View reviewed changes
Copy link
Member

@fm3 fm3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backend LGTM, great work 🎉 Thanks for going through all the renamings :) I think it is a lot more clear and consistent now

app/controllers/ConfigurationController.scala Outdated Show resolved Hide resolved
philippotto
philippotto requested changes Oct 19, 2020
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Great job making this beautiful 👍 See my two comments about validation + nesting, though :)

frontend/javascripts/dashboard/dataset/default_config_component.js Outdated Show resolved Hide resolved
frontend/javascripts/types/schemas/dataset_view_configuration_defaults.js Outdated Show resolved Hide resolved
frontend/javascripts/types/schemas/dataset_view_configuration_defaults.js Show resolved Hide resolved
philippotto
philippotto approved these changes Oct 28, 2020
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Looking forward to seeing this merged :)

@youri-k youri-k merged commit ff0457c into master Oct 29, 2020
@fm3 fm3 mentioned this pull request Oct 29, 2020
Merged
2 tasks
@fm3 fm3 deleted the fix-dataset-configurations branch January 18, 2021 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fm3 fm3 fm3 approved these changes

@philippotto philippotto philippotto approved these changes

Assignees

@youri-k youri-k

@grittaweisheit grittaweisheit

Labels
backend frontend hacktoberfest-accepted
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Volume layer opacity does not persist
4 participants
@youri-k @fm3 @philippotto @grittaweisheit