diff options
author | bobzel <zzzman@gmail.com> | 2020-10-09 01:47:59 -0400 |
---|---|---|
committer | bobzel <zzzman@gmail.com> | 2020-10-09 01:47:59 -0400 |
commit | d4e967ed8fc2f99d44b887ebabf0a4eb642ecaab (patch) | |
tree | 279f99766f6f29ea7552c06cf3c84c4e13388506 | |
parent | 565ab27220e2e626b88642929a4091d3ced893e7 (diff) |
simplified setting group users
-rw-r--r-- | src/client/util/GroupManager.tsx | 10 | ||||
-rw-r--r-- | src/fields/Doc.ts | 1 |
2 files changed, 1 insertions, 10 deletions
diff --git a/src/client/util/GroupManager.tsx b/src/client/util/GroupManager.tsx index fb3342e68..48e3ca737 100644 --- a/src/client/util/GroupManager.tsx +++ b/src/client/util/GroupManager.tsx @@ -59,17 +59,9 @@ export class GroupManager 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 evaluating = raw.map(async user => { - const userSharingDocument = await DocServer.GetRefField(user.sharingDocumentId); - if (userSharingDocument instanceof Doc) { - runInAction(() => this.users.push(user.email)); - } - }); - return Promise.all(evaluating).then(() => this.populating = false); + raw.map(action(user => !this.users.some(umail => umail === user.email) && this.users.push(user.email))); } } diff --git a/src/fields/Doc.ts b/src/fields/Doc.ts index 54d85ba86..d85f0785e 100644 --- a/src/fields/Doc.ts +++ b/src/fields/Doc.ts @@ -25,7 +25,6 @@ import JSZip = require("jszip"); import { saveAs } from "file-saver"; import { CollectionDockingView } from "../client/views/collections/CollectionDockingView"; import { SelectionManager } from "../client/util/SelectionManager"; -import { CurrentUserUtils } from "../client/util/CurrentUserUtils"; export namespace Field { export function toKeyValueString(doc: Doc, key: string): string { |