mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-30 12:11:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update url with current filebrowser directory

Browse Source
This commit is contained in:
Frédéric Collonval 2021-09-01 17:08:30 +02:00
parent 65b0ad9978
commit 57220b21da
No known key found for this signature in database
GPG Key ID: B7D0EF991C4BBBD4
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/test/tree.spec.ts
View File

@ -18,3 +18,13 @@ test('should go to subfolder', async ({ page }) => {
await page.waitForSelector('.jp-FileBrowser-crumbs >> text=/binder/')
).toBeTruthy();
});
test('should update url when navigating in filebrowser', async ({ page }) => {
await page.goto(`${BASE_URL}retro/tree`);
await page.dblclick('.jp-FileBrowser-listing >> text=binder');
await page.waitForSelector('.jp-FileBrowser-crumbs >> text=/binder/');
expect(page.url()).toEqual(`${BASE_URL}retro/tree/binder`);
});

34
packages/application-extension/src/index.ts
View File

@ -4,6 +4,7 @@
import {
ILabStatus,
IRouter,
ITreePathUpdater,
JupyterFrontEnd,
JupyterFrontEndPlugin,
Router
@ -74,6 +75,11 @@ namespace CommandIDs {
* Open the tree page.
*/
export const openTree = 'application:open-tree';
/**
* Resolve tree path
*/
export const resolveTree = 'application:resolve-tree';
}
/**
@ -498,7 +504,7 @@ const tree: JupyterFrontEndPlugin<JupyterFrontEnd.ITreeResolver> = {
const treePattern = new RegExp('/retro(/tree/.*)?');
set.add(
commands.addCommand('retrolab-router:tree', {
commands.addCommand(CommandIDs.resolveTree, {
execute: (async (args: IRouter.ILocation) => {
if (set.isDisposed) {
return;
@ -518,7 +524,7 @@ const tree: JupyterFrontEndPlugin<JupyterFrontEnd.ITreeResolver> = {
})
);
set.add(
router.register({ command: 'retrolab-router:tree', pattern: treePattern })
router.register({ command: CommandIDs.resolveTree, pattern: treePattern })
);
// If a route is handled by the router without the tree command being
@ -541,6 +547,29 @@ const tree: JupyterFrontEndPlugin<JupyterFrontEnd.ITreeResolver> = {
}
};
const treePathUpdater: JupyterFrontEndPlugin<ITreePathUpdater> = {
id: '@retrolab/application-extension:tree-updater',
requires: [IRouter],
provides: ITreePathUpdater,
activate: (app: JupyterFrontEnd, router: IRouter) => {
function updateTreePath(treePath: string) {
if (treePath !== PageConfig.getOption('treePath')) {
const path = URLExt.join(
PageConfig.getOption('baseUrl') || '/',
PageConfig.getOption('frontendUrl'),
'tree',
treePath
);
router.navigate(path, { skipRouting: true });
// Persist the new tree path to PageConfig as it is used elsewhere at runtime.
PageConfig.setOption('treePath', URLExt.encodeParts(treePath));
}
}
return updateTreePath;
},
autoStart: true
};
/**
* Zen mode plugin
*/
@ -619,6 +648,7 @@ const plugins: JupyterFrontEndPlugin<any>[] = [
topVisibility,
translator,
tree,
treePathUpdater,
zen
];