Merge pull request #6379 from jtpio/page-config

Fix opening JupyterLab from Notebook
jupyter · Apr 27, 2022 · 4076882 · 4076882
2 parents b40b7b4 + 2dc3dec
commit 4076882
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/notebook/app.py b/notebook/app.py
@@ -32,19 +32,18 @@ def get_page_config(self):
         config = LabConfig()
         app = self.extensionapp
         base_url = self.settings.get("base_url")
-        page_config = self.settings.setdefault("page_config_data", {})
-        page_config.update(
-            {
-                "appVersion": version,
-                "baseUrl": self.base_url,
-                "terminalsAvailable": self.settings.get("terminals_available", False),
-                "token": self.settings["token"],
-                "fullStaticUrl": ujoin(self.base_url, "static", self.name),
-                "frontendUrl": ujoin(self.base_url, "/"),
-                "exposeAppInBrowser": app.expose_app_in_browser,
-                "collaborative": app.collaborative,
-            }
-        )
+        page_config_data = self.settings.setdefault("page_config_data", {})
+        page_config = {
+            **page_config_data,
+            "appVersion": version,
+            "baseUrl": self.base_url,
+            "terminalsAvailable": self.settings.get("terminals_available", False),
+            "token": self.settings["token"],
+            "fullStaticUrl": ujoin(self.base_url, "static", self.name),
+            "frontendUrl": ujoin(self.base_url, "/"),
+            "exposeAppInBrowser": app.expose_app_in_browser,
+            "collaborative": app.collaborative,
+        }
 
         if "hub_prefix" in app.serverapp.tornado_settings:
             tornado_settings = app.serverapp.tornado_settings

diff --git a/ui-tests/test/smoke.spec.ts b/ui-tests/test/smoke.spec.ts
@@ -73,4 +73,18 @@ test.describe('Smoke', () => {
 
     expect(true).toBe(true);
   });
+
+  test('JupyterLab', async ({ page, tmpPath }) => {
+    // Open the tree page
+    await page.goto(`tree/${tmpPath}`);
+
+    // Open JupyterLab
+    await page.menu.clickMenuItem('View>Open JupyterLab');
+
+    const lab = await page.waitForEvent('popup');
+    await lab.waitForSelector('.jp-Launcher');
+    await lab.close();
+
+    expect(true).toBe(true);
+  });
 });