From aef9e4759a2f79b063ba2f3dfba97f1210cd0adc Mon Sep 17 00:00:00 2001
From: Chandrasekhar Ramakrishnan <cramakri@ethz.ch>
Date: Thu, 18 Aug 2022 14:00:06 +0200
Subject: [PATCH] feat: new session start flow (#1990)

---
 client/src/project/Project.present.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/client/src/project/Project.present.js b/client/src/project/Project.present.js
index 2dc4bee6ac..88eaea402d 100644
--- a/client/src/project/Project.present.js
+++ b/client/src/project/Project.present.js
@@ -578,9 +578,6 @@ class ProjectNav extends Component {
             <NavItem>
               <RenkuNavLink exact={false} to={this.props.datasetsUrl} title="Datasets" />
             </NavItem>
-            <NavItem>
-              <RenkuNavLink exact={false} to={this.props.notebookServersUrl} title="Sessions" />
-            </NavItem>
             <NavItem className="pe-0">
               <RenkuNavLink exact={false} to={this.props.settingsUrl} title="Settings" />
             </NavItem>
@@ -1076,8 +1073,8 @@ const ProjectSessions = (props) => {
   const locationFrom = props.history?.location?.state?.from;
   const filePath = props.history?.location?.state?.filePath;
   const backNotebookLabel = filePath ? `Back to ${filePath}` : "Back to notebook file";
-  const backButtonLabel = locationFrom ? backNotebookLabel : "Back to sessions list";
-  const backUrl = locationFrom ?? props.notebookServersUrl;
+  const backButtonLabel = locationFrom ? backNotebookLabel : `Back to ${props.metadata.pathWithNamespace}`;
+  const backUrl = locationFrom ?? props.baseUrl;
 
   const backButton = (<GoBackButton label={backButtonLabel} url={backUrl} />);
 
@@ -1403,9 +1400,14 @@ class ProjectView extends Component {
             render={props => <ProjectViewHeader {...this.props} minimalistHeader={false}/>} />
           <Route path={this.props.overviewUrl}
             render={props => <ProjectViewHeader {...this.props} minimalistHeader={false}/>} />
+          <Route path={this.props.notebookServersUrl}
+            render={() => null} />
           <Route component={()=><ProjectViewHeader {...this.props} minimalistHeader={true}/>} />
         </Switch>
-        <ProjectNav key="nav" {...this.props} />
+        <Switch key="projectNav">
+          <Route path={this.props.notebookServersUrl} render={() => null} />
+          <Route component={() =><ProjectNav key="nav" {...this.props} />} />
+        </Switch>
         <Row key="content">
           <Switch>
             <Route exact path={this.props.baseUrl}