Browse Source

Use the right pageConfig.

Ian Rose 5 năm trước cách đây
mục cha
commit
9f14551478

+ 3 - 5
jupyterlab/extension.py

@@ -206,13 +206,11 @@ def load_jupyter_server_extension(nbapp):
 
     # If running under JupyterHub, add more metadata.
     if hasattr(nbapp, 'hub_prefix'):
-        settings['page_config_data']['hubPrefix'] = nbapp.hub_prefix
-        settings['page_config_data']['hubHost'] = nbapp.hub_host
-        settings['page_config_data']['hubUser'] = nbapp.user
+        page_config['hubPrefix'] = nbapp.hub_prefix
+        page_config['hubHost'] = nbapp.hub_host
+        page_config['hubUser'] = nbapp.user
         api_token = os.getenv('JUPYTERHUB_API_TOKEN', '')
         page_config['token'] = api_token
-    else:
-        logger.error('*****\nhey, no prefix!\n\n')
 
     # Add the root handlers if we have not errored.
     if not errored:

+ 2 - 2
packages/application/src/lab.ts

@@ -245,8 +245,8 @@ export namespace JupyterLab {
       themes: PageConfig.getOption('themesUrl'),
       tree: PageConfig.getOption('treeUrl'),
       workspaces: PageConfig.getOption('workspacesUrl'),
-      hubHost: PageConfig.getOption('hubHost'),
-      hubPrefix: PageConfig.getOption('hubPrefix')
+      hubHost: PageConfig.getOption('hubHost') || undefined,
+      hubPrefix: PageConfig.getOption('hubPrefix') || undefined
     },
     directories: {
       appSettings: PageConfig.getOption('appSettingsDir'),

+ 1 - 1
packages/hub-extension/src/index.ts

@@ -39,7 +39,7 @@ function activateHubExtension(
   const baseUrl = paths.urls.base;
 
   // Bail if not running on JupyterHub.
-  if (!hubPrefix) {
+  if (!hubPrefix || !hubHost) {
     return;
   }