Merge pull request #6315 from jtpio/factories

Add support for opening a document with a different factory
jupyter · Mar 21, 2022 · 9be03f5 · 9be03f5
2 parents 3d05890 + d9e050f
commit 9be03f5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/packages/application-extension/src/index.ts b/packages/application-extension/src/index.ts
@@ -45,16 +45,6 @@ import { DisposableDelegate, DisposableSet } from '@lumino/disposable';
 
 import { Widget } from '@lumino/widgets';
 
-/**
- * The default notebook factory.
- */
-const NOTEBOOK_FACTORY = 'Notebook';
-
-/**
- * The editor factory.
- */
-const EDITOR_FACTORY = 'Editor';
-
 /**
  * A regular expression to match path to notebooks and documents
  */
@@ -179,18 +169,12 @@ const opener: JupyterFrontEndPlugin<void> = {
         }
 
         const file = decodeURIComponent(path);
-        const ext = PathExt.extname(file);
+        const urlParams = new URLSearchParams(parsed.search);
+        const factory = urlParams.get('factory') ?? 'default';
         app.restored.then(async () => {
-          // TODO: get factory from file type instead?
-          if (ext === '.ipynb') {
-            docManager.open(file, NOTEBOOK_FACTORY, undefined, {
-              ref: '_noref'
-            });
-          } else {
-            docManager.open(file, EDITOR_FACTORY, undefined, {
-              ref: '_noref'
-            });
-          }
+          docManager.open(file, factory, undefined, {
+            ref: '_noref'
+          });
         });
       }
     });

diff --git a/packages/docmanager-extension/src/index.ts b/packages/docmanager-extension/src/index.ts
@@ -40,8 +40,19 @@ const opener: JupyterFrontEndPlugin<void> = {
         return;
       }
       const ext = PathExt.extname(path);
-      const route = ext === '.ipynb' ? 'notebooks' : 'edit';
-      window.open(`${baseUrl}${route}/${path}`);
+      let route = 'edit';
+      if (
+        (widgetName === 'default' && ext === '.ipynb') ||
+        widgetName === 'Notebook'
+      ) {
+        route = 'notebooks';
+      }
+      let url = `${baseUrl}${route}/${path}`;
+      // append ?factory only if it's not the default
+      if (widgetName !== 'default') {
+        url = `${url}?factory=${widgetName}`;
+      }
+      window.open(url);
       return undefined;
     };
   }