diff options
| -rw-r--r-- | package-lock.json | 70 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/client/util/GroupManager.tsx | 126 | ||||
| -rw-r--r-- | src/client/util/LinkManager.ts | 15 | ||||
| -rw-r--r-- | src/server/ApiManagers/UserManager.ts | 11 |
5 files changed, 185 insertions, 39 deletions
diff --git a/package-lock.json b/package-lock.json index c601e68fb..1d4d39826 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1005,6 +1005,17 @@ "@types/react": "*" } }, + "@types/react-select": { + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/@types/react-select/-/react-select-3.0.13.tgz", + "integrity": "sha512-JxmSArGgzAOtb37+Jz2+3av8rVmp/3s3DGwlcP+g59/a3owkiuuU4/Jajd+qA32beDPHy4gJR2kkxagPY3j9kg==", + "dev": true, + "requires": { + "@types/react": "*", + "@types/react-dom": "*", + "@types/react-transition-group": "*" + } + }, "@types/react-table": { "version": "6.8.7", "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-6.8.7.tgz", @@ -1013,6 +1024,15 @@ "@types/react": "*" } }, + "@types/react-transition-group": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.0.tgz", + "integrity": "sha512-/QfLHGpu+2fQOqQaXh8MG9q03bFENooTb/it4jr5kKaZlDQfWvjqWZg48AwzPVMBHlRuTRAY7hRHCEOXz5kV6w==", + "dev": true, + "requires": { + "@types/react": "*" + } + }, "@types/request": { "version": "2.48.4", "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.4.tgz", @@ -8357,6 +8377,11 @@ "p-is-promise": "^2.0.0" } }, + "memoize-one": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.1.1.tgz", + "integrity": "sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA==" + }, "memory-fs": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", @@ -14280,6 +14305,14 @@ "react-modal": "^3.4.4" } }, + "react-input-autosize": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/react-input-autosize/-/react-input-autosize-2.2.2.tgz", + "integrity": "sha512-jQJgYCA3S0j+cuOwzuCd1OjmBmnZLdqQdiLKRYrsMMzbjUrVDS5RvJUDwJqA7sKuksDuzFtm6hZGKFu7Mjk5aw==", + "requires": { + "prop-types": "^15.5.8" + } + }, "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -14357,6 +14390,43 @@ "react-draggable": "^4.0.3" } }, + "react-select": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/react-select/-/react-select-3.1.0.tgz", + "integrity": "sha512-wBFVblBH1iuCBprtpyGtd1dGMadsG36W5/t2Aj8OE6WbByDg5jIFyT7X5gT+l0qmT5TqWhxX+VsKJvCEl2uL9g==", + "requires": { + "@babel/runtime": "^7.4.4", + "@emotion/cache": "^10.0.9", + "@emotion/core": "^10.0.9", + "@emotion/css": "^10.0.9", + "memoize-one": "^5.0.0", + "prop-types": "^15.6.0", + "react-input-autosize": "^2.2.2", + "react-transition-group": "^4.3.0" + }, + "dependencies": { + "dom-helpers": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.4.tgz", + "integrity": "sha512-TjMyeVUvNEnOnhzs6uAn9Ya47GmMo3qq7m+Lr/3ON0Rs5kHvb8I+SQYjLUSYn7qhEm0QjW0yrBkvz9yOrwwz1A==", + "requires": { + "@babel/runtime": "^7.8.7", + "csstype": "^2.6.7" + } + }, + "react-transition-group": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz", + "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==", + "requires": { + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2" + } + } + } + }, "react-table": { "version": "6.11.5", "resolved": "https://registry.npmjs.org/react-table/-/react-table-6.11.5.tgz", diff --git a/package.json b/package.json index 096c26cd0..0e6906fc8 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "@types/react-dom": "^16.9.5", "@types/react-grid-layout": "^0.17.1", "@types/react-measure": "^2.0.6", + "@types/react-select": "^3.0.13", "@types/react-table": "^6.8.6", "@types/request": "^2.48.4", "@types/request-promise": "^4.1.45", @@ -214,6 +215,7 @@ "react-jsx-parser": "^1.21.0", "react-measure": "^2.2.4", "react-resizable": "^1.10.1", + "react-select": "^3.1.0", "react-table": "^6.11.5", "readline": "^1.3.0", "request": "^2.88.0", 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) }); |