Github issue#1267, Navigation small updates

— new project return target should be project page (starting point) on Exit/Cancel

Author: Vikas Agarwal

src/components/TopBar/NewProjectNavLink.jsx

@@ -3,17 +3,23 @@ import { Link } from 'react-router-dom'
 import SVGIconImage from '../SVGIconImage'
 import './NewProjectNavLink.scss'
 
-const NewProjectNavLink = ({ compact=false }) => {
+const NewProjectNavLink = ({ compact=false, returnUrl }) => {
   if (compact) {
     return (
-      <Link to="/new-project" className="new-project-link">
+      <Link to={{
+          pathname: '/new-project',
+          search: returnUrl ? '?returnUrl=' + returnUrl : ''
+        }} className="new-project-link">
         <div className="new-project-icon"><SVGIconImage filePath="ui-16px-1_bold-add" /></div>
       </Link>
     )
   } else {
     return (
       <div className="new-project-link">
-        <Link to="/new-project" className="tc-btn tc-btn-sm tc-btn-primary">+ New Project</Link>
+        <Link to={{
+          pathname: '/new-project',
+          search: returnUrl ? '?returnUrl=' + returnUrl : '',
+        }} className="tc-btn tc-btn-sm tc-btn-primary">+ New Project</Link>
       </div>
     )
   }

src/components/TopBar/ProjectToolBar.js

@@ -71,7 +71,7 @@ class ProjectToolBar extends React.Component {
                 }
               </ul>
             </nav>}
-            <NewProjectNavLink compact />
+            <NewProjectNavLink compact returnUrl={window.location.href} />
             { userMenu }
           </div>
         </div>

src/projects/create/containers/CreateContainer.jsx

@@ -1,5 +1,6 @@
 import _ from 'lodash'
 import Cookies from 'js-cookie'
+import qs from 'query-string'
 import React, { PropTypes } from 'react'
 import { withRouter } from 'react-router-dom'
 import { connect } from 'react-redux'
@@ -178,16 +179,21 @@ class CreateConainer extends React.Component {
   }
 
   closeWizard() {
-    const { userRoles } = this.props
+    const { userRoles, location } = this.props
     const isLoggedIn = userRoles && userRoles.length > 0
     // calls leave handler
     this.onLeave()
-    if (isLoggedIn) {
-      this.props.history.push('/projects')
+    const returnUrl = _.get(qs.parse(location.search), 'returnUrl', null)
+    if (returnUrl) {
+      window.location = returnUrl
     } else {
-      // this.props.history.push('/')
-      // FIXME ideally we should push on router
-      window.location = window.location.origin
+      if (isLoggedIn) {
+        this.props.history.push('/projects')
+      } else {
+        this.props.history.push('/')
+        // FIXME ideally we should push on router
+        // window.location = window.location.origin
+      }
     }
   }