Incorporate SUBMIT_COMMIT_COMMAND into CommandIDs enum

Author: krassowski

src/commandsAndMenu.tsx

@@ -106,8 +106,6 @@ function pluralizedContextLabel(singular: string, plural: string) {
   };
 }
 
-export const SUBMIT_COMMIT_COMMAND = 'git:submit-commit';
-
 /**
  * Add the commands for the git extension.
  */
@@ -128,7 +126,7 @@ export function addCommands(
    * The label and caption are given to ensure that the command will
    * show up in the shortcut editor UI with a nice description.
    */
-  commands.addCommand(SUBMIT_COMMIT_COMMAND, {
+  commands.addCommand(CommandIDs.gitSubmitCommand, {
     label: 'Commit from the Commit Box',
     caption:
       'Submit the commit using the summary and description from commit box',

src/components/CommitBox.tsx

@@ -7,7 +7,7 @@ import {
   commitButtonClass
 } from '../style/CommitBox';
 import { CommandRegistry } from '@lumino/commands';
-import { SUBMIT_COMMIT_COMMAND } from '../commandsAndMenu';
+import { CommandIDs } from '../tokens';
 
 /**
  * Interface describing component properties.
@@ -136,7 +136,7 @@ export class CommitBox extends React.Component<
    */
   private _getSubmitKeystroke = (): string => {
     const binding = this.props.commands.keyBindings.find(
-      binding => binding.command === SUBMIT_COMMIT_COMMAND
+      binding => binding.command === CommandIDs.gitSubmitCommand
     );
     return binding.keys.join(' ');
   };
@@ -201,7 +201,7 @@ export class CommitBox extends React.Component<
     _: CommandRegistry,
     commandArgs: CommandRegistry.ICommandExecutedArgs
   ): void => {
-    if (commandArgs.id === SUBMIT_COMMIT_COMMAND && this._canCommit()) {
+    if (commandArgs.id === CommandIDs.gitSubmitCommand && this._canCommit()) {
       this._onCommitSubmit();
     }
   };

src/tokens.ts

@@ -862,5 +862,6 @@ export enum CommandIDs {
   gitClone = 'git:clone',
   gitOpenGitignore = 'git:open-gitignore',
   gitPush = 'git:push',
-  gitPull = 'git:pull'
+  gitPull = 'git:pull',
+  gitSubmitCommand = 'git:submit-commit'
 }

tests/test-components/CommitBox.spec.tsx

@@ -3,14 +3,14 @@ import 'jest';
 import { shallow } from 'enzyme';
 import { CommitBox} from '../../src/components/CommitBox';
 import { CommandRegistry } from '@lumino/commands';
-import { SUBMIT_COMMIT_COMMAND } from '../../src/commandsAndMenu';
+import { CommandIDs } from '../../src/tokens';
 
 describe('CommitBox', () => {
 
   const defaultCommands = new CommandRegistry()
   defaultCommands.addKeyBinding({
     keys: ['Accel Enter'],
-    command: SUBMIT_COMMIT_COMMAND,
+    command: CommandIDs.gitSubmitCommand,
     selector: '.jp-git-CommitBox'
   })
 
@@ -59,7 +59,7 @@ describe('CommitBox', () => {
       const adjustedCommands = new CommandRegistry()
       adjustedCommands.addKeyBinding({
         keys: ['Shift Enter'],
-        command: SUBMIT_COMMIT_COMMAND,
+        command: CommandIDs.gitSubmitCommand,
         selector: '.jp-git-CommitBox'
       })
       const props = {