Get filebrowser from current tracked widget (#1004)

* Update github action version

* Get the filebrowser from the tracked widget

* Fix unit test

Author: fcollonval

src/commandsAndMenu.tsx

@@ -10,7 +10,7 @@ import {
   WidgetTracker
 } from '@jupyterlab/apputils';
 import { PathExt, URLExt } from '@jupyterlab/coreutils';
-import { FileBrowser } from '@jupyterlab/filebrowser';
+import { FileBrowser, FileBrowserModel } from '@jupyterlab/filebrowser';
 import { Contents } from '@jupyterlab/services';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import { ITerminal } from '@jupyterlab/terminal';
@@ -101,7 +101,7 @@ function pluralizedContextLabel(singular: string, plural: string) {
 export function addCommands(
   app: JupyterFrontEnd,
   gitModel: GitExtension,
-  fileBrowser: FileBrowser,
+  fileBrowserModel: FileBrowserModel,
   settings: ISettingRegistry.ISettings,
   trans: TranslationBundle
 ): void {
@@ -178,7 +178,7 @@ export function addCommands(
       'Create an empty Git repository or reinitialize an existing one'
     ),
     execute: async () => {
-      const currentPath = fileBrowser.model.path;
+      const currentPath = fileBrowserModel.path;
       const result = await showDialog({
         title: trans.__('Initialize a Repository'),
         body: trans.__('Do you really want to make this directory a Git Repo?'),
@@ -311,14 +311,14 @@ export function addCommands(
             gitModel,
             Operation.Clone,
             trans,
-            { path: fileBrowser.model.path, url: result.value }
+            { path: fileBrowserModel.path, url: result.value }
           );
           logger.log({
             message: trans.__('Successfully cloned'),
             level: Level.SUCCESS,
             details
           });
-          await fileBrowser.model.refresh();
+          await fileBrowserModel.refresh();
         } catch (error) {
           console.error(
             'Encountered an error when cloning the repository. Error: ',

src/index.ts

@@ -74,7 +74,7 @@ async function activate(
   let settings: ISettingRegistry.ISettings;
   let serverSettings: Git.IServerSettings;
   // Get a reference to the default file browser extension
-  const filebrowser = factory.defaultBrowser;
+  const filebrowser = factory.tracker.currentWidget;
   translator = translator || nullTranslator;
   const trans = translator.load('jupyterlab_git');
 
@@ -157,14 +157,14 @@ async function activate(
   // Provided we were able to load application settings, create the extension widgets
   if (settings) {
     // Add JupyterLab commands
-    addCommands(app, gitExtension, factory.defaultBrowser, settings, trans);
+    addCommands(app, gitExtension, filebrowser.model, settings, trans);
 
     // Create the Git widget sidebar
     const gitPlugin = new GitWidget(
       gitExtension,
       settings,
       app.commands,
-      factory.defaultBrowser.model,
+      filebrowser.model,
       trans
     );
     gitPlugin.id = 'jp-git-sessions';
@@ -184,7 +184,7 @@ async function activate(
     mainMenu.addMenu(createGitMenu(app.commands, trans), { rank: 60 });
 
     // Add a clone button to the file browser extension toolbar
-    addCloneButton(gitExtension, factory.defaultBrowser, app.commands);
+    addCloneButton(gitExtension, filebrowser, app.commands);
 
     // Add the status bar widget
     addStatusBarWidget(statusBar, gitExtension, settings, trans);

tests/plugin.spec.ts

@@ -58,7 +58,7 @@ describe('plugin', () => {
         app,
         null,
         null,
-        { defaultBrowser: null },
+        { tracker: { currentWidget: null } },
         null,
         settingRegistry
       );
@@ -93,7 +93,7 @@ describe('plugin', () => {
         app,
         null,
         null,
-        { defaultBrowser: null },
+        { tracker: { currentWidget: null } },
         null,
         settingRegistry
       );
@@ -127,7 +127,7 @@ describe('plugin', () => {
         app,
         null,
         null,
-        { defaultBrowser: null },
+        { tracker: { currentWidget: null } },
         null,
         settingRegistry
       );
@@ -158,7 +158,7 @@ describe('plugin', () => {
         app,
         null,
         null,
-        { defaultBrowser: null },
+        { tracker: { currentWidget: null } },
         null,
         settingRegistry
       );