From 26a3f2c7e362bb9da1f18a97fbdc48069ca943d2 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Thu, 28 Sep 2017 20:36:29 -0700 Subject: [PATCH] Refactor to routeHelpers --- frontend/scenes/Document/Document.js | 11 ++++------- frontend/utils/routeHelpers.js | 8 ++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/frontend/scenes/Document/Document.js b/frontend/scenes/Document/Document.js index 7bdb8023..3db9f3b0 100644 --- a/frontend/scenes/Document/Document.js +++ b/frontend/scenes/Document/Document.js @@ -12,6 +12,8 @@ import { collectionUrl, updateDocumentUrl, documentMoveUrl, + documentEditUrl, + documentNewUrl, matchDocumentEdit, matchDocumentMove, } from 'utils/routeHelpers'; @@ -57,7 +59,6 @@ type Props = { @observable isSaving = false; @observable showAsSaved = false; @observable notFound = false; - @observable moveModalOpen: boolean = false; componentWillMount() { @@ -144,16 +145,12 @@ type Props = { onClickEdit = () => { if (!this.document) return; - const url = `${this.document.url}/edit`; - this.props.history.push(url); + this.props.history.push(documentEditUrl(this.document)); }; onClickNew = () => { if (!this.document) return; - let newUrl = `${this.document.collection.url}/new`; - if (this.document.parentDocumentId) - newUrl = `${newUrl}?parentDocument=${this.document.parentDocumentId}`; - this.props.history.push(newUrl); + this.props.history.push(documentNewUrl(this.document)); }; handleCloseMoveModal = () => (this.moveModalOpen = false); diff --git a/frontend/utils/routeHelpers.js b/frontend/utils/routeHelpers.js index 707e4a82..4db4200f 100644 --- a/frontend/utils/routeHelpers.js +++ b/frontend/utils/routeHelpers.js @@ -22,6 +22,14 @@ export function documentUrl(doc: Document): string { return doc.url; } +export function documentNewUrl(doc: Document): string { + const newUrl = `${doc.collection.url}/new`; + if (doc.parentDocumentId) { + return `${newUrl}?parentDocument=${doc.parentDocumentId}`; + } + return newUrl; +} + export function documentEditUrl(doc: Document): string { return `${doc.url}/edit`; }