* WIP - got one API test to pass yay * adds group update endpoint * added group policies * adds groups.list API * adds groups.info * remove comment * WIP * tests for delete * adds group membership list * adds tests for groups list * add and remove user endpoints for group * ask some questions * fix up some issues around primary keys * remove export from group permissions Co-Authored-By: Tom Moor <tom.moor@gmail.com> * remove random file * only create events on actual updates, add tests to ensure * adds uniqueness validation to group name * throw validation errors on model and let it pass through the controller * fix linting * WIP * WIP * WIP * WIP * WIP basic edit and delete * basic CRUD for groups and memberships in place * got member counts working * add member count and limit the number of users sent over teh wire to 6 * factor avatar with AvatarWithPresence into its own class * wip * WIP avatars in group lists * WIP collection groups * add and remove group endpoints * wip add collection groups * wip get group adding to collections to work * wip get updating collection group memberships to work * wip get new group modal working * add tests for collection index * include collection groups in the withmemberships scope * tie permissions to group memberships * remove unused import * Update app/components/GroupListItem.js update title copy Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update server/migrations/20191211044318-create-groups.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update server/api/groups.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update server/api/groups.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/menus/CollectionMenu.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update server/models/Group.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * minor fixes * Update app/scenes/CollectionMembers/AddGroupsToCollection.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/menus/GroupMenu.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/menus/GroupMenu.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/menus/GroupMenu.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/Collection.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/CollectionMembers/CollectionMembers.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/GroupNew.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/GroupNew.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/Settings/Groups.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update server/api/documents.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * Update app/scenes/CollectionMembers/components/CollectionGroupMemberListItem.js Co-Authored-By: Tom Moor <tom.moor@gmail.com> * address comments * WIP - getting websocket stuff up and running * socket event for group deletion * wrapped up cascading deletes * lint * flow * fix: UI feedback * fix: Facepile size * fix: Lots of missing await's * Allow clicking facepile on group list item to open members * remove unused route push, grammar * fix: Remove bad analytics events feat: Add group events to audit log * collection. -> collections. * Add groups to entity websocket events (sync create/update/delete) between clients * fix: Users should not be able to see groups they are not a member of * fix: Not caching errors in UI when changing group memberships * fix: Hide unusable UI * test * fix: Tweak language * feat: Automatically open 'add member' modal after creating group Co-authored-by: Tom Moor <tom.moor@gmail.com>
260 lines
7.8 KiB
JavaScript
260 lines
7.8 KiB
JavaScript
// @flow
|
|
import * as React from 'react';
|
|
import { observable } from 'mobx';
|
|
import styled from 'styled-components';
|
|
import { inject, observer } from 'mobx-react';
|
|
import { PlusIcon } from 'outline-icons';
|
|
import Flex from 'shared/components/Flex';
|
|
import HelpText from 'components/HelpText';
|
|
import Subheading from 'components/Subheading';
|
|
import Button from 'components/Button';
|
|
import Empty from 'components/Empty';
|
|
import PaginatedList from 'components/PaginatedList';
|
|
import Modal from 'components/Modal';
|
|
import CollectionGroupMemberListItem from './components/CollectionGroupMemberListItem';
|
|
import Collection from 'models/Collection';
|
|
import UiStore from 'stores/UiStore';
|
|
import AuthStore from 'stores/AuthStore';
|
|
import MembershipsStore from 'stores/MembershipsStore';
|
|
import CollectionGroupMembershipsStore from 'stores/CollectionGroupMembershipsStore';
|
|
import UsersStore from 'stores/UsersStore';
|
|
import MemberListItem from './components/MemberListItem';
|
|
import AddPeopleToCollection from './AddPeopleToCollection';
|
|
import AddGroupsToCollection from './AddGroupsToCollection';
|
|
import GroupsStore from 'stores/GroupsStore';
|
|
|
|
type Props = {
|
|
ui: UiStore,
|
|
auth: AuthStore,
|
|
collection: Collection,
|
|
users: UsersStore,
|
|
memberships: MembershipsStore,
|
|
collectionGroupMemberships: CollectionGroupMembershipsStore,
|
|
groups: GroupsStore,
|
|
onEdit: () => void,
|
|
};
|
|
|
|
@observer
|
|
class CollectionMembers extends React.Component<Props> {
|
|
@observable addGroupModalOpen: boolean = false;
|
|
@observable addMemberModalOpen: boolean = false;
|
|
|
|
handleAddGroupModalOpen = () => {
|
|
this.addGroupModalOpen = true;
|
|
};
|
|
|
|
handleAddGroupModalClose = () => {
|
|
this.addGroupModalOpen = false;
|
|
};
|
|
|
|
handleAddMemberModalOpen = () => {
|
|
this.addMemberModalOpen = true;
|
|
};
|
|
|
|
handleAddMemberModalClose = () => {
|
|
this.addMemberModalOpen = false;
|
|
};
|
|
|
|
handleRemoveUser = user => {
|
|
try {
|
|
this.props.memberships.delete({
|
|
collectionId: this.props.collection.id,
|
|
userId: user.id,
|
|
});
|
|
this.props.ui.showToast(`${user.name} was removed from the collection`);
|
|
} catch (err) {
|
|
this.props.ui.showToast('Could not remove user');
|
|
}
|
|
};
|
|
|
|
handleUpdateUser = (user, permission) => {
|
|
try {
|
|
this.props.memberships.create({
|
|
collectionId: this.props.collection.id,
|
|
userId: user.id,
|
|
permission,
|
|
});
|
|
this.props.ui.showToast(`${user.name} permissions were updated`);
|
|
} catch (err) {
|
|
this.props.ui.showToast('Could not update user');
|
|
}
|
|
};
|
|
|
|
handleRemoveGroup = group => {
|
|
try {
|
|
this.props.collectionGroupMemberships.delete({
|
|
collectionId: this.props.collection.id,
|
|
groupId: group.id,
|
|
});
|
|
this.props.ui.showToast(`${group.name} was removed from the collection`);
|
|
} catch (err) {
|
|
this.props.ui.showToast('Could not remove group');
|
|
}
|
|
};
|
|
|
|
handleUpdateGroup = (group, permission) => {
|
|
try {
|
|
this.props.collectionGroupMemberships.create({
|
|
collectionId: this.props.collection.id,
|
|
groupId: group.id,
|
|
permission,
|
|
});
|
|
this.props.ui.showToast(`${group.name} permissions were updated`);
|
|
} catch (err) {
|
|
this.props.ui.showToast('Could not update user');
|
|
}
|
|
};
|
|
|
|
render() {
|
|
const {
|
|
collection,
|
|
users,
|
|
groups,
|
|
memberships,
|
|
collectionGroupMemberships,
|
|
auth,
|
|
} = this.props;
|
|
const { user } = auth;
|
|
if (!user) return null;
|
|
|
|
const key = memberships.orderedData
|
|
.map(m => m.permission)
|
|
.concat(collection.private)
|
|
.join('-');
|
|
|
|
return (
|
|
<Flex column>
|
|
{collection.private ? (
|
|
<React.Fragment>
|
|
<HelpText>
|
|
Choose which groups and team members have access to view and edit
|
|
documents in the private <strong>{collection.name}</strong>{' '}
|
|
collection. You can make this collection visible to the entire
|
|
team by{' '}
|
|
<a role="button" onClick={this.props.onEdit}>
|
|
changing its visibility
|
|
</a>.
|
|
</HelpText>
|
|
<span>
|
|
<Button
|
|
type="button"
|
|
onClick={this.handleAddGroupModalOpen}
|
|
icon={<PlusIcon />}
|
|
neutral
|
|
>
|
|
Add groups
|
|
</Button>
|
|
</span>
|
|
</React.Fragment>
|
|
) : (
|
|
<HelpText>
|
|
The <strong>{collection.name}</strong> collection is accessible by
|
|
everyone on the team. If you want to limit who can view the
|
|
collection,{' '}
|
|
<a role="button" onClick={this.props.onEdit}>
|
|
make it private
|
|
</a>.
|
|
</HelpText>
|
|
)}
|
|
|
|
{collection.private && (
|
|
<GroupsWrap>
|
|
<Subheading>Groups</Subheading>
|
|
<PaginatedList
|
|
key={key}
|
|
items={groups.inCollection(collection.id)}
|
|
fetch={collectionGroupMemberships.fetchPage}
|
|
options={collection.private ? { id: collection.id } : undefined}
|
|
empty={<Empty>This collection has no groups.</Empty>}
|
|
renderItem={group => (
|
|
<CollectionGroupMemberListItem
|
|
key={group.id}
|
|
group={group}
|
|
collectionGroupMembership={collectionGroupMemberships.get(
|
|
`${group.id}-${collection.id}`
|
|
)}
|
|
onRemove={() => this.handleRemoveGroup(group)}
|
|
onUpdate={permission =>
|
|
this.handleUpdateGroup(group, permission)
|
|
}
|
|
/>
|
|
)}
|
|
/>
|
|
<Modal
|
|
title={`Add groups to ${collection.name}`}
|
|
onRequestClose={this.handleAddGroupModalClose}
|
|
isOpen={this.addGroupModalOpen}
|
|
>
|
|
<AddGroupsToCollection
|
|
collection={collection}
|
|
onSubmit={this.handleAddGroupModalClose}
|
|
/>
|
|
</Modal>
|
|
</GroupsWrap>
|
|
)}
|
|
{collection.private ? (
|
|
<React.Fragment>
|
|
<span>
|
|
<Button
|
|
type="button"
|
|
onClick={this.handleAddMemberModalOpen}
|
|
icon={<PlusIcon />}
|
|
neutral
|
|
>
|
|
Add individual members
|
|
</Button>
|
|
</span>
|
|
|
|
<Subheading>Individual Members</Subheading>
|
|
</React.Fragment>
|
|
) : (
|
|
<Subheading>Members</Subheading>
|
|
)}
|
|
<PaginatedList
|
|
key={key}
|
|
items={
|
|
collection.private
|
|
? users.inCollection(collection.id)
|
|
: users.active
|
|
}
|
|
fetch={collection.private ? memberships.fetchPage : users.fetchPage}
|
|
options={collection.private ? { id: collection.id } : undefined}
|
|
renderItem={item => (
|
|
<MemberListItem
|
|
key={item.id}
|
|
user={item}
|
|
membership={memberships.get(`${item.id}-${collection.id}`)}
|
|
canEdit={collection.private && item.id !== user.id}
|
|
onRemove={() => this.handleRemoveUser(item)}
|
|
onUpdate={permission => this.handleUpdateUser(item, permission)}
|
|
/>
|
|
)}
|
|
/>
|
|
<Modal
|
|
title={`Add people to ${collection.name}`}
|
|
onRequestClose={this.handleAddMemberModalClose}
|
|
isOpen={this.addMemberModalOpen}
|
|
>
|
|
<AddPeopleToCollection
|
|
collection={collection}
|
|
onSubmit={this.handleAddMemberModalClose}
|
|
/>
|
|
</Modal>
|
|
</Flex>
|
|
);
|
|
}
|
|
}
|
|
|
|
const GroupsWrap = styled.div`
|
|
margin-bottom: 50px;
|
|
`;
|
|
|
|
export default inject(
|
|
'auth',
|
|
'users',
|
|
'memberships',
|
|
'collectionGroupMemberships',
|
|
'groups',
|
|
'ui'
|
|
)(CollectionMembers);
|