From 9434dd85cd9599d79455e02cce85dbd69ab1eaaa Mon Sep 17 00:00:00 2001 From: Stepan Usatiuk Date: Sun, 27 Oct 2019 13:24:57 +0300 Subject: [PATCH] fix some things --- frontend/src/Documents/DocumentEdit.tsx | 2 +- frontend/src/Documents/DocumentView.tsx | 1 + frontend/src/Documents/DocumentsList.tsx | 16 +++++++--------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/frontend/src/Documents/DocumentEdit.tsx b/frontend/src/Documents/DocumentEdit.tsx index e5aef10..447917c 100644 --- a/frontend/src/Documents/DocumentEdit.tsx +++ b/frontend/src/Documents/DocumentEdit.tsx @@ -177,7 +177,7 @@ export class DocumentEditComponent extends React.PureComponent< public copyLink() { const doc = this.props.allDocs[this.state.id]; navigator.clipboard.writeText( - `http://${webRoot}/shared/${this.props.username}/${doc.id}`, + `${webRoot}/shared/${this.props.username}/${doc.id}`, ); showSharedToast(); } diff --git a/frontend/src/Documents/DocumentView.tsx b/frontend/src/Documents/DocumentView.tsx index 393f20a..34f10b9 100644 --- a/frontend/src/Documents/DocumentView.tsx +++ b/frontend/src/Documents/DocumentView.tsx @@ -30,6 +30,7 @@ export class DocumentViewComponent extends React.PureComponent< const { id } = this.props.match.params as any; if (this.props.allDocs) { const doc = this.props.allDocs[id]; + if (!doc) { return ; } diff --git a/frontend/src/Documents/DocumentsList.tsx b/frontend/src/Documents/DocumentsList.tsx index c6f7399..6ec1407 100644 --- a/frontend/src/Documents/DocumentsList.tsx +++ b/frontend/src/Documents/DocumentsList.tsx @@ -13,13 +13,11 @@ export function DocumentsList(props: IDocumentListProps) { const cards = props.docs.map(doc => ( )); - if (props.newDocument) { - return ( -
- {} - {cards} -
- ); - } - return
{cards}
; + + return ( +
+ {props.newDocument && } + {cards} +
+ ); }