Merge pull request #482 from bond95/edit-go-back

Fixed 'Close' button, now it go to previous page

src/components/PageRouter.js

@@ -72,6 +72,7 @@ class PageRouter extends React.Component {
     super(props)
     this.handleKeyPress = this.handleKeyPress.bind(this)
     this.keyPressed = null
+    this.previousPath = '/'
   }
 
   handleKeyPress (event) {
@@ -94,6 +95,12 @@ class PageRouter extends React.Component {
     window.addEventListener('keyup', (e) => { this.keyPressed = null })
   }
 
+  componentWillReceiveProps (nextProps) {
+    if (this.previousPath !== this.props.location.pathname && nextProps.location.pathname !== this.props.location.pathname) {
+      this.previousPath = this.props.location.pathname
+    }
+  }
+
   render () {
     let { route, location, history, routeReducer } = this.props
     if (routeReducer.get('redirect') && routeReducer.get('redirect') !== location.pathname) {
@@ -118,7 +125,7 @@ class PageRouter extends React.Component {
         {tools}
       </Toolbar>
       <div className={style['page-router-render-component']}>
-        <RenderComponent route={branch.route} match={branch.match} location={location} history={history} />
+        <RenderComponent route={branch.route} match={branch.match} location={location} history={history} previousPath={this.previousPath} />
       </div>
     </div>)
   }

src/components/Pages/index.js

@@ -40,6 +40,7 @@ VmDetailPage.propTypes = {
   match: PropTypes.object.isRequired,
   location: PropTypes.object.isRequired,
   history: PropTypes.object.isRequired,
+  previousPath: PropTypes.string.isRequired,
 }
 
 class PoolDetailPage extends React.Component {
@@ -69,6 +70,7 @@ PoolDetailPage.propTypes = {
   match: PropTypes.object.isRequired,
   location: PropTypes.object.isRequired,
   history: PropTypes.object.isRequired,
+  previousPath: PropTypes.string.isRequired,
 }
 
 class VmDialogPage extends React.Component {
@@ -82,9 +84,9 @@ class VmDialogPage extends React.Component {
   }
 
   render () {
-    let { match, vms } = this.props
+    let { match, vms, previousPath } = this.props
     if ((match.params.id && vms.getIn(['vms', match.params.id])) || !match.params.id) {
-      return (<VmDialog vm={vms.getIn(['vms', match.params.id])} />)
+      return (<VmDialog vm={vms.getIn(['vms', match.params.id])} previousPath={previousPath} />)
     }
     return null
   }
@@ -98,6 +100,7 @@ VmDialogPage.propTypes = {
   match: PropTypes.object.isRequired,
   location: PropTypes.object.isRequired,
   history: PropTypes.object.isRequired,
+  previousPath: PropTypes.string.isRequired,
 }
 
 const VmDetailPageConnected = connect(

src/components/VmDialog/index.js

@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 import { connect } from 'react-redux'
-import { Link, Redirect, Prompt } from 'react-router-dom'
+import { Redirect, Prompt, Link } from 'react-router-dom'
 
 import { logDebug, generateUnique, templateNameRenderer } from '../../helpers'
 
@@ -383,7 +383,7 @@ class VmDialog extends React.Component {
   }
 
   render () {
-    const { icons, vmDialog, clusters, templates, operatingSystems, storages } = this.props
+    const { icons, vmDialog, clusters, templates, operatingSystems, storages, previousPath } = this.props
     const vm = this.props.vm
     const isoStorages = storages.get('storages').filter(v => v.get('type') === 'iso')
     const idPrefix = `vmdialog-${vm ? vm.get('name') : '_new'}`
@@ -563,7 +563,7 @@ class VmDialog extends React.Component {
           </div>
 
           <div className={style['vm-dialog-buttons']}>
-            <Link className='btn btn-default' to={vm ? `/vm/${vm.get('id')}` : '/'}>{msg.close()}</Link>
+            <Link className='btn btn-default' to={previousPath}>{msg.close()}</Link>
             <button className='btn btn-primary' type='button' onClick={this.submitHandler}>{submitText}</button>
           </div>
         </form>
@@ -584,6 +584,7 @@ VmDialog.propTypes = {
   icons: PropTypes.object.isRequired,
   vms: PropTypes.object.isRequired,
   storages: PropTypes.object.isRequired,
+  previousPath: PropTypes.string.isRequired,
 
   onCloseDialog: PropTypes.func.isRequired,
   addVm: PropTypes.func.isRequired,