Browse Source

Fix workspace parsing regex.

Afshin T. Darian 5 years ago
parent
commit
fe161be7cf
1 changed files with 4 additions and 4 deletions
  1. 4 4
      packages/apputils-extension/src/index.ts

+ 4 - 4
packages/apputils-extension/src/index.ts

@@ -241,13 +241,13 @@ const resolver: JupyterFrontEndPlugin<IWindowResolver> = {
     const { hash, path, search } = router.current;
     const query = URLExt.queryStringToObject(search || '');
     const solver = new WindowResolver();
-    const match = path.match(new RegExp(`^${paths.urls.workspaces}([^?\/]+)`));
+    const { urls } = paths;
+    const match = path.match(new RegExp(`^${urls.workspaces}\/([^?\/]+)`));
     const workspace = (match && decodeURIComponent(match[1])) || '';
     const candidate = Private.candidate(paths, workspace);
     const rest = workspace
-      ? path.replace(new RegExp(`^${paths.urls.workspaces}${workspace}`), '')
-      : path.replace(new RegExp(`^${paths.urls.app}`), '');
-
+      ? path.replace(new RegExp(`^${urls.workspaces}\/${workspace}`), '')
+      : path.replace(new RegExp(`^${urls.app}\/?`), '');
     try {
       await solver.resolve(candidate);
       return solver;