Merge pull request #104 from mitaai/stateful-rendering-of-annotations…

…-doc-view Stateful rendering of annotations doc view
mitaai · Dec 18, 2020 · dd942df · dd942df
2 parents e12f4b8 + 23963b8
commit dd942df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/AnnotationCard/AnnotationCard.js b/src/components/AnnotationCard/AnnotationCard.js
@@ -162,7 +162,7 @@ function AnnotationCard({
       } else if (newAnnotationPermissions === 1) {
         // user wants the annotation to be shared with groups
         // getting the intersection between the groups that have access to this specific document and the groups that the user is in
-        newAnnotationData.permissions.groups = newAnnotationData.target.document.groups.filter((id) => (user.groups.includes(id)));
+        newAnnotationData.permissions.groups = user.groups.filter(({ id }) => (newAnnotationData.target.document.groups.includes(id)));
         newAnnotationData.permissions.sharedTo = undefined;
         newAnnotationData.permissions.private = false;
       } else if (newAnnotationPermissions === 2) {

diff --git a/src/components/FilterPopover/FilterPopover.js b/src/components/FilterPopover/FilterPopover.js
@@ -134,7 +134,7 @@ function FilterPopover({ session }) {
           index = filterOptions.annotatedBy.findIndex((opt) => opt.email === a.creator.email);
           if (index === -1) {
             // if the permissions is either shared or shared with only me your own name shouldn't show in the dropdown because you can't share an annotation with your self
-            if (filters.permissions === 0 || user_email !== a.creator.email) {
+            if (filters.permissions !== 2 || user_email !== a.creator.email) {
               filterOptions.annotatedBy.push({
                 id: a.creator.email,
                 name: FirstNameLastInitial(a.creator.name),