diff --git a/app/components/List/Item.js b/app/components/List/Item.js index 165967fb..5491fa2e 100644 --- a/app/components/List/Item.js +++ b/app/components/List/Item.js @@ -30,10 +30,6 @@ const Wrapper = styled.li` padding: ${props => (props.compact ? '8px' : '12px')} 0; margin: 0; border-bottom: 1px solid ${props => props.theme.divider}; - - &:last-child { - border-bottom: 0; - } `; const Image = styled(Flex)` diff --git a/app/menus/CollectionMenu.js b/app/menus/CollectionMenu.js index acff4214..23c3d34a 100644 --- a/app/menus/CollectionMenu.js +++ b/app/menus/CollectionMenu.js @@ -14,14 +14,12 @@ import importFile from 'utils/importFile'; import Collection from 'models/Collection'; import UiStore from 'stores/UiStore'; import DocumentsStore from 'stores/DocumentsStore'; -import PoliciesStore from 'stores/PoliciesStore'; import { DropdownMenu, DropdownMenuItem } from 'components/DropdownMenu'; type Props = { label?: React.Node, position?: 'left' | 'right' | 'center', ui: UiStore, - policies: PoliciesStore, documents: DocumentsStore, collection: Collection, history: RouterHistory, @@ -91,15 +89,7 @@ class CollectionMenu extends React.Component { }; render() { - const { - policies, - collection, - label, - position, - onOpen, - onClose, - } = this.props; - const can = policies.abilties(collection.id); + const { collection, label, position, onOpen, onClose } = this.props; return ( @@ -110,7 +100,7 @@ class CollectionMenu extends React.Component { accept="text/markdown, text/plain" /> @@ -134,24 +124,16 @@ class CollectionMenu extends React.Component { Import document
- {can.update && ( - Edit… - )} - {can.update && ( - - Members… - - )} - {can.export && ( - - Export… - - )} + Edit… + + Permissions… + + + Export… +
)} - {can.delete && ( - Delete… - )} + Delete… ); @@ -165,6 +147,4 @@ const HiddenInput = styled.input` visibility: hidden; `; -export default inject('ui', 'documents', 'policies')( - withRouter(CollectionMenu) -); +export default inject('ui', 'documents')(withRouter(CollectionMenu)); diff --git a/app/scenes/Collection.js b/app/scenes/Collection.js index ce8e507c..8da008a0 100644 --- a/app/scenes/Collection.js +++ b/app/scenes/Collection.js @@ -152,7 +152,7 @@ class CollectionScene extends React.Component { )} diff --git a/app/scenes/CollectionEdit.js b/app/scenes/CollectionEdit.js index 3ceaf6eb..8d43f67a 100644 --- a/app/scenes/CollectionEdit.js +++ b/app/scenes/CollectionEdit.js @@ -6,7 +6,6 @@ import { inject, observer } from 'mobx-react'; import Input from 'components/Input'; import InputRich from 'components/InputRich'; import Button from 'components/Button'; -import Switch from 'components/Switch'; import Flex from 'shared/components/Flex'; import HelpText from 'components/HelpText'; import ColorPicker from 'components/ColorPicker'; @@ -26,13 +25,11 @@ class CollectionEdit extends React.Component { @observable description: string = ''; @observable color: string = '#4E5C6E'; @observable isSaving: boolean; - @observable private: boolean = false; componentWillMount() { this.name = this.props.collection.name; this.description = this.props.collection.description; this.color = this.props.collection.color; - this.private = this.props.collection.private; } handleSubmit = async (ev: SyntheticEvent<*>) => { @@ -44,7 +41,6 @@ class CollectionEdit extends React.Component { name: this.name, description: this.description, color: this.color, - private: this.private, }); this.props.onSubmit(); } catch (err) { @@ -66,10 +62,6 @@ class CollectionEdit extends React.Component { this.color = color; }; - handlePrivateChange = (ev: SyntheticInputEvent<*>) => { - this.private = ev.target.checked; - }; - render() { return ( @@ -99,15 +91,6 @@ class CollectionEdit extends React.Component { minHeight={68} maxHeight={200} /> - - - A private collection will only be visible to invited team members. - ) : ( undefined