Merge pull request #2178 from lindapaiste/fix/back-to-editor

'Back to Editor' links to the last opened project (Fixes #2175)

Author: raclim

client/components/Nav.jsx

@@ -18,6 +18,7 @@ import { logoutUser } from '../modules/User/actions';
 import getConfig from '../utils/getConfig';
 import { metaKeyName, metaKey } from '../utils/metaKey';
 import { getIsUserOwner } from '../modules/IDE/selectors/users';
+import { selectSketchPath } from '../modules/IDE/selectors/project';
 
 import CaretLeftIcon from '../images/left-arrow.svg';
 import TriangleIcon from '../images/down-filled-triangle.svg';
@@ -245,7 +246,7 @@ class Nav extends React.PureComponent {
           />
         </li>
         <li className="nav__item nav__item--no-icon">
-          <Link to="/" className="nav__back-link">
+          <Link to={this.props.editorLink} className="nav__back-link">
             <CaretLeftIcon
               className="nav__back-icon"
               focusable="false"
@@ -990,7 +991,8 @@ Nav.propTypes = {
   t: PropTypes.func.isRequired,
   setLanguage: PropTypes.func.isRequired,
   language: PropTypes.string.isRequired,
-  isUserOwner: PropTypes.bool.isRequired
+  isUserOwner: PropTypes.bool.isRequired,
+  editorLink: PropTypes.string
 };
 
 Nav.defaultProps = {
@@ -1003,7 +1005,8 @@ Nav.defaultProps = {
   warnIfUnsavedChanges: undefined,
   params: {
     username: undefined
-  }
+  },
+  editorLink: '/'
 };
 
 function mapStateToProps(state) {
@@ -1013,7 +1016,8 @@ function mapStateToProps(state) {
     unsavedChanges: state.ide.unsavedChanges,
     rootFile: state.files.filter((file) => file.name === 'root')[0],
     language: state.preferences.language,
-    isUserOwner: getIsUserOwner(state)
+    isUserOwner: getIsUserOwner(state),
+    editorLink: selectSketchPath(state)
   };
 }
 

client/modules/IDE/selectors/project.js

@@ -0,0 +1,10 @@
+import { createSelector } from 'reselect';
+
+export const selectProjectOwner = (state) => state.project.owner;
+export const selectProjectId = (state) => state.project.id;
+
+export const selectSketchPath = createSelector(
+  selectProjectOwner,
+  selectProjectId,
+  (owner, id) => (owner && id ? `/${owner.username}/sketches/${id}` : '/')
+);