File Browser menu entry execution depends on the current page ('tree' or other)

Author: brichet

packages/application-extension/src/index.ts

@@ -25,8 +25,6 @@ import { IDocumentManager, renameDialog } from '@jupyterlab/docmanager';
 
 import { DocumentWidget } from '@jupyterlab/docregistry';
 
-import { IFileBrowserCommands } from '@jupyterlab/filebrowser';
-
 import { IMainMenu } from '@jupyterlab/mainmenu';
 
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
@@ -42,6 +40,8 @@ import {
   SidePanelPalette
 } from '@jupyter-notebook/application';
 
+import { CommandIDs as filebrowserCommandIDs } from '@jupyter-notebook/tree';
+
 import { jupyterIcon } from '@jupyter-notebook/ui-components';
 
 import { PromiseDelegate } from '@lumino/coreutils';
@@ -254,12 +254,11 @@ const pages: JupyterFrontEndPlugin<void> = {
   id: '@jupyter-notebook/application-extension:pages',
   autoStart: true,
   requires: [ITranslator],
-  optional: [ICommandPalette, IFileBrowserCommands],
+  optional: [ICommandPalette],
   activate: (
     app: JupyterFrontEnd,
     translator: ITranslator,
-    palette: ICommandPalette | null,
-    fileBrowserCommands: null
+    palette: ICommandPalette | null
   ): void => {
     const trans = translator.load('notebook');
     const baseUrl = PageConfig.getBaseUrl();
@@ -270,26 +269,22 @@ const pages: JupyterFrontEndPlugin<void> = {
         window.open(`${baseUrl}lab`);
       }
     });
+    const page = PageConfig.getOption('notebookPage');
 
-    if (!app.commands.isVisible('filebrowser:toggle-main')) {
-      app.commands.addCommand(CommandIDs.openTree, {
-        label: trans.__('File Browser'),
-        execute: () => {
+    app.commands.addCommand(CommandIDs.openTree, {
+      label: trans.__('File Browser'),
+      execute: () => {
+        if (page === 'tree') {
+          app.commands.execute(filebrowserCommandIDs.activate);
+        } else {
           window.open(`${baseUrl}tree`);
         }
-      });
-    }
+      }
+    });
 
     if (palette) {
       palette.addItem({ command: CommandIDs.openLab, category: 'View' });
-      if (!app.commands.isVisible('filebrowser:toggle-main')) {
-        palette.addItem({ command: CommandIDs.openTree, category: 'View' });
-      } else {
-        palette.addItem({
-          command: 'filebrowser:toggle-main',
-          category: 'View'
-        });
-      }
+      palette.addItem({ command: CommandIDs.openTree, category: 'View' });
     }
   }
 };

packages/tree-extension/src/index.ts

@@ -32,7 +32,11 @@ import {
 
 import { Menu, MenuBar } from '@lumino/widgets';
 
-import { NotebookTreeWidget, INotebookTree } from '@jupyter-notebook/tree';
+import {
+  CommandIDs,
+  NotebookTreeWidget,
+  INotebookTree
+} from '@jupyter-notebook/tree';
 
 /**
  * The file browser factory.
@@ -107,7 +111,7 @@ const openFileBrowser: JupyterFrontEndPlugin<void> = {
     factory: IFileBrowserFactory
   ) => {
     const { commands } = app;
-    commands.addCommand('filebrowser:activate', {
+    commands.addCommand(CommandIDs.activate, {
       execute: args => {
         const { defaultBrowser: browser } = factory;
         notebookTree.currentWidget = browser;

packages/tree/src/notebook-tree.ts

@@ -4,6 +4,14 @@ import { TabPanel } from '@lumino/widgets';
 
 import { INotebookTree } from './token';
 
+/**
+ * The namespace for command IDs.
+ */
+export declare namespace CommandIDs {
+  // The command to activate the filebrowser widget in tree view.
+  const activate = 'filebrowser:activate';
+}
+
 /**
  * The widget added in main area of the tree view.
  */