feat(api): respect hidden collaborators (#4346)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: ahurok

src/api/FileCollaborators.js

@@ -104,7 +104,10 @@ class FileCollaborators extends MarkerBasedAPI {
         successCallback: ({ entries: Array<SelectorItem<UserMini | GroupMini>>, next_marker: ?string }) => void,
         errorCallback: ElementsErrorCallback,
         searchStr: string,
-        { includeGroups = false }: { includeGroups: boolean } = {},
+        {
+            includeGroups = false,
+            respectHiddenCollabs = false,
+        }: { includeGroups: boolean, respectHiddenCollabs: boolean } = {},
     ) => {
         // Do not fetch without filter
         if (!searchStr || searchStr.trim() === '') {
@@ -115,6 +118,7 @@ class FileCollaborators extends MarkerBasedAPI {
             filter_term: searchStr,
             include_groups: includeGroups,
             include_uploader_collabs: false,
+            respect_hidden_collabs: respectHiddenCollabs,
         });
     };
 }

src/api/__tests__/FileCollaborators.test.js

@@ -78,6 +78,7 @@ describe('api/FileCollaborators', () => {
                 filter_term: searchStr,
                 include_groups: false,
                 include_uploader_collabs: false,
+                respect_hidden_collabs: false,
             });
         });
 
@@ -93,6 +94,25 @@ describe('api/FileCollaborators', () => {
                 filter_term: searchStr,
                 include_groups: true,
                 include_uploader_collabs: false,
+                respect_hidden_collabs: false,
+            });
+        });
+
+        test('should get collaborators respecting hidden collaborators', () => {
+            const searchStr = 'foo';
+            const respectHiddenCollabs = true;
+            const successCb = jest.fn();
+            const errorCb = jest.fn();
+
+            fileCollaborators.getCollaboratorsWithQuery('file_id', successCb, errorCb, searchStr, {
+                respectHiddenCollabs,
+            });
+
+            expect(fileCollaborators.getFileCollaborators).toBeCalledWith('file_id', successCb, errorCb, {
+                filter_term: searchStr,
+                include_groups: false,
+                include_uploader_collabs: false,
+                respect_hidden_collabs: true,
             });
         });
     });

src/elements/content-sidebar/ActivitySidebar.js

@@ -952,6 +952,7 @@ class ActivitySidebar extends React.PureComponent<Props, State> {
             searchStr,
             {
                 includeGroups: true,
+                respectHiddenCollabs: true,
             },
         );
     }, DEFAULT_COLLAB_DEBOUNCE);

src/elements/content-sidebar/__tests__/ActivitySidebar.test.js

@@ -919,7 +919,7 @@ describe('elements/content-sidebar/ActivitySidebar', () => {
         let instance;
         let wrapper;
 
-        test('should get collaborators with groups', () => {
+        test('should get collaborators with groups and respect hidden collaborators', () => {
             wrapper = getWrapper();
             instance = wrapper.instance();
 
@@ -933,6 +933,7 @@ describe('elements/content-sidebar/ActivitySidebar', () => {
                 search,
                 {
                     includeGroups: true,
+                    respectHiddenCollabs: true,
                 },
             );
         });