From ed5d4b473be33a35ac87a1e332f1631f63fcdff7 Mon Sep 17 00:00:00 2001
From: Jeremy Tuloup <jeremy.tuloup@gmail.com>
Date: Fri, 11 Dec 2020 18:54:33 +0100
Subject: [PATCH] Add file browser buttons to create new files

---
 builder/index.js                       |  7 +--
 packages/tree-extension/src/index.ts   | 69 +++++++++++++++++++++++---
 packages/tree-extension/style/base.css | 20 ++++++++
 3 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/builder/index.js b/builder/index.js
index 53d9077f7..2010c45da 100644
--- a/builder/index.js
+++ b/builder/index.js
@@ -111,12 +111,7 @@ async function main() {
   const page = PageConfig.getOption('classicPage');
   if (page === 'tree') {
     mods = mods.concat([
-      require('@jupyterlab-classic/tree-extension').default.filter(({ id }) =>
-        [
-          '@jupyterlab-classic/tree-extension:browser',
-          '@jupyterlab-classic/tree-extension:factory'
-        ].includes(id)
-      ),
+      require('@jupyterlab-classic/tree-extension'),
       require('@jupyterlab/running-extension')
     ]);
   } else if (page === 'notebooks') {
diff --git a/packages/tree-extension/src/index.ts b/packages/tree-extension/src/index.ts
index 47caa9c0b..2bb53a868 100644
--- a/packages/tree-extension/src/index.ts
+++ b/packages/tree-extension/src/index.ts
@@ -19,7 +19,8 @@ import {
   ICommandPalette,
   InputDialog,
   showErrorMessage,
-  DOMUtils
+  DOMUtils,
+  CommandToolbarButton
 } from '@jupyterlab/apputils';
 
 import { PathExt } from '@jupyterlab/coreutils';
@@ -55,9 +56,11 @@ import {
   folderIcon,
   markdownIcon,
   newFolderIcon,
+  notebookIcon,
   pasteIcon,
   runningIcon,
   stopIcon,
+  terminalIcon,
   textEditorIcon
 } from '@jupyterlab/ui-components';
 
@@ -117,6 +120,58 @@ namespace CommandIDs {
   export const search = 'filebrowser:search';
 }
 
+/**
+ * Plugin to add extra buttons to the file browser to create
+ * new notebooks, files and terminals.
+ */
+const buttons: JupyterFrontEndPlugin<void> = {
+  id: '@jupyterlab-classic/tree-extension:buttons',
+  requires: [IFileBrowserFactory],
+  autoStart: true,
+  activate: (app: JupyterFrontEnd, filebrowser: IFileBrowserFactory) => {
+    const { commands } = app;
+    const browser = filebrowser.defaultBrowser;
+
+    // wrapper commands to be able to override the label
+    const newNotebookCommand = 'tree:new-notebook';
+    commands.addCommand(newNotebookCommand, {
+      label: 'New Notebook',
+      icon: notebookIcon,
+      execute: () => {
+        return commands.execute('notebook:create-new');
+      }
+    });
+
+    const newTerminalCommand = 'tree:new-terminal';
+    commands.addCommand(newTerminalCommand, {
+      label: 'New Terminal',
+      icon: terminalIcon,
+      execute: () => {
+        return commands.execute('terminal:create-new');
+      }
+    });
+
+    const newNotebook = new CommandToolbarButton({
+      commands,
+      id: newNotebookCommand
+    });
+
+    const newFile = new CommandToolbarButton({
+      commands,
+      id: CommandIDs.createNewFile
+    });
+
+    const newTerminal = new CommandToolbarButton({
+      commands,
+      id: newTerminalCommand
+    });
+
+    browser.toolbar.insertItem(0, 'new-notebook', newNotebook);
+    browser.toolbar.insertItem(1, 'new-file', newFile);
+    browser.toolbar.insertItem(2, 'new-terminal', newTerminal);
+  }
+};
+
 /**
  * The default file browser extension.
  */
@@ -157,12 +212,6 @@ const factory: JupyterFrontEndPlugin<IFileBrowserFactory> = {
  */
 const namespace = 'filebrowser';
 
-/**
- * Export the plugins as default.
- */
-const plugins: JupyterFrontEndPlugin<any>[] = [factory, browser];
-export default plugins;
-
 /**
  * Activate the file browser factory provider.
  */
@@ -911,3 +960,9 @@ namespace Private {
     router.routed.connect(listener);
   }
 }
+
+/**
+ * Export the plugins as default.
+ */
+const plugins: JupyterFrontEndPlugin<any>[] = [browser, buttons, factory];
+export default plugins;
diff --git a/packages/tree-extension/style/base.css b/packages/tree-extension/style/base.css
index 66acc305e..0ed90ca74 100644
--- a/packages/tree-extension/style/base.css
+++ b/packages/tree-extension/style/base.css
@@ -22,3 +22,23 @@
   padding-left: 5px;
   padding-right: 5px;
 }
+
+/* Override the style from upstream JupyterLab */
+.jp-FileBrowser-toolbar.jp-Toolbar
+  .jp-Toolbar-item:first-child
+  .jp-ToolbarButtonComponent {
+  width: auto;
+  background: unset;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+.jp-FileBrowser-toolbar.jp-Toolbar
+  .jp-Toolbar-item:first-child
+  .jp-ToolbarButtonComponent:hover {
+  background-color: var(--jp-layout-color2);
+}
+
+.jp-FileBrowser-toolbar.jp-Toolbar .jp-ToolbarButtonComponent {
+  width: unset;
+}