Use the tree resolver as an optional dependency to populate the defau…

…lt file browser.
jupyterlab · Dec 23, 2019 · a1bdf1a · a1bdf1a
1 parent b98deac
commit a1bdf1a
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 8 deletions.
diff --git a/packages/application-extension/src/index.tsx b/packages/application-extension/src/index.tsx
@@ -319,7 +319,6 @@ const tree: JupyterFrontEndPlugin<JupyterFrontEnd.ITreeResolver> = {
     // If a route is handled by the router without the tree command being
     // invoked, resolve to `null` and clean up artifacts.
     const listener = () => {
-      console.log('listener in tree plugin', set.isDisposed);
       if (set.isDisposed) {
         return;
       }

diff --git a/packages/filebrowser-extension/src/index.ts b/packages/filebrowser-extension/src/index.ts
@@ -4,6 +4,7 @@
 import {
   ILabShell,
   ILayoutRestorer,
+  IRouter,
   JupyterFrontEnd,
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
@@ -134,7 +135,8 @@ const factory: JupyterFrontEndPlugin<IFileBrowserFactory> = {
   activate: activateFactory,
   id: '@jupyterlab/filebrowser-extension:factory',
   provides: IFileBrowserFactory,
-  requires: [IIconRegistry, IDocumentManager, IStateDB]
+  requires: [IIconRegistry, IDocumentManager],
+  optional: [IStateDB, IRouter, JupyterFrontEnd.ITreeResolver]
 };
 
 /**
@@ -209,12 +211,14 @@ export default plugins;
 /**
  * Activate the file browser factory provider.
  */
-function activateFactory(
+async function activateFactory(
   app: JupyterFrontEnd,
   icoReg: IIconRegistry,
   docManager: IDocumentManager,
-  state: IStateDB
-): IFileBrowserFactory {
+  state: IStateDB | null,
+  router: IRouter | null,
+  tree: JupyterFrontEnd.ITreeResolver | null
+): Promise<IFileBrowserFactory> {
   const { commands } = app;
   const tracker = new WidgetTracker<FileBrowser>({ namespace });
   const createFileBrowser = (
@@ -228,7 +232,8 @@ function activateFactory(
       refreshInterval: options.refreshInterval,
       state: options.state === null ? null : options.state || state
     });
-    const widget = new FileBrowser({ id, model });
+    const restore = options.restore;
+    const widget = new FileBrowser({ id, model, restore });
 
     // Add a launcher toolbar item.
     let launcher = new ToolbarButton({
@@ -245,9 +250,43 @@ function activateFactory(
 
     return widget;
   };
-  const defaultBrowser = createFileBrowser('filebrowser');
 
-  return { createFileBrowser, defaultBrowser, tracker };
+  // Manually restore the default file browser.
+  const id = 'filebrowser';
+  const defaultBrowser = createFileBrowser(id, { restore: false });
+  const plugin = { createFileBrowser, defaultBrowser, tracker };
+  const restoring = 'jp-mod-restoring';
+
+  defaultBrowser.addClass(restoring);
+
+  if (!router) {
+    void defaultBrowser.model.restore(id).then(() => {
+      defaultBrowser.removeClass(restoring);
+    });
+    return plugin;
+  }
+
+  const listener = async () => {
+    router.routed.disconnect(listener);
+
+    const paths = await tree?.paths;
+    if (paths) {
+      // Restore the model without populating it.
+      await defaultBrowser.model.restore(id, false);
+      if (paths.file) {
+        await commands.execute(CommandIDs.openPath, { path: paths.file });
+      }
+      if (paths.browser) {
+        await commands.execute(CommandIDs.openPath, { path: paths.browser });
+      }
+    } else {
+      await defaultBrowser.model.restore(id);
+    }
+    defaultBrowser.removeClass(restoring);
+  };
+  router.routed.connect(listener);
+
+  return plugin;
 }
 
 /**

diff --git a/packages/filebrowser-extension/style/index.css b/packages/filebrowser-extension/style/index.css
@@ -4,3 +4,7 @@
 |----------------------------------------------------------------------------*/
 
 @import url('~@jupyterlab/filebrowser/style/index.css');
+
+#filebrowser.jp-mod-restoring .jp-DirListing-content {
+  display: none;
+}