Base model refactor (#810)
* Big upgrades * WIP: Stash * Stash, 30 flow errors left * Downgrade mobx * WIP * When I understand the difference between class and instance methods * 💚 * Fixes: File import Model saving edge cases pinning and starring docs Collection editing Upgrade mobx devtools * Notification settings saving works * Disabled settings * Document mailer * Working notifications * Colletion created notification Ensure not notified for own actions * Tidy up * Document updated event only for document creation Add indexes Notification setting on user creation * Commentary * Fixed: Notification setting on signup * Fix document move / duplicate stale data Add BaseModel.refresh method * Fixes: Title in sidebar not updated after editing document * 💚 * Improve / restore error handling Better handle offline errors * 👕
This commit is contained in:
@@ -1,12 +1,14 @@
|
||||
// @flow
|
||||
import * as React from 'react';
|
||||
import { observer } from 'mobx-react';
|
||||
import invariant from 'invariant';
|
||||
import styled from 'styled-components';
|
||||
import { GoToIcon } from 'outline-icons';
|
||||
import Flex from 'shared/components/Flex';
|
||||
|
||||
import Document from 'models/Document';
|
||||
import type { DocumentPath } from 'stores/CollectionsStore';
|
||||
|
||||
const StyledGoToIcon = styled(GoToIcon)``;
|
||||
|
||||
const ResultWrapper = styled.div`
|
||||
display: flex;
|
||||
@@ -16,8 +18,6 @@ const ResultWrapper = styled.div`
|
||||
cursor: default;
|
||||
`;
|
||||
|
||||
const StyledGoToIcon = styled(GoToIcon)``;
|
||||
|
||||
const ResultWrapperLink = styled(ResultWrapper.withComponent('a'))`
|
||||
height: 32px;
|
||||
padding-top: 3px;
|
||||
@@ -40,10 +40,10 @@ const ResultWrapperLink = styled(ResultWrapper.withComponent('a'))`
|
||||
`;
|
||||
|
||||
type Props = {
|
||||
result: Object,
|
||||
result: DocumentPath,
|
||||
document?: Document,
|
||||
onSuccess?: Function,
|
||||
ref?: Function,
|
||||
onSuccess?: *,
|
||||
ref?: *,
|
||||
};
|
||||
|
||||
@observer
|
||||
@@ -51,8 +51,7 @@ class PathToDocument extends React.Component<Props> {
|
||||
handleClick = async (ev: SyntheticEvent<*>) => {
|
||||
ev.preventDefault();
|
||||
const { document, result, onSuccess } = this.props;
|
||||
|
||||
invariant(onSuccess && document, 'onSuccess unavailable');
|
||||
if (!document) return;
|
||||
|
||||
if (result.type === 'document') {
|
||||
await document.move(result.id);
|
||||
@@ -64,7 +63,8 @@ class PathToDocument extends React.Component<Props> {
|
||||
} else {
|
||||
throw new Error('Not implemented yet');
|
||||
}
|
||||
onSuccess();
|
||||
|
||||
if (onSuccess) onSuccess();
|
||||
};
|
||||
|
||||
render() {
|
||||
@@ -74,7 +74,7 @@ class PathToDocument extends React.Component<Props> {
|
||||
if (!result) return <div />;
|
||||
|
||||
return (
|
||||
<Component ref={ref} onClick={this.handleClick} selectable href>
|
||||
<Component ref={ref} onClick={this.handleClick} href="" selectable>
|
||||
{result.path
|
||||
.map(doc => <span key={doc.id}>{doc.title}</span>)
|
||||
.reduce((prev, curr) => [prev, <StyledGoToIcon />, curr])}
|
||||
|
||||
Reference in New Issue
Block a user