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

2nd attempt: Merge "Shared Annotations" with "My annotations" #6287

Merged
merged 8 commits into from
Jul 7, 2022

Conversation

philippotto
Copy link
Member

Second attempt to merge #6230. However, there seems to be a bug with the annotations/readable route which fails sometimes with a 404 status.

https://webknossos.org/api/annotations/readable?isFinished=false&pageNumber=0 failed for me in prod (isFinished=true worked).

@philippotto philippotto self-assigned this Jun 20, 2022
@fm3 fm3 self-assigned this Jul 1, 2022
@fm3 fm3 requested a review from jstriebel July 5, 2022 12:31
@fm3
Copy link
Member

fm3 commented Jul 5, 2022

@jstriebel could you have a look here at the latest commits? after broadening the access context, which solved the 404 error, the second bug was that annotations that were public were also listed on this page. however, the semantics of “public” is really “unlisted” (since such a list did not exist before and we cannot just change that semantics as it was communicated like this to the users). so now I added a separate list access query. i also added a slight performance improvement for fetching shared teams from the db

Copy link
Contributor

@jstriebel jstriebel left a comment

Choose a reason for hiding this comment

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

Nice, code looks mostly good to me, see my one comment though. I didn't test this myself so far.

Copy link
Contributor

@jstriebel jstriebel left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@fm3 fm3 merged commit fca7919 into master Jul 7, 2022
@fm3 fm3 deleted the revert-6286-revert-6230-dashboard-collab branch July 7, 2022 08:32
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.

3 participants