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:
@@ -37,6 +37,7 @@ import ErrorOffline from 'scenes/ErrorOffline';
|
||||
import UiStore from 'stores/UiStore';
|
||||
import AuthStore from 'stores/AuthStore';
|
||||
import DocumentsStore from 'stores/DocumentsStore';
|
||||
import PoliciesStore from 'stores/PoliciesStore';
|
||||
import RevisionsStore from 'stores/RevisionsStore';
|
||||
import Document from 'models/Document';
|
||||
import Revision from 'models/Revision';
|
||||
@@ -60,6 +61,7 @@ type Props = {
|
||||
match: Object,
|
||||
history: RouterHistory,
|
||||
location: Location,
|
||||
policies: PoliciesStore,
|
||||
documents: DocumentsStore,
|
||||
revisions: RevisionsStore,
|
||||
auth: AuthStore,
|
||||
@@ -89,6 +91,16 @@ class DocumentScene extends React.Component<Props> {
|
||||
this.loadEditor();
|
||||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
if (this.document) {
|
||||
const policy = this.props.policies.get(this.document.id);
|
||||
|
||||
if (!policy) {
|
||||
this.loadDocument(this.props);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
clearTimeout(this.viewTimeout);
|
||||
}
|
||||
@@ -100,18 +112,26 @@ class DocumentScene extends React.Component<Props> {
|
||||
@keydown('m')
|
||||
goToMove(ev) {
|
||||
ev.preventDefault();
|
||||
const document = this.document;
|
||||
if (!document) return;
|
||||
|
||||
if (this.document && !this.document.isArchived && !this.document.isDraft) {
|
||||
this.props.history.push(documentMoveUrl(this.document));
|
||||
const can = this.props.policies.abilities(document.id);
|
||||
|
||||
if (can.update) {
|
||||
this.props.history.push(documentMoveUrl(document));
|
||||
}
|
||||
}
|
||||
|
||||
@keydown('e')
|
||||
goToEdit(ev) {
|
||||
ev.preventDefault();
|
||||
const document = this.document;
|
||||
if (!document) return;
|
||||
|
||||
if (this.document && !this.document.isArchived) {
|
||||
this.props.history.push(documentEditUrl(this.document));
|
||||
const can = this.props.policies.abilities(document.id);
|
||||
|
||||
if (can.update) {
|
||||
this.props.history.push(documentEditUrl(document));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -316,6 +336,9 @@ class DocumentScene extends React.Component<Props> {
|
||||
|
||||
const embedsDisabled = team && !team.documentEmbeds;
|
||||
|
||||
// this line is only here to make MobX understand that policies are a dependency of this component
|
||||
this.props.policies.abilities(document.id);
|
||||
|
||||
return (
|
||||
<ErrorBoundary>
|
||||
<Container
|
||||
@@ -428,5 +451,5 @@ const Container = styled(Flex)`
|
||||
`;
|
||||
|
||||
export default withRouter(
|
||||
inject('ui', 'auth', 'documents', 'revisions')(DocumentScene)
|
||||
inject('ui', 'auth', 'documents', 'policies', 'revisions')(DocumentScene)
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user