Merge pull request #20 from ian-r-rose/org_in_path

Org in path

Author: ian-r-rose

src/browser.ts

@@ -22,7 +22,7 @@ import {
 } from '@jupyterlab/filebrowser';
 
 import {
-  GitHubDrive
+  GitHubDrive, parsePath
 } from './contents';
 
 
@@ -55,7 +55,7 @@ class GitHubFileBrowser extends Widget {
     this._drive = drive;
 
     // Create an editable name for the user/org name.
-    this.userName = new GitHubEditableName(drive.user, '<Edit User>');
+    this.userName = new GitHubEditableName('', '<Edit User>');
     this.userName.addClass('jp-GitHubEditableUserName');
     this.userName.node.title = 'Click to edit user/organization';
     this._browser.toolbar.addItem('user', this.userName);
@@ -66,18 +66,16 @@ class GitHubFileBrowser extends Widget {
     this._openGitHubButton = new ToolbarButton({
       onClick: () => {
         let url = GITHUB_BASE_URL;
-        // If there is no valid user, do nothing.
-        if (!this._drive.validUserState.get()) {
+        // If there is no valid user, open the GitHub homepage.
+        if (!this._drive.validUser) {
           window.open(url);
           return;
         }
-        const user = this._drive.user;
-        const path = this._browser.model.path;
-        const repo = path.split('/')[0].split(':')[1];
-        url = URLExt.join(url, user);
-        if (repo) {
-          const dirPath = URLExt.join(repo, ...path.split('/').slice(1));
-          url = URLExt.join(url, repo, 'tree', 'master', dirPath);
+        const resource = parsePath(this._browser.model.path.split(':')[1]);
+        url = URLExt.join(url, resource.user);
+        if (resource.repository) {
+          url = URLExt.join(url, resource.repository,
+                            'tree', 'master', resource.path);
         }
         window.open(url);
       },
@@ -93,9 +91,9 @@ class GitHubFileBrowser extends Widget {
         if (!this._binderActive) {
           return;
         }
-        const user = this._drive.user;
-        const repo = this._browser.model.path.split('/')[0].split(':')[1];
-        const url = URLExt.join(MY_BINDER_BASE_URL, user, repo, 'master'); 
+        const resource = parsePath(this._browser.model.path.split(':')[1]);
+        const url = URLExt.join(MY_BINDER_BASE_URL, resource.user,
+                                resource.repository, 'master'); 
         window.open(url+'?urlpath=lab');
       },
       tooltip: 'Launch this repository on mybinder.org',
@@ -109,7 +107,6 @@ class GitHubFileBrowser extends Widget {
     this._onPathChanged();
 
     this._drive.rateLimitedState.changed.connect(this._updateErrorPanel, this);
-    this._drive.validUserState.changed.connect(this._updateErrorPanel, this);
   }
 
   /**
@@ -121,11 +118,13 @@ class GitHubFileBrowser extends Widget {
    * React to a change in user.
    */
   private _onUserChanged(sender: ObservableValue, args: ObservableValue.IChangedArgs) {
-    this._drive.user = args.newValue as string;
-    // After the user has been changed, cd to their GitHub
-    // root directory, since any previous directory is no
-    // longer valid.
-    this._browser.model.cd('/').then(() => {
+    if (this._changeGuard) {
+      return;
+    }
+    this._changeGuard = true;
+    this._browser.model.cd(`/${args.newValue as string}`).then(() => {
+      this._changeGuard = false;
+      this._updateErrorPanel();
       // Once we have the new listing, maybe give the file listing
       // focus. Once the input element is removed, the active element
       // appears to revert to document.body. If the user has subsequently
@@ -141,16 +140,24 @@ class GitHubFileBrowser extends Widget {
    * React to the path changing for the browser.
    */
   private _onPathChanged(): void {
-    const path = this._browser.model.path;
+    const resource = parsePath(this._browser.model.path.split(':')[1]);
+
+    // If we have navigated to the root, reset the user name.
+    if (!resource.user && !this._changeGuard) {
+      this._changeGuard = true;
+      this.userName.name.set('');
+      this._changeGuard = false;
+      this._updateErrorPanel();
+    }
+
     // Check for a valid user.
-    if(!this._drive.validUserState.get()) {
+    if(!this._drive.validUser) {
       this._launchBinderButton.addClass(MY_BINDER_DISABLED);
       this._binderActive = false;
       return;
     }
     // Check for a valid repo.
-    const repo = path.split('/')[0].split(':')[1];
-    if (!repo) {
+    if (!resource.repository) {
       this._launchBinderButton.addClass(MY_BINDER_DISABLED);
       this._binderActive = false;
       return;
@@ -175,18 +182,20 @@ class GitHubFileBrowser extends Widget {
    * React to a change in the validity of the drive.
    */
   private _updateErrorPanel(): void {
+    const resource = parsePath(this._browser.model.path.split(':')[1]);
     const rateLimited = this._drive.rateLimitedState.get();
-    const validUser = this._drive.validUserState.get();
-    // If everythings is valid, and an error panel is showing, remove it.
-    if (!rateLimited && validUser && this._errorPanel) {
+    const validUser = this._drive.validUser;
+
+    // If we currently have an error panel, remove it.
+    if (this._errorPanel) {
       const listing = (this._browser.layout as PanelLayout).widgets[2];
       listing.node.removeChild(this._errorPanel.node);
       this._errorPanel.dispose();
       this._errorPanel = null;
     }
 
-    // If we are being rate limited and there is not error panel, make one.
-    if (rateLimited && !this._errorPanel) {
+    // If we are being rate limited, make an error panel.
+    if (rateLimited) {
       this._errorPanel = new GitHubErrorPanel(
         'You have been rate limited by GitHub! '+
         'You will need to wait about an hour before '+
@@ -195,10 +204,10 @@ class GitHubFileBrowser extends Widget {
       listing.node.appendChild(this._errorPanel.node);
     }
 
-    // If we have an invalid user there is not error panel, make one.
-    if (!validUser && !this._errorPanel) {
-      const message = this._drive.user ?
-        `"${this._drive.user}" appears to be an invalid user name!` :
+    // If we have an invalid user, make an error panel.
+    if (!validUser) {
+      const message = resource.user ?
+        `"${resource.user}" appears to be an invalid user name!` :
         'Please enter a GitHub user name';
       this._errorPanel = new GitHubErrorPanel(message);
       const listing = (this._browser.layout as PanelLayout).widgets[2];
@@ -212,6 +221,7 @@ class GitHubFileBrowser extends Widget {
   private _openGitHubButton: ToolbarButton;
   private _launchBinderButton: ToolbarButton;
   private _binderActive = false;
+  private _changeGuard = false;
 }
 
 /**