Skip to content

Fix opening JupyterLab from Notebook #6379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtpio merged 2 commits into from
Apr 27, 2022
Merged

Fix opening JupyterLab from Notebook #6379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72e1464
Do not mutate existing page config
jtpio Apr 26, 2022
2dc3dec
Add UI test to open JupyterLab
jtpio Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions notebook/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions ui-tests/test/smoke.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
});