Skip to content
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

UI issue in the "tree view" #7216 #7253

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
+16 −2
Open

UI issue in the "tree view" #7216 #7253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9435aa4
Ignore paths with tree pattern
itsmevichu Feb 10, 2024
e2cd845
Ignore paths with tree, notebooks, edit pattern
itsmevichu Feb 10, 2024
4db90fe
Prettier Code for Test Lint check
itsmevichu Feb 11, 2024
6d8a7ea
Prettier code for Test Lint check
itsmevichu Feb 12, 2024
32d4b68
Merge branch 'main' into ingore-tree-patterns
itsmevichu Feb 14, 2024
7f649db
Modified logic for Ignored patterns
itsmevichu Feb 20, 2024
e9bf7e7
Prettier code for Lint checks
itsmevichu Feb 20, 2024
43504d6
Updated logic for ignored pattern
itsmevichu Feb 20, 2024
a1fadbd
Merge branch 'main' into ingore-tree-patterns
itsmevichu Feb 20, 2024
d0f67f5
Merge branch 'main' into ingore-tree-patterns
itsmevichu Feb 24, 2024
b9a0f13
Updated logic for quick Regex match
itsmevichu Feb 25, 2024
5ad9df6
Merge branch 'main' into ingore-tree-patterns
itsmevichu Mar 8, 2024
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
8 changes: 8 additions & 0 deletions packages/application-extension/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wondering if following a similar logic as in JupyterLab (disposing the command after routing) could help keep things simpler and avoid special cases using patterns?

https://github.com/jupyterlab/jupyterlab/blob/cdca0a20ba84af21922c390c46e086e50120d4cc/packages/application-extension/src/index.tsx#L938-L939

return;
}

app.started.then(async () => {
const file = decodeURIComponent(path);
const urlParams = new URLSearchParams(parsed.search);
Expand Down
5 changes: 4 additions & 1 deletion packages/console-extension/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion packages/terminal-extension/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading