Add eventSource metadata to undo-last-discard event reporting

Co-Authored-By: Tilde Ann Thurium <annthurium@github.com>

Author: kuychaco

lib/controllers/file-patch-controller.js

@@ -539,10 +539,11 @@ export default class FilePatchController extends React.Component {
     return this.props.discardLines(this.state.filePatch, lines, this.repositoryObserver.getActiveModel());
   }
 
-  undoLastDiscard() {
+  undoLastDiscard({eventSource} = {}) {
     addEvent('undo-last-discard', {
       package: 'github',
       component: 'FilePatchController',
+      eventSource,
     });
     return this.props.undoLastDiscard(this.props.filePath, this.repositoryObserver.getActiveModel());
   }

lib/views/file-patch-view.js

@@ -265,7 +265,7 @@ export default class FilePatchView extends React.Component {
           <Command command="github:discard-selected-lines" callback={this.discardSelection} />
           <Command
             command="core:undo"
-            callback={() => this.props.hasUndoHistory && this.props.undoLastDiscard()}
+            callback={this.undoLastDiscardFromCoreUndo}
           />
           {this.props.executableModeChange &&
             <Command
@@ -282,14 +282,30 @@ export default class FilePatchView extends React.Component {
         <Commands registry={this.props.commandRegistry} target="atom-workspace">
           <Command
             command="github:undo-last-discard-in-diff-view"
-            callback={() => this.props.hasUndoHistory && this.props.undoLastDiscard()}
+            callback={this.undoLastDiscardFromCommand}
           />
           <Command command="github:focus-diff-view" callback={this.focus} />
         </Commands>
       </div>
     );
   }
 
+  undoLastDiscardFromCommand = () => {
+    if (this.props.hasUndoHistory) {
+      this.props.undoLastDiscard({eventSource: {command: 'github:undo-last-discard-in-diff-view'}});
+    }
+  }
+
+  undoLastDiscardFromCoreUndo = () => {
+    if (this.props.hasUndoHistory) {
+      this.props.undoLastDiscard({eventSource: {command: 'core:undo'}});
+    }
+  }
+
+  undoLastDiscardFromButton = () => {
+    this.props.undoLastDiscard({eventSource: 'button'});
+  }
+
   renderButtonGroup() {
     const unstaged = this.props.stagingStatus === 'unstaged';
 
@@ -298,7 +314,7 @@ export default class FilePatchView extends React.Component {
         {this.props.hasUndoHistory && unstaged ? (
           <button
             className="btn icon icon-history"
-            onClick={this.props.undoLastDiscard}>
+            onClick={this.undoLastDiscardFromButton}>
             Undo Discard
           </button>
         ) : null}

lib/views/staging-view.js

@@ -85,7 +85,6 @@ export default class StagingView extends React.Component {
       'stageAll', 'unstageAll', 'stageAllMergeConflicts', 'discardAll', 'confirmSelectedItems', 'selectAll',
       'selectFirst', 'selectLast', 'diveIntoSelection', 'showDiffView', 'showBulkResolveMenu', 'showActionsMenu',
       'resolveCurrentAsOurs', 'resolveCurrentAsTheirs', 'quietlySelectItem', 'didChangeSelectedItems',
-      'undoLastDiscard',
     );
 
     this.subs = new CompositeDisposable(
@@ -274,18 +273,36 @@ export default class StagingView extends React.Component {
           <Command command="github:resolve-file-as-ours" callback={this.resolveCurrentAsOurs} />
           <Command command="github:resolve-file-as-theirs" callback={this.resolveCurrentAsTheirs} />
           <Command command="github:discard-changes-in-selected-files" callback={this.discardChanges} />
-          <Command command="core:undo" callback={this.undoLastDiscard} />
+          <Command command="core:undo" callback={this.undoLastDiscardFromCoreUndo} />
         </Commands>
         <Commands registry={this.props.commandRegistry} target="atom-workspace">
           <Command command="github:stage-all-changes" callback={this.stageAll} />
           <Command command="github:unstage-all-changes" callback={this.unstageAll} />
           <Command command="github:discard-all-changes" callback={this.discardAll} />
-          <Command command="github:undo-last-discard-in-git-tab" callback={this.undoLastDiscard} />
+          <Command command="github:undo-last-discard-in-git-tab"
+            callback={this.undoLastDiscardFromGitHubCommand}
+          />
         </Commands>
       </Fragment>
     );
   }
 
+  undoLastDiscardFromCoreUndo = () => {
+    this.undoLastDiscard({eventSource: {command: 'core:undo'}});
+  }
+
+  undoLastDiscardFromGitHubCommand = () => {
+    this.undoLastDiscard({eventSource: {command: 'github:undo-last-discard-in-git-tab'}});
+  }
+
+  undoLastDiscardFromButton = () => {
+    this.undoLastDiscard({eventSource: 'button'});
+  }
+
+  undoLastDiscardFromHeaderMenu = () => {
+    this.undoLastDiscard({eventSource: 'header-menu'});
+  }
+
   renderActionsMenu() {
     if (this.props.unstagedChanges.length || this.props.hasUndoHistory) {
       return (
@@ -302,7 +319,7 @@ export default class StagingView extends React.Component {
   renderUndoButton() {
     return (
       <button className="github-StagingView-headerButton github-StagingView-headerButton--fullWidth icon icon-history"
-        onClick={this.undoLastDiscard}>Undo Discard</button>
+        onClick={this.undoLastDiscardFromButton}>Undo Discard</button>
     );
   }
 
@@ -628,7 +645,7 @@ export default class StagingView extends React.Component {
 
     menu.append(new MenuItem({
       label: 'Undo Last Discard',
-      click: () => this.undoLastDiscard(),
+      click: this.undoLastDiscardFromHeaderMenu,
       enabled: this.props.hasUndoHistory,
     }));
 
@@ -841,14 +858,15 @@ export default class StagingView extends React.Component {
     }
   }
 
-  undoLastDiscard() {
+  undoLastDiscard({eventSource} = {}) {
     if (!this.props.hasUndoHistory) {
       return;
     }
 
     addEvent('undo-last-discard', {
       package: 'github',
       component: 'StagingView',
+      eventSource,
     });
 
     this.props.undoLastDiscard();

test/controllers/file-patch-controller.test.js

@@ -321,6 +321,7 @@ describe('FilePatchController', function() {
         assert.isTrue(reporterProxy.addEvent.calledWith('undo-last-discard', {
           package: 'github',
           component: 'FilePatchController',
+          eventSource: undefined,
         }));
       });
     });

test/views/staging-view.test.js

@@ -822,15 +822,14 @@ describe('StagingView', function() {
 
   describe('undoLastDiscard()', function() {
     it('records an event', function() {
-      const wrapper = mount(app);
+      const wrapper = mount(React.cloneElement(app, {hasUndoHistory: true}));
       sinon.stub(reporterProxy, 'addEvent');
       sinon.stub(wrapper.instance(), 'getSelectedItemFilePaths').returns(['a.txt', 'b.txt']);
-      wrapper.instance().discardChanges();
-      assert.isTrue(reporterProxy.addEvent.calledWith('discard-unstaged-changes', {
+      wrapper.instance().undoLastDiscard();
+      assert.isTrue(reporterProxy.addEvent.calledWith('undo-last-discard', {
         package: 'github',
         component: 'StagingView',
-        fileCount: 2,
-        type: 'selected',
+        eventSource: undefined,
       }));
     });
   });