From 6f4b35d24b2e4cbceaa6dffa46a909c3e92db0b5 Mon Sep 17 00:00:00 2001 From: usodhi <61431818+usodhi@users.noreply.github.com> Date: Wed, 24 Jun 2020 18:20:30 +0530 Subject: a lot of ui stuff --- src/client/util/GroupManager.tsx | 87 ++++++++++++++++++++++++---------------- 1 file changed, 53 insertions(+), 34 deletions(-) (limited to 'src/client/util/GroupManager.tsx') diff --git a/src/client/util/GroupManager.tsx b/src/client/util/GroupManager.tsx index 881583d37..2617047f7 100644 --- a/src/client/util/GroupManager.tsx +++ b/src/client/util/GroupManager.tsx @@ -12,9 +12,15 @@ import SharingManager, { User } from "./SharingManager"; import { Utils } from "../../Utils"; import * as RequestPromise from "request-promise"; import Select from 'react-select'; +import "./GroupManager.scss"; library.add(fa.faWindowClose); +interface UserOptions { + label: string; + value: string; +} + @observer export default class GroupManager extends React.Component<{}> { @@ -23,7 +29,8 @@ export default class GroupManager extends React.Component<{}> { @observable private dialogueBoxOpacity: number = 1; @observable private overlayOpacity: number = 0.4; @observable private users: string[] = []; - @observable private selectedUsers: string[] | null = null; + @observable private selectedUsers: UserOptions[] | null = null; + private inputRef: React.RefObject = React.createRef(); constructor(props: Readonly<{}>) { super(props); @@ -65,7 +72,7 @@ export default class GroupManager extends React.Component<{}> { } getGroup(groupName: string): Doc | undefined { - const groupDoc = GroupManager.Instance.getAllGroups().find(group => group.name === groupName); + const groupDoc = GroupManager.Instance.getAllGroups().find(group => group.groupName === groupName); return groupDoc; } @@ -74,6 +81,7 @@ export default class GroupManager extends React.Component<{}> { } hasEditAccess(groupDoc: Doc): boolean { + if (!groupDoc) return false; const accessList: string[] = JSON.parse(groupDoc.owners as string); return accessList.includes(Doc.CurrentUserEmail) || GroupManager.Instance.adminGroupMembers.includes(Doc.CurrentUserEmail); } @@ -87,25 +95,17 @@ export default class GroupManager extends React.Component<{}> { } addGroup(groupDoc: Doc): boolean { - // const groupList = GroupManager.Instance.getAllGroups(); - // groupList.push(groupDoc); if (GroupManager.Instance.GroupManagerDoc) { Doc.AddDocToList(GroupManager.Instance.GroupManagerDoc, "data", groupDoc); - // GroupManager.Instance.GroupManagerDoc.data = new List(groupList); return true; } return false; } 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(groupList); Doc.RemoveDocFromList(GroupManager.Instance.GroupManagerDoc, "data", groupDoc); return true; } @@ -134,44 +134,63 @@ export default class GroupManager extends React.Component<{}> { @action handleChange = (selectedOptions: any) => { - const castOptions = selectedOptions as { label: string, value: string }[]; - console.log(castOptions); - this.selectedUsers = castOptions.map(option => option.value); + console.log(selectedOptions); + this.selectedUsers = selectedOptions as UserOptions[]; } @action - resetSelection = () => { - console.log(this.selectedUsers?.[0]); - this.selectedUsers = null; - } - createGroup = () => { + if (!this.inputRef.current?.value) { + alert("Please enter a group name"); + return; + } + if (!this.selectedUsers) { + alert("Please select users"); + return; + } + if (this.getAllGroups().find(group => group.groupName === this.inputRef.current!.value)) { // why do I need null check here? + alert("Please select a unique group name"); + return; + } + this.createGroupDoc(this.inputRef.current.value, this.selectedUsers.map(user => user.value)); this.selectedUsers = null; + this.inputRef.current.value = ""; } private get groupInterface() { return ( -
-
+
+

Groups

-
- - - +
+
+ + +