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

Show organization in dataset info tab #7087

Merged
merged 15 commits into from
May 26, 2023

Conversation

knollengewaechs
Copy link
Contributor

@knollengewaechs knollengewaechs commented May 20, 2023

Steps to test:

  • You need to set up an additional organization locally. The easiest way to do this is to set isWkorgInstance and mail.logToStdout to true each in the application.conf. Then, log out and create a new account. An confirmation link should be printed in the console. Click the link and then finish the registration. Then, the second account will belong to a separate organization.
    Then, switch back to the first account (or do this beforehand) and make a dataset public via the dataset settings. Then, open the dataset url with the second account so that the base condition is met. (credits to @philippotto for this description)
  • Check this in three places:
    -- In the dataset list view, after clicking on a dataset.
    -- When viewing the dataset in the dataset info tab on the right.
    -- When viewing or creating an annotation, again in the dataset info tab.
  • (If the setup seems to hard, you can also change the checks === to !== so that you can test it with a dataset that belongs to your organization.)

Issues:


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

  • Updated changelog
  • Updated documentation if applicable doesnt seem applicable
  • Removed dev-only changes like prints and application.conf edits !!!
  • Considered common edge cases. note: also works if activeUser is null, so if no one is logged in

@knollengewaechs knollengewaechs self-assigned this May 20, 2023
@knollengewaechs
Copy link
Contributor Author

knollengewaechs commented May 20, 2023

@philippotto right now I left the check for equality inverted because I am not sure how include another organizations dataset in my users dataset list view. Of course, for the final check, this needs to be put right. I feel like everything else is working as I expect it, so I am requesting a review already :)

@knollengewaechs knollengewaechs marked this pull request as ready for review May 20, 2023 09:06
@philippotto philippotto changed the title Show orga in dataset info tab Show organization in dataset info tab May 23, 2023
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.

nice :) I left some feedback and will test now.

@philippotto
Copy link
Member

Great :) Please invert the conditions where necessary and then I'll do a final test before we merge the pr.

@knollengewaechs
Copy link
Contributor Author

knollengewaechs commented May 25, 2023

Great :) Please invert the conditions where necessary and then I'll do a final test before we merge the pr.

done!

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 🎉

@knollengewaechs knollengewaechs merged commit bdae6d3 into master May 26, 2023
@knollengewaechs knollengewaechs deleted the show-orga-in-dataset-info-tab branch May 26, 2023 12:42
hotzenklotz added a commit that referenced this pull request May 31, 2023
…ty-list-drawings

* 'master' of github.com:scalableminds/webknossos:
  [Docs] Update embedded YouTube URLs (#7102)
  Show organization in dataset info tab (#7087)
  Added Tutorials to Docs (#7095)
  Combine both download modals into one (#7068)
  Add "merge" blend mode (#6936)
  Changed the spacing/width of VX reports runs selection (#7094)
  Allow dataset managers to see all workflow reports of their orga (#7081)
  Fix rectangle at 0,0,0 (#7088)
  Allow to disable automatic reloading of meshes during proofreading (#7076)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show owning organization in dataset info tab
2 participants