added item to "Git" menu to toggle simple staging

Author: telamonian

src/gitMenuCommands.ts

@@ -3,6 +3,7 @@ import { Dialog, MainAreaWidget, showDialog } from '@jupyterlab/apputils';
 import { FileBrowser } from '@jupyterlab/filebrowser';
 import { ITerminal } from '@jupyterlab/terminal';
 import { IGitExtension } from './tokens';
+import { ISettingRegistry } from '@jupyterlab/coreutils';
 
 /**
  * The command IDs used by the git plugin.
@@ -12,6 +13,7 @@ export namespace CommandIDs {
   export const gitTerminalCommand = 'git:terminal-command';
   export const gitInit = 'git:init';
   export const gitOpenUrl = 'git:open-url';
+  export const gitToggleSimpleStaging = 'git:toggle-simple-staging';
 }
 
 /**
@@ -20,7 +22,8 @@ export namespace CommandIDs {
 export function addCommands(
   app: JupyterFrontEnd,
   model: IGitExtension,
-  fileBrowser: FileBrowser
+  fileBrowser: FileBrowser,
+  settings: ISettingRegistry.ISettings
 ) {
   const { commands, shell } = app;
 
@@ -99,4 +102,13 @@ export function addCommands(
       window.open(url);
     }
   });
+
+  /** add toggle for simple staging */
+  commands.addCommand(CommandIDs.gitToggleSimpleStaging, {
+    label: 'Simple staging',
+    isToggled: () => !!settings.composite['simpleStaging'],
+    execute: args => {
+      settings.set('simpleStaging', !settings.composite['simpleStaging']);
+    }
+  });
 }

src/index.ts

@@ -4,7 +4,11 @@ import {
   JupyterFrontEndPlugin
 } from '@jupyterlab/application';
 import { IChangedArgs, ISettingRegistry } from '@jupyterlab/coreutils';
-import { FileBrowserModel, IFileBrowserFactory } from '@jupyterlab/filebrowser';
+import {
+  FileBrowser,
+  FileBrowserModel,
+  IFileBrowserFactory
+} from '@jupyterlab/filebrowser';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { IRenderMimeRegistry } from '@jupyterlab/rendermime';
 import { defaultIconRegistry } from '@jupyterlab/ui-components';
@@ -60,9 +64,8 @@ function activate(
   restorer: ILayoutRestorer,
   factory: IFileBrowserFactory,
   renderMime: IRenderMimeRegistry,
-  settings: ISettingRegistry
+  settingRegistry: ISettingRegistry
 ): IGitExtension {
-  const { commands } = app;
   const key = plugin.id;
 
   registerGitIcons(defaultIconRegistry);
@@ -81,7 +84,7 @@ function activate(
   });
 
   /* Create the widgets */
-  settings
+  settingRegistry
     .load(key)
     .then(settings => {
       // Create the Git widget sidebar
@@ -97,6 +100,12 @@ function activate(
       // Rank has been chosen somewhat arbitrarily to give priority to the running
       // sessions widget in the sidebar.
       app.shell.add(gitPlugin, 'left', { rank: 200 });
+
+      // add a menu for the plugin
+      mainMenu.addMenu(
+        createGitMenu(app, gitExtension, factory.defaultBrowser, settings),
+        { rank: 60 }
+      );
     })
     .catch(reason => {
       console.error(
@@ -105,29 +114,42 @@ function activate(
     });
 
   addCloneButton(gitExtension, factory.defaultBrowser);
+  return gitExtension;
+}
+
+/**
+ * Add commands and menu items
+ */
+function createGitMenu(
+  app: JupyterFrontEnd,
+  gitExtension: IGitExtension,
+  fileBrowser: FileBrowser,
+  settings: ISettingRegistry.ISettings
+): Menu {
+  const { commands } = app;
+  addCommands(app, gitExtension, fileBrowser, settings);
 
-  /* Add commands and menu items */
-  const category = 'Git';
-  addCommands(app, gitExtension, factory.defaultBrowser);
   let menu = new Menu({ commands });
-  let tutorial = new Menu({ commands });
-  tutorial.title.label = ' Tutorial ';
-  menu.title.label = category;
+  menu.title.label = 'Git';
   [CommandIDs.gitUI, CommandIDs.gitTerminalCommand, CommandIDs.gitInit].forEach(
     command => {
       menu.addItem({ command });
     }
   );
 
+  let tutorial = new Menu({ commands });
+  tutorial.title.label = ' Tutorial ';
   RESOURCES.map(args => {
     tutorial.addItem({
       args,
       command: CommandIDs.gitOpenUrl
     });
   });
-
   menu.addItem({ type: 'submenu', submenu: tutorial });
-  mainMenu.addMenu(menu, { rank: 60 });
 
-  return gitExtension;
+  menu.addItem({ type: 'separator' });
+
+  menu.addItem({ command: CommandIDs.gitToggleSimpleStaging });
+
+  return menu;
 }