From 0d83598eebf2a0df6ec24a9966e1f2c504246701 Mon Sep 17 00:00:00 2001
From: Jeremy Tuloup <jeremy.tuloup@gmail.com>
Date: Wed, 9 Dec 2020 00:59:45 +0100
Subject: [PATCH] Combine the running and file browsers on tree

---
 builder/index.js                              |  3 +-
 packages/filebrowser-extension/src/index.ts   | 51 ++++++++++---------
 packages/filebrowser-extension/style/base.css | 21 ++++++++
 packages/running-extension/src/index.ts       | 17 +------
 4 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/builder/index.js b/builder/index.js
index 4615c2206..fe633a941 100644
--- a/builder/index.js
+++ b/builder/index.js
@@ -112,7 +112,8 @@ async function main() {
             '@jupyterlab-classic/filebrowser-extension:browser',
             '@jupyterlab-classic/filebrowser-extension:factory'
           ].includes(id)
-      )
+      ),
+      require('@jupyterlab/running-extension')
     ]);
   } else if (page === 'running') {
     mods = mods.concat([
diff --git a/packages/filebrowser-extension/src/index.ts b/packages/filebrowser-extension/src/index.ts
index ac10b6c85..5322b5c6a 100644
--- a/packages/filebrowser-extension/src/index.ts
+++ b/packages/filebrowser-extension/src/index.ts
@@ -39,6 +39,8 @@ import { Launcher } from '@jupyterlab/launcher';
 
 import { IMainMenu } from '@jupyterlab/mainmenu';
 
+import { IRunningSessionManagers, RunningSessions } from '@jupyterlab/running';
+
 import { Contents } from '@jupyterlab/services';
 
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
@@ -59,17 +61,18 @@ import {
   markdownIcon,
   newFolderIcon,
   pasteIcon,
+  runningIcon,
   stopIcon,
   textEditorIcon
 } from '@jupyterlab/ui-components';
 
-import { IIterator, map, reduce, toArray, find } from '@lumino/algorithm';
+import { IIterator, map, reduce, toArray } from '@lumino/algorithm';
 
 import { CommandRegistry } from '@lumino/commands';
 
 import { Message } from '@lumino/messaging';
 
-import { Menu } from '@lumino/widgets';
+import { Menu, TabPanel } from '@lumino/widgets';
 
 /**
  * The command IDs used by the file browser plugin.
@@ -149,13 +152,16 @@ const browser: JupyterFrontEndPlugin<void> = {
     ICommandPalette,
     IMainMenu,
     ILayoutRestorer,
-    ITreePathUpdater
+    ITreePathUpdater,
+    IRunningSessionManagers
   ],
   autoStart: true
 };
 
 /**
  * The default file browser factory provider.
+ *
+ * TODO: remove and use upstream plugin
  */
 const factory: JupyterFrontEndPlugin<IFileBrowserFactory> = {
   activate: activateFactory,
@@ -261,9 +267,9 @@ function activateBrowser(
   commandPalette: ICommandPalette | null,
   mainMenu: IMainMenu | null,
   restorer: ILayoutRestorer | null,
-  treePathUpdater: ITreePathUpdater | null
+  treePathUpdater: ITreePathUpdater | null,
+  manager: IRunningSessionManagers | null
 ): void {
-  const trans = translator.load('jupyterlab');
   const browser = factory.defaultBrowser;
   const { commands } = app;
 
@@ -288,25 +294,24 @@ function activateBrowser(
   );
 
   browser.title.icon = folderIcon;
-  // Show the current file browser shortcut in its title.
-  const updateBrowserTitle = () => {
-    const binding = find(
-      app.commands.keyBindings,
-      b => b.command === CommandIDs.toggleBrowser
-    );
-    if (binding) {
-      const ks = CommandRegistry.formatKeystroke(binding.keys.join(' '));
-      browser.title.caption = trans.__('File Browser (%1)', ks);
-    } else {
-      browser.title.caption = trans.__('File Browser');
-    }
-  };
-  updateBrowserTitle();
-  app.commands.keyBindingChanged.connect(() => {
-    updateBrowserTitle();
-  });
 
-  app.shell.add(browser, 'main', { rank: 100 });
+  const tabPanel = new TabPanel({ tabPlacement: 'top', tabsMovable: false });
+  tabPanel.addClass('jp-TreePanel');
+
+  browser.title.label = 'File Browser';
+  tabPanel.addWidget(browser);
+  tabPanel.tabBar.addTab(browser.title);
+
+  if (manager) {
+    const running = new RunningSessions(manager, translator);
+    running.id = 'jp-running-sessions';
+    running.title.label = 'Running Sessions';
+    running.title.icon = runningIcon;
+    tabPanel.addWidget(running);
+    tabPanel.tabBar.addTab(running.title);
+  }
+
+  app.shell.add(tabPanel, 'main', { rank: 100 });
 
   // If the layout is a fresh session without saved data and not in single document
   // mode, open file browser.
diff --git a/packages/filebrowser-extension/style/base.css b/packages/filebrowser-extension/style/base.css
index c0b120aa8..05c570e80 100644
--- a/packages/filebrowser-extension/style/base.css
+++ b/packages/filebrowser-extension/style/base.css
@@ -1,3 +1,24 @@
 .jp-FileBrowser {
   height: 100%;
 }
+
+.lm-TabPanel {
+  height: 100%;
+}
+
+.jp-TreePanel .lm-TabPanel-tabBar {
+  border: none;
+  overflow: visible;
+  min-height: 28px;
+}
+
+.jp-TreePanel .lm-TabBar-tab {
+  color: var(--jp-ui-font-color0);
+  border: solid 1px var(--jp-layout-color1);
+  padding: 5px;
+}
+
+.jp-TreePanel .lm-TabBar-tabLabel {
+  padding-left: 5px;
+  padding-right: 5px;
+}
diff --git a/packages/running-extension/src/index.ts b/packages/running-extension/src/index.ts
index ebdc76b66..64ff4e3b7 100644
--- a/packages/running-extension/src/index.ts
+++ b/packages/running-extension/src/index.ts
@@ -6,27 +6,14 @@ import {
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
 
-import { IRunningSessionManagers, RunningSessions } from '@jupyterlab/running';
-
-import { ITranslator } from '@jupyterlab/translation';
-
 /**
  * The default running sessions extension.
  */
 const plugin: JupyterFrontEndPlugin<void> = {
   id: '@jupyterlab-classic/running-extension:plugin',
-  requires: [IRunningSessionManagers],
   autoStart: true,
-  activate: (
-    app: JupyterFrontEnd,
-    manager: IRunningSessionManagers,
-    translator: ITranslator
-  ): void => {
-    const running = new RunningSessions(manager, translator);
-    running.id = 'jp-running-sessions';
-
-    // re-add the widget to the main area
-    app.shell.add(running, 'main');
+  activate: (app: JupyterFrontEnd): void => {
+    console.log('nope');
   }
 };