jupyter · itsmevichu · Feb 10, 2024 · Feb 10, 2024 · Feb 11, 2024 · Feb 12, 2024
diff --git a/packages/application-extension/src/index.ts b/packages/application-extension/src/index.ts
@@ -200,16 +200,24 @@ const opener: JupyterFrontEndPlugin<void> = {
   ): void => {
     const { commands, docRegistry } = app;
 
+    const ignoredPattern = new RegExp('/tree/(.*)');
+    const pathSegmentPattern = new RegExp('\\bnotebooks\\b|\\bedit\\b');
     const command = 'router:tree';
     commands.addCommand(command, {
       execute: (args: any) => {
         const parsed = args as IRouter.ILocation;
         const matches = parsed.path.match(TREE_PATTERN) ?? [];
+
         const [, , path] = matches;
         if (!path) {
           return;
         }
 
+        const pathSegments: string[] = parsed.path.split(pathSegmentPattern);
+        if (pathSegments.length > 1 && pathSegments[0].match(ignoredPattern)) {
+          return;
+        }
+
         app.started.then(async () => {
           const file = decodeURIComponent(path);
           const urlParams = new URLSearchParams(parsed.search);

diff --git a/packages/console-extension/src/index.ts b/packages/console-extension/src/index.ts
@@ -29,13 +29,16 @@ const opener: JupyterFrontEndPlugin<void> = {
   activate: (app: JupyterFrontEnd, router: IRouter) => {
     const { commands } = app;
     const consolePattern = new RegExp('/consoles/(.*)');
+    const ignoreTreePattern = new RegExp('/(tree|notebooks|edit)/(.*)');
 
     const command = 'router:console';
     commands.addCommand(command, {
       execute: (args: any) => {
         const parsed = args as IRouter.ILocation;
         const matches = parsed.path.match(consolePattern);
-        if (!matches) {
+        const isTreeMatch = parsed.path.match(ignoreTreePattern);
+
+        if (isTreeMatch || !matches) {
           return;
         }
         const [, match] = matches;

diff --git a/packages/terminal-extension/src/index.ts b/packages/terminal-extension/src/index.ts
@@ -33,13 +33,16 @@ const opener: JupyterFrontEndPlugin<void> = {
   ) => {
     const { commands } = app;
     const terminalPattern = new RegExp('/terminals/(.*)');
+    const ignoreTreePattern = new RegExp('/(tree|notebooks|edit)/(.*)');
 
     const command = 'router:terminal';
     commands.addCommand(command, {
       execute: (args: any) => {
         const parsed = args as IRouter.ILocation;
         const matches = parsed.path.match(terminalPattern);
-        if (!matches) {
+        const isTreeMatch = parsed.path.match(ignoreTreePattern);
+
+        if (isTreeMatch || !matches) {
           return;
         }
         const [, name] = matches;

diff --git a/ui-tests/test/filebrowser.spec.ts b/ui-tests/test/filebrowser.spec.ts
    const toolbar = page.getByRole('toolbar');

    ['Rename', 'Delete', 'Open', 'Download', 'Delete'].forEach(async (text) => {
      expect(toolbar.getByText(text)).toBeVisible();
    });
  });

diff --git a/ui-tests/test/mobile.spec.ts b/ui-tests/test/mobile.spec.ts
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.

 import { expect } from '@playwright/test';

    // Create a new notebook
    const [notebook] = await Promise.all([
      page.waitForEvent('popup'),
      page.click('text="New"'),
      page.click('text="Python 3 (ipykernel)"'),
    ]);
diff --git a/ui-tests/test/links.spec.ts b/ui-tests/test/links.spec.ts
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.

 import path from 'path';
    await page.goto(`notebooks/${tmpPath}/${NOTEBOOK}`);

    const [current] = await Promise.all([
      page.waitForEvent('popup'),
      page.getByText('Current Directory').last().click(),
    ]);

diff --git a/ui-tests/test/notebook.spec.ts b/ui-tests/test/notebook.spec.ts
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.

 import path from 'path';
    await Promise.all([
      await page.click('text="Rename"'),
      // wait until the URL is updated
      await page.waitForNavigation(),
    ]);

    // Check the URL contains the new name
diff --git a/ui-tests/test/smoke.spec.ts b/ui-tests/test/smoke.spec.ts
 import { expect } from '@playwright/test';

 import { test } from './fixtures';
	const toolbar = page.getByRole('toolbar');

	['Rename', 'Delete', 'Open', 'Download', 'Delete'].forEach(async (text) => {
	expect(toolbar.getByText(text)).toBeVisible();
Check failure on line 39 in ui-tests/test/filebrowser.spec.ts GitHub Actions / ui-tests (firefox) [firefox] › test/filebrowser.spec.ts:31:7 › File Browser › Select one file 1) [firefox] › test/filebrowser.spec.ts:31:7 › File Browser › Select one file ──────────────────── Error: expect(received).toBeVisible() Call log: - expect.toBeVisible with timeout 5000ms - waiting for getByRole('toolbar').getByText('Open') 37 \| 38 \| ['Rename', 'Delete', 'Open', 'Download', 'Delete'].forEach(async (text) => { > 39 \| expect(toolbar.getByText(text)).toBeVisible(); \| ^ 40 \| }); 41 \| }); 42 \| at forEach (/home/runner/work/notebook/notebook/ui-tests/test/filebrowser.spec.ts:39:39) at /home/runner/work/notebook/notebook/ui-tests/test/filebrowser.spec.ts:38:56
	});
	});
	// Copyright (c) Jupyter Development Team.
Check failure on line 1 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page `1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Test timeout of 60000ms exceeded.` Check failure on line 1 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page `1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Pending operations: - proxy.click at test/mobile.spec.ts:35:12` Check failure on line 1 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page `1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Test timeout of 60000ms exceeded.` Check failure on line 1 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page `1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Pending operations: - proxy.click at test/mobile.spec.ts:35:12` Check failure on line 1 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page `1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Test timeout of 60000ms exceeded.` Check failure on line 1 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page `1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Pending operations: - proxy.click at test/mobile.spec.ts:35:12` Check failure on line 1 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page `1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Test timeout of 60000ms exceeded.` Check failure on line 1 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page `1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Pending operations: - proxy.click at test/mobile.spec.ts:35:12`
	// Distributed under the terms of the Modified BSD License.

	import { expect } from '@playwright/test';

	// Create a new notebook
	const [notebook] = await Promise.all([
	page.waitForEvent('popup'),
Check failure on line 33 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page 1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Error: proxy.waitForEvent: Page closed =========================== logs =========================== waiting for event "popup" ============================================================ 31 \| // Create a new notebook 32 \| const [notebook] = await Promise.all([ > 33 \| page.waitForEvent('popup'), \| ^ 34 \| page.click('text="New"'), 35 \| page.click('text="Python 3 (ipykernel)"'), 36 \| ]); at /home/runner/work/notebook/notebook/ui-tests/test/mobile.spec.ts:33:12 Check failure on line 33 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page 1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Error: proxy.waitForEvent: Page closed =========================== logs =========================== waiting for event "popup" ============================================================ 31 \| // Create a new notebook 32 \| const [notebook] = await Promise.all([ > 33 \| page.waitForEvent('popup'), \| ^ 34 \| page.click('text="New"'), 35 \| page.click('text="Python 3 (ipykernel)"'), 36 \| ]); at /home/runner/work/notebook/notebook/ui-tests/test/mobile.spec.ts:33:12 Check failure on line 33 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page 1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Error: proxy.waitForEvent: Page closed =========================== logs =========================== waiting for event "popup" ============================================================ 31 \| // Create a new notebook 32 \| const [notebook] = await Promise.all([ > 33 \| page.waitForEvent('popup'), \| ^ 34 \| page.click('text="New"'), 35 \| page.click('text="Python 3 (ipykernel)"'), 36 \| ]); at /home/runner/work/notebook/notebook/ui-tests/test/mobile.spec.ts:33:12 Check failure on line 33 in ui-tests/test/mobile.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page 1) [chromium] › test/mobile.spec.ts:24:7 › Mobile › The layout should be more compact on the notebook page Retry #1 ─────────────────────────────────────────────────────────────────────────────────────── Error: proxy.waitForEvent: Page closed =========================== logs =========================== waiting for event "popup" ============================================================ 31 \| // Create a new notebook 32 \| const [notebook] = await Promise.all([ > 33 \| page.waitForEvent('popup'), \| ^ 34 \| page.click('text="New"'), 35 \| page.click('text="Python 3 (ipykernel)"'), 36 \| ]); at /home/runner/work/notebook/notebook/ui-tests/test/mobile.spec.ts:33:12
	page.click('text="New"'),
	page.click('text="Python 3 (ipykernel)"'),
	]);
	import { expect } from '@playwright/test';
Check failure on line 1 in ui-tests/test/smoke.spec.ts GitHub Actions / ui-tests (chromium) [chromium] › test/smoke.spec.ts:10:7 › Smoke › Tour `3) [chromium] › test/smoke.spec.ts:10:7 › Smoke › Tour ─────────────────────────────────────────── Test timeout of 60000ms exceeded.`

	import { test } from './fixtures';