Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into acls_uv

1 files changed, 14 insertions, 5 deletions

diff --git a/src/client/util/SharingManager.tsx b/src/client/util/SharingManager.tsx
index 4aa8d74e4..e789a7867 100644
--- a/src/client/util/SharingManager.tsx
+++ b/src/client/util/SharingManager.tsx
@@ -132,19 +132,28 @@ export class SharingManager extends React.Component<{}> {
     populateUsers = async () => {
         if (!this.populating) {
             this.populating = true;
-            runInAction(() => this.users = []);
             const userList = await RequestPromise.get(Utils.prepend("/getUsers"));
             const raw = JSON.parse(userList) as User[];
+            const sharingDocs: ValidatedUser[] = [];
             const evaluating = raw.map(async user => {
                 const isCandidate = user.email !== Doc.CurrentUserEmail;
                 if (isCandidate) {
-                    const userSharingDoc = await DocServer.GetRefField(user.sharingDocumentId);
-                    if (userSharingDoc instanceof Doc) {
-                        runInAction(() => this.users.push({ user, sharingDoc: userSharingDoc, userColor: StrCast(userSharingDoc.userColor) }));
+                    const sharingDoc = await DocServer.GetRefField(user.sharingDocumentId);
+                    if (sharingDoc instanceof Doc) {
+                        sharingDocs.push({ user, sharingDoc, userColor: StrCast(sharingDoc.color) });
                     }
                 }
             });
-            return Promise.all(evaluating).then(() => this.populating = false);
+            return Promise.all(evaluating).then(() => {
+                runInAction(() => {
+                    for (let i = 0; i < sharingDocs.length; i++) {
+                        if (!this.users.find(user => user.user.email === sharingDocs[i].user.email)) {
+                            this.users.push(sharingDocs[i]);
+                        }
+                    }
+                });
+                this.populating = false;
+            });
         }
     }