diff options
| -rw-r--r-- | frontend/app/views/graph/graph.actions.js | 5 | ||||
| -rw-r--r-- | frontend/app/views/page/components/page.header.js | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/frontend/app/views/graph/graph.actions.js b/frontend/app/views/graph/graph.actions.js index 4185386..6d5cb51 100644 --- a/frontend/app/views/graph/graph.actions.js +++ b/frontend/app/views/graph/graph.actions.js @@ -41,10 +41,11 @@ export const setHomePageId = (graph, page) => dispatch => { actions.graph.update(updated_graph) } -export const viewPage = (graph, page) => dispatch => { +export const viewPage = (graph, path) => dispatch => { + // for some reason page.show.res is not always set..?? api(dispatch, types.api, 'export', `/api/v1/graph/export/${graph.path}`) .then(result => { console.log(result) - window.open(`${process.env.EXPORT_HOST}/${graph.path}/${page.path}`) + window.open(`${process.env.EXPORT_HOST}${path}`) }) } diff --git a/frontend/app/views/page/components/page.header.js b/frontend/app/views/page/components/page.header.js index d40f6e0..6df3ee5 100644 --- a/frontend/app/views/page/components/page.header.js +++ b/frontend/app/views/page/components/page.header.js @@ -29,7 +29,7 @@ function PageHeader(props) { <button onClick={() => props.pageActions.toggleTileList()}>Sort tiles</button> <button onClick={() => props.pageActions.togglePopups()}>Toggle popups</button> <button onClick={() => props.graphActions.toggleEditPageForm()}>Edit page</button> - <button onClick={() => props.graphActions.viewPage(props.graph, props.page)}>View page</button> + <button onClick={() => props.graphActions.viewPage(props.graph, props.router.location.pathname)}>View page</button> </div> </header> ) @@ -41,6 +41,7 @@ const mapStateToProps = (state) => ({ graph: state.graph.show.res, page: state.page.show.res, building: state.graph.editor.building, + router: state.router, // isAuthenticated: state.auth.isAuthenticated, }) |