cleaned up addLink and deleteLink in LinkManager + setting up GroupManager ui + installed multiselect dropdown package + a lot of initial group functionality (incomplete)

3 files changed, 113 insertions, 39 deletions

diff --git a/src/client/util/GroupManager.tsx b/src/client/util/GroupManager.tsx
index c4798e6a9..881583d37 100644
--- a/src/client/util/GroupManager.tsx
+++ b/src/client/util/GroupManager.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { observable, action } from "mobx";
+import { observable, action, runInAction, computed } from "mobx";
 import { SelectionManager } from "./SelectionManager";
 import MainViewModal from "../views/MainViewModal";
 import { observer } from "mobx-react";
@@ -8,6 +8,10 @@ import { List } from "../../fields/List";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import * as fa from '@fortawesome/free-solid-svg-icons';
 import { library } from "@fortawesome/fontawesome-svg-core";
+import SharingManager, { User } from "./SharingManager";
+import { Utils } from "../../Utils";
+import * as RequestPromise from "request-promise";
+import Select from 'react-select';
 
 library.add(fa.faWindowClose);
 
@@ -18,15 +22,33 @@ export default class GroupManager extends React.Component<{}> {
     @observable private isOpen: boolean = false; // whether the menu is open or not
     @observable private dialogueBoxOpacity: number = 1;
     @observable private overlayOpacity: number = 0.4;
+    @observable private users: string[] = [];
+    @observable private selectedUsers: string[] | null = null;
 
     constructor(props: Readonly<{}>) {
         super(props);
         GroupManager.Instance = this;
     }
 
+    componentDidMount() {
+        console.log("mounted");
+    }
+
+    populateUsers = async () => {
+        const userList: User[] = JSON.parse(await RequestPromise.get(Utils.prepend("/getUsers")));
+        const currentUserIndex = userList.findIndex(user => user.email === Doc.CurrentUserEmail);
+        currentUserIndex !== -1 && userList.splice(currentUserIndex, 1);
+        return userList.map(user => user.email);
+    }
+
+    @computed get options() {
+        return this.users.map(user => ({ label: user, value: user }));
+    }
+
     open = action(() => {
         SelectionManager.DeselectAll();
         this.isOpen = true;
+        this.populateUsers().then(resolved => runInAction(() => this.users = resolved));
     });
 
     close = action(() => {
@@ -42,29 +64,91 @@ export default class GroupManager extends React.Component<{}> {
         return groupDoc ? DocListCast(groupDoc.data) : [];
     }
 
+    getGroup(groupName: string): Doc | undefined {
+        const groupDoc = GroupManager.Instance.getAllGroups().find(group => group.name === groupName);
+        return groupDoc;
+    }
+
+    get adminGroupMembers(): string[] {
+        return JSON.parse(GroupManager.Instance.getGroup("admin")!.members as string);
+    }
+
+    hasEditAccess(groupDoc: Doc): boolean {
+        const accessList: string[] = JSON.parse(groupDoc.owners as string);
+        return accessList.includes(Doc.CurrentUserEmail) || GroupManager.Instance.adminGroupMembers.includes(Doc.CurrentUserEmail);
+    }
+
+    createGroupDoc(groupName: string, memberEmails: string[]) {
+        const groupDoc = new Doc;
+        groupDoc.groupName = groupName;
+        groupDoc.owners = JSON.stringify([Doc.CurrentUserEmail]);
+        groupDoc.members = JSON.stringify(memberEmails);
+        this.addGroup(groupDoc);
+    }
+
     addGroup(groupDoc: Doc): boolean {
-        const groupList = GroupManager.Instance.getAllGroups();
-        groupList.push(groupDoc);
+        // const groupList = GroupManager.Instance.getAllGroups();
+        // groupList.push(groupDoc);
         if (GroupManager.Instance.GroupManagerDoc) {
-            GroupManager.Instance.GroupManagerDoc.data = new List<Doc>(groupList);
+            Doc.AddDocToList(GroupManager.Instance.GroupManagerDoc, "data", groupDoc);
+            // GroupManager.Instance.GroupManagerDoc.data = new List<Doc>(groupList);
             return true;
         }
         return false;
     }
 
-    deleteGroup(groupDoc: Doc): boolean {
-        const groupList = GroupManager.Instance.getAllGroups();
-        const index = groupList.indexOf(groupDoc);
-        if (index !== -1) {
-            groupList.splice(index, 1);
-            if (GroupManager.Instance.GroupManagerDoc) {
-                GroupManager.Instance.GroupManagerDoc.data = new List<Doc>(groupList);
+    deleteGroup(groupName: string): boolean {
+        // const groupList = GroupManager.Instance.getAllGroups();
+        // const index = groupList.indexOf(groupDoc);
+        // if (index !== -1) {
+        // groupList.splice(index, 1);
+        const groupDoc = GroupManager.Instance.getGroup(groupName);
+        if (groupDoc) {
+            if (GroupManager.Instance.GroupManagerDoc && GroupManager.Instance.hasEditAccess(groupDoc)) {
+                // GroupManager.Instance.GroupManagerDoc.data = new List<Doc>(groupList);
+                Doc.RemoveDocFromList(GroupManager.Instance.GroupManagerDoc, "data", groupDoc);
                 return true;
             }
         }
+
+
         return false;
     }
 
+    addMemberToGroup(groupDoc: Doc, email: string) {
+        if (GroupManager.Instance.hasEditAccess(groupDoc)) {
+            const memberList: string[] = JSON.parse(groupDoc.members as string);
+            !memberList.includes(email) && memberList.push(email);
+            groupDoc.members = JSON.stringify(memberList);
+        }
+    }
+
+    removeMemberFromGroup(groupDoc: Doc, email: string) {
+        if (GroupManager.Instance.hasEditAccess(groupDoc)) {
+            const memberList: string[] = JSON.parse(groupDoc.members as string);
+            const index = memberList.indexOf(email);
+            index !== -1 && memberList.splice(index, 1);
+            groupDoc.members = JSON.stringify(memberList);
+        }
+    }
+
+    @action
+    handleChange = (selectedOptions: any) => {
+        const castOptions = selectedOptions as { label: string, value: string }[];
+        console.log(castOptions);
+        this.selectedUsers = castOptions.map(option => option.value);
+    }
+
+    @action
+    resetSelection = () => {
+        console.log(this.selectedUsers?.[0]);
+        this.selectedUsers = null;
+    }
+
+    createGroup = () => {
+        this.selectedUsers = null;
+    }
+
     private get groupInterface() {
         return (
             <div className="settings-interface">
@@ -73,13 +157,21 @@ export default class GroupManager extends React.Component<{}> {
                     <div className={"close-button"} onClick={this.close}>
                         <FontAwesomeIcon icon={fa.faWindowClose} size={"lg"} />
                     </div>
+                    <button onClick={this.resetSelection} style={{ width: "50%" }}>Create group</button>
                 </div>
-                <div className="settings-body">
-                    <div className="settings-type">
-                        <button value="password">reset password</button>
-                        <button value="data">{`toggle novice mode`}</button>
-                    </div>
-                </div>
+                <span style={{ width: "50%" }}>
+                    <Select
+                        isMulti={true}
+                        isSearchable={true}
+                        options={this.options}
+                        onChange={this.handleChange}
+                        placeholder={"Select users"}
+                        value={this.selectedUsers}
+                    />
+                </span>
+                <span>
+                    <input type="text" id="groupNameInput" />
+                </span>
             </div>
         );
     }
diff --git a/src/client/util/LinkManager.ts b/src/client/util/LinkManager.ts
index 47b2541bd..94a0da985 100644
--- a/src/client/util/LinkManager.ts
+++ b/src/client/util/LinkManager.ts
@@ -41,24 +41,17 @@ export class LinkManager {
     }
 
     public addLink(linkDoc: Doc): boolean {
-        const linkList = LinkManager.Instance.getAllLinks();
-        linkList.push(linkDoc);
         if (LinkManager.Instance.LinkManagerDoc) {
-            LinkManager.Instance.LinkManagerDoc.data = new List<Doc>(linkList);
+            Doc.AddDocToList(LinkManager.Instance.LinkManagerDoc, "data", linkDoc);
             return true;
         }
         return false;
     }
 
     public deleteLink(linkDoc: Doc): boolean {
-        const linkList = LinkManager.Instance.getAllLinks();
-        const index = LinkManager.Instance.getAllLinks().indexOf(linkDoc);
-        if (index > -1) {
-            linkList.splice(index, 1);
-            if (LinkManager.Instance.LinkManagerDoc) {
-                LinkManager.Instance.LinkManagerDoc.data = new List<Doc>(linkList);
-                return true;
-            }
+        if (LinkManager.Instance.LinkManagerDoc) {
+            Doc.RemoveDocFromList(LinkManager.Instance.LinkManagerDoc, "data", linkDoc);
+            return true;
         }
         return false;
     }
diff --git a/src/server/ApiManagers/UserManager.ts b/src/server/ApiManagers/UserManager.ts
index 5e7bb6855..0d1d8f218 100644
--- a/src/server/ApiManagers/UserManager.ts
+++ b/src/server/ApiManagers/UserManager.ts
@@ -27,17 +27,6 @@ export default class UserManager extends ApiManager {
 
         register({
             method: Method.GET,
-            subscription: "/getGroups",
-            secureHandler: async ({ res }) => {
-                console.log(Database.Instance.getCollectionNames());
-                const cursor = await Database.Instance.query({}, { name: 1, owner: 1, members: 1 }, "groups");
-                const results = await cursor.toArray();
-                res.send(results.map(group => ({ name: group.name, owner: group.owner, members: group.members })));
-            }
-        });
-
-        register({
-            method: Method.GET,
             subscription: "/getUserDocumentId",
             secureHandler: ({ res, user }) => res.send(user.userDocumentId)
         });