Merge pull request #7906 from minrk/shareUrl

define base shareUrl
jupyterlab · Feb 22, 2020 · be8e100 · be8e100
2 parents b047587 + 25ca3df
commit be8e100
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/jupyterlab/extension.py b/jupyterlab/extension.py
@@ -209,6 +209,7 @@ def load_jupyter_server_extension(nbapp):
         page_config['hubPrefix'] = nbapp.hub_prefix
         page_config['hubHost'] = nbapp.hub_host
         page_config['hubUser'] = nbapp.user
+        page_config['shareUrl'] = ujoin(nbapp.hub_prefix, 'user-redirect')
         # Assume the server_name property indicates running JupyterHub 1.0.
         if hasattr(nbapp, 'server_name'):
             page_config['hubServerName'] = nbapp.server_name

diff --git a/packages/coreutils/src/pageconfig.ts b/packages/coreutils/src/pageconfig.ts
@@ -117,6 +117,22 @@ export namespace PageConfig {
     return URLExt.join(getBaseUrl(), getOption('treeUrl'));
   }
 
+  /**
+   * Get the base url for sharing links (usually baseUrl)
+   */
+  export function getShareUrl(): string {
+    return URLExt.normalize(getOption('shareUrl') || getBaseUrl());
+  }
+
+  /**
+   * Get the tree url for shareable links.
+   * Usually the same as treeUrl,
+   * but overrideable e.g. when sharing with JupyterHub.
+   */
+  export function getTreeShareUrl(): string {
+    return URLExt.normalize(URLExt.join(getShareUrl(), getOption('treeUrl')));
+  }
+
   /**
    * Get the base websocket url for a Jupyter application, or an empty string.
    */

diff --git a/packages/filebrowser-extension/src/index.ts b/packages/filebrowser-extension/src/index.ts
@@ -388,7 +388,7 @@ function activateShareFile(
         return;
       }
       const path = encodeURI(model.path);
-      Clipboard.copyToSystem(URLExt.join(PageConfig.getTreeUrl(), path));
+      Clipboard.copyToSystem(URLExt.join(PageConfig.getTreeShareUrl(), path));
     },
     isVisible: () =>
       !!tracker.currentWidget &&