feat: Memberships (#1032)
* WIP * feat: Add collection.memberships endpoint * feat: Add ability to filter collection.memberships with query * WIP * Merge stashed work * feat: Add ability to filter memberships by permission * continued refactoring * paginated list component * Collection member management * fix: Incorrect policy data sent down after collection.update * Reduce duplication, add empty state * cleanup * fix: Modal close should be a real button * fix: Allow opening edit from modal * fix: remove unused methods * test: fix * Passing test suite * Refactor * fix: Flow UI errors * test: Add collections.update tests * lint * test: moar tests * fix: Missing scopes, more missing tests * fix: Handle collection privacy change over socket * fix: More membership scopes * fix: view endpoint permissions * fix: respond to privacy change on socket event * policy driven menus * fix: share endpoint policies * chore: Use policies to drive documents UI * alignment * fix: Header height * fix: Correct behavior when collection becomes private * fix: Header height for read-only collection * send id's over socket instead of serialized objects * fix: Remote policy change * fix: reduce collection fetching * More websocket efficiencies * fix: Document collection pinning * fix: Restored ability to edit drafts fix: Removed ability to star drafts * fix: Require write permissions to pin doc to collection * fix: Header title overlaying document actions at small screen sizes * fix: Jank on load caused by previous commit * fix: Double collection fetch post-publish * fix: Hide publish button if draft is in no longer accessible collection * fix: Always allow deleting drafts fix: Improved handling of deleted documents * feat: Show collections in drafts view feat: Show more obvious 'draft' badge on documents * fix: incorrect policies after publish to private collection * fix: Duplicating a draft publishes it
This commit is contained in:
Tom Moor
GitHub
122
app/scenes/CollectionMembers/AddPeopleToCollection.js
Normal file
122
app/scenes/CollectionMembers/AddPeopleToCollection.js
Normal file
@@ -0,0 +1,122 @@
|
||||
// @flow
|
||||
import * as React from 'react';
|
||||
import { inject, observer } from 'mobx-react';
|
||||
import { observable } from 'mobx';
|
||||
import { debounce } from 'lodash';
|
||||
import Flex from 'shared/components/Flex';
|
||||
import HelpText from 'components/HelpText';
|
||||
import Input from 'components/Input';
|
||||
import Modal from 'components/Modal';
|
||||
import Empty from 'components/Empty';
|
||||
import PaginatedList from 'components/PaginatedList';
|
||||
import Invite from 'scenes/Invite';
|
||||
import Collection from 'models/Collection';
|
||||
import UiStore from 'stores/UiStore';
|
||||
import AuthStore from 'stores/AuthStore';
|
||||
import UsersStore from 'stores/UsersStore';
|
||||
import MembershipsStore from 'stores/MembershipsStore';
|
||||
import MemberListItem from './components/MemberListItem';
|
||||
|
||||
type Props = {
|
||||
ui: UiStore,
|
||||
auth: AuthStore,
|
||||
collection: Collection,
|
||||
memberships: MembershipsStore,
|
||||
users: UsersStore,
|
||||
onSubmit: () => void,
|
||||
};
|
||||
|
||||
@observer
|
||||
class AddPeopleToCollection extends React.Component<Props> {
|
||||
@observable inviteModalOpen: boolean = false;
|
||||
@observable query: string = '';
|
||||
|
||||
handleInviteModalOpen = () => {
|
||||
this.inviteModalOpen = true;
|
||||
};
|
||||
|
||||
handleInviteModalClose = () => {
|
||||
this.inviteModalOpen = false;
|
||||
};
|
||||
|
||||
handleFilter = (ev: SyntheticInputEvent<HTMLInputElement>) => {
|
||||
this.query = ev.target.value;
|
||||
this.debouncedFetch();
|
||||
};
|
||||
|
||||
debouncedFetch = debounce(() => {
|
||||
this.props.users.fetchPage({
|
||||
query: this.query,
|
||||
});
|
||||
}, 250);
|
||||
|
||||
handleAddUser = user => {
|
||||
try {
|
||||
this.props.memberships.create({
|
||||
collectionId: this.props.collection.id,
|
||||
userId: user.id,
|
||||
permission: 'read_write',
|
||||
});
|
||||
this.props.ui.showToast(`${user.name} was added to the collection`);
|
||||
} catch (err) {
|
||||
this.props.ui.showToast('Could not add user');
|
||||
}
|
||||
};
|
||||
|
||||
render() {
|
||||
const { users, collection, auth } = this.props;
|
||||
const { user, team } = auth;
|
||||
if (!user || !team) return null;
|
||||
|
||||
return (
|
||||
<Flex column>
|
||||
<HelpText>
|
||||
Need to add someone who’s not yet on the team yet?{' '}
|
||||
<a role="button" onClick={this.handleInviteModalOpen}>
|
||||
Invite people to {team.name}
|
||||
</a>.
|
||||
</HelpText>
|
||||
|
||||
<Input
|
||||
type="search"
|
||||
placeholder="Search by name…"
|
||||
value={this.query}
|
||||
onChange={this.handleFilter}
|
||||
label="Search people"
|
||||
labelHidden
|
||||
flex
|
||||
/>
|
||||
<PaginatedList
|
||||
empty={
|
||||
this.query ? (
|
||||
<Empty>No people matching your search</Empty>
|
||||
) : (
|
||||
<Empty>No people left to add</Empty>
|
||||
)
|
||||
}
|
||||
items={users.notInCollection(collection.id, this.query)}
|
||||
fetch={this.query ? undefined : users.fetchPage}
|
||||
renderItem={item => (
|
||||
<MemberListItem
|
||||
key={item.id}
|
||||
user={item}
|
||||
onAdd={() => this.handleAddUser(item)}
|
||||
canEdit
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
<Modal
|
||||
title="Invite people"
|
||||
onRequestClose={this.handleInviteModalClose}
|
||||
isOpen={this.inviteModalOpen}
|
||||
>
|
||||
<Invite onSubmit={this.handleInviteModalClose} />
|
||||
</Modal>
|
||||
</Flex>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default inject('auth', 'users', 'memberships', 'ui')(
|
||||
AddPeopleToCollection
|
||||
);
|
||||
143
app/scenes/CollectionMembers/CollectionMembers.js
Normal file
143
app/scenes/CollectionMembers/CollectionMembers.js
Normal file
@@ -0,0 +1,143 @@
|
||||
// @flow
|
||||
import * as React from 'react';
|
||||
import { observable } from 'mobx';
|
||||
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 PaginatedList from 'components/PaginatedList';
|
||||
import Modal from 'components/Modal';
|
||||
import Collection from 'models/Collection';
|
||||
import UiStore from 'stores/UiStore';
|
||||
import AuthStore from 'stores/AuthStore';
|
||||
import MembershipsStore from 'stores/MembershipsStore';
|
||||
import UsersStore from 'stores/UsersStore';
|
||||
import MemberListItem from './components/MemberListItem';
|
||||
import AddPeopleToCollection from './AddPeopleToCollection';
|
||||
|
||||
type Props = {
|
||||
ui: UiStore,
|
||||
auth: AuthStore,
|
||||
collection: Collection,
|
||||
users: UsersStore,
|
||||
memberships: MembershipsStore,
|
||||
onEdit: () => void,
|
||||
};
|
||||
|
||||
@observer
|
||||
class CollectionMembers extends React.Component<Props> {
|
||||
@observable addModalOpen: boolean = false;
|
||||
|
||||
handleAddModalOpen = () => {
|
||||
this.addModalOpen = true;
|
||||
};
|
||||
|
||||
handleAddModalClose = () => {
|
||||
this.addModalOpen = 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');
|
||||
}
|
||||
};
|
||||
|
||||
render() {
|
||||
const { collection, users, memberships, auth } = this.props;
|
||||
const { user } = auth;
|
||||
if (!user) return null;
|
||||
|
||||
const key = memberships.orderedData.map(m => m.permission).join('-');
|
||||
|
||||
return (
|
||||
<Flex column>
|
||||
{collection.private ? (
|
||||
<React.Fragment>
|
||||
<HelpText>
|
||||
Choose which 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.handleAddModalOpen}
|
||||
icon={<PlusIcon />}
|
||||
neutral
|
||||
>
|
||||
Add people
|
||||
</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>
|
||||
)}
|
||||
|
||||
<Subheading>Members</Subheading>
|
||||
<PaginatedList
|
||||
key={key}
|
||||
items={
|
||||
collection.private
|
||||
? users.inCollection(collection.id)
|
||||
: users.orderedData
|
||||
}
|
||||
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.handleAddModalClose}
|
||||
isOpen={this.addModalOpen}
|
||||
>
|
||||
<AddPeopleToCollection
|
||||
collection={collection}
|
||||
onSubmit={this.handleAddModalClose}
|
||||
/>
|
||||
</Modal>
|
||||
</Flex>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
export default inject('auth', 'users', 'memberships', 'ui')(CollectionMembers);
|
||||
82
app/scenes/CollectionMembers/components/MemberListItem.js
Normal file
82
app/scenes/CollectionMembers/components/MemberListItem.js
Normal file
@@ -0,0 +1,82 @@
|
||||
// @flow
|
||||
import * as React from 'react';
|
||||
import styled from 'styled-components';
|
||||
import Avatar from 'components/Avatar';
|
||||
import Flex from 'shared/components/Flex';
|
||||
import Time from 'shared/components/Time';
|
||||
import Badge from 'components/Badge';
|
||||
import Button from 'components/Button';
|
||||
import InputSelect from 'components/InputSelect';
|
||||
import ListItem from 'components/List/Item';
|
||||
import User from 'models/User';
|
||||
import Membership from 'models/Membership';
|
||||
import { DropdownMenu, DropdownMenuItem } from 'components/DropdownMenu';
|
||||
|
||||
const PERMISSIONS = [
|
||||
{ label: 'Read only', value: 'read' },
|
||||
{ label: 'Read & Edit', value: 'read_write' },
|
||||
];
|
||||
type Props = {
|
||||
user: User,
|
||||
membership?: ?Membership,
|
||||
canEdit: boolean,
|
||||
onAdd?: () => void,
|
||||
onRemove?: () => void,
|
||||
onUpdate?: (permission: string) => void,
|
||||
};
|
||||
|
||||
const MemberListItem = ({
|
||||
user,
|
||||
membership,
|
||||
onRemove,
|
||||
onUpdate,
|
||||
onAdd,
|
||||
canEdit,
|
||||
}: Props) => {
|
||||
return (
|
||||
<ListItem
|
||||
title={user.name}
|
||||
subtitle={
|
||||
<React.Fragment>
|
||||
Joined <Time dateTime={user.createdAt} /> ago
|
||||
{user.isAdmin && <Badge admin={user.isAdmin}>Admin</Badge>}
|
||||
</React.Fragment>
|
||||
}
|
||||
image={<Avatar src={user.avatarUrl} size={32} />}
|
||||
actions={
|
||||
<Flex align="center">
|
||||
{canEdit &&
|
||||
onUpdate && (
|
||||
<Select
|
||||
label="Permissions"
|
||||
options={PERMISSIONS}
|
||||
value={membership ? membership.permission : undefined}
|
||||
onChange={ev => onUpdate(ev.target.value)}
|
||||
labelHidden
|
||||
/>
|
||||
)}
|
||||
|
||||
{canEdit &&
|
||||
onRemove && (
|
||||
<DropdownMenu>
|
||||
<DropdownMenuItem onClick={onRemove}>Remove</DropdownMenuItem>
|
||||
</DropdownMenu>
|
||||
)}
|
||||
{canEdit &&
|
||||
onAdd && (
|
||||
<Button onClick={onAdd} neutral>
|
||||
Add
|
||||
</Button>
|
||||
)}
|
||||
</Flex>
|
||||
}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
const Select = styled(InputSelect)`
|
||||
margin: 0;
|
||||
font-size: 14px;
|
||||
`;
|
||||
|
||||
export default MemberListItem;
|
||||
33
app/scenes/CollectionMembers/components/UserListItem.js
Normal file
33
app/scenes/CollectionMembers/components/UserListItem.js
Normal file
@@ -0,0 +1,33 @@
|
||||
// @flow
|
||||
import * as React from 'react';
|
||||
import { PlusIcon } from 'outline-icons';
|
||||
import Avatar from 'components/Avatar';
|
||||
import Button from 'components/Button';
|
||||
import ListItem from 'components/List/Item';
|
||||
import User from 'models/User';
|
||||
|
||||
type Props = {
|
||||
user: User,
|
||||
canEdit: boolean,
|
||||
onAdd: () => void,
|
||||
};
|
||||
|
||||
const UserListItem = ({ user, onAdd, canEdit }: Props) => {
|
||||
return (
|
||||
<ListItem
|
||||
title={user.name}
|
||||
image={<Avatar src={user.avatarUrl} size={32} />}
|
||||
actions={
|
||||
canEdit ? (
|
||||
<Button type="button" onClick={onAdd} icon={<PlusIcon />} neutral>
|
||||
Add
|
||||
</Button>
|
||||
) : (
|
||||
undefined
|
||||
)
|
||||
}
|
||||
/>
|
||||
);
|
||||
};
|
||||
|
||||
export default UserListItem;
|
||||
3
app/scenes/CollectionMembers/index.js
Normal file
3
app/scenes/CollectionMembers/index.js
Normal file
@@ -0,0 +1,3 @@
|
||||
// @flow
|
||||
import CollectionMembers from './CollectionMembers';
|
||||
export default CollectionMembers;
|
||||
Reference in New Issue
Block a user