Merge remote-tracking branch 'origin/master' into pr-2100/atom/ku-handle-ghost-users

Author: smashwilson

lib/containers/__generated__/userMentionTooltipContainer_repositoryOwner.graphql.js

@@ -38,10 +38,10 @@ export default class CurrentPullRequestContainer extends React.Component {
     pushInProgress: PropTypes.bool.isRequired,
 
     workspace: PropTypes.object.isRequired,
-    workingDirectory: PropTypes.string.isRequired,
 
     // Actions
     onOpenIssueish: PropTypes.func.isRequired,
+    onOpenReviews: PropTypes.func.isRequired,
     onCreatePr: PropTypes.func.isRequired,
   }
 
@@ -147,7 +147,6 @@ export default class CurrentPullRequestContainer extends React.Component {
         results={associatedPullRequests.nodes}
         isLoading={false}
         workspace={this.props.workspace}
-        workingDirectory={this.props.workingDirectory}
         endpoint={this.props.endpoint}
         resultFilter={issueish => issueish.getHeadRepositoryID() === this.props.repository.id}
         {...this.controllerProps()}
@@ -176,9 +175,9 @@ export default class CurrentPullRequestContainer extends React.Component {
     return {
       title: 'Checked out pull request',
       onOpenIssueish: this.props.onOpenIssueish,
+      onOpenReviews: this.props.onOpenReviews,
       emptyComponent: this.renderEmptyTile,
       needReviewsButton: true,
-      workingDirectory: this.props.workingDirectory,
     };
   }
 }

lib/containers/current-pull-request-container.js

@@ -22,6 +22,7 @@ export default class IssueishSearchContainer extends React.Component {
     // Action methods
     onOpenIssueish: PropTypes.func.isRequired,
     onOpenSearch: PropTypes.func.isRequired,
+    onOpenReviews: PropTypes.func.isRequired,
   }
 
   static defaultProps = {
@@ -116,6 +117,7 @@ export default class IssueishSearchContainer extends React.Component {
       title: this.props.search.getName(),
 
       onOpenIssueish: this.props.onOpenIssueish,
+      onOpenReviews: this.props.onOpenReviews,
       onOpenMore: () => this.props.onOpenSearch(this.props.search),
     };
   }

lib/containers/issueish-search-container.js

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 
 import Octicon from '../atom/octicon';
 
-class UserMentionTooltip extends React.Component {
+export class BareUserMentionTooltipContainer extends React.Component {
   static propTypes = {
     repositoryOwner: PropTypes.shape({
       login: PropTypes.string.isRequired,
@@ -17,15 +17,15 @@ class UserMentionTooltip extends React.Component {
       company: PropTypes.string,
 
       // Organizations
-      members: PropTypes.shape({
+      membersWithRole: PropTypes.shape({
         totalCount: PropTypes.number.isRequired,
       }),
     }).isRequired,
   }
 
   render() {
     const owner = this.props.repositoryOwner;
-    const {login, company, repositories, members} = owner;
+    const {login, company, repositories, membersWithRole} = owner;
     return (
       <div className="github-UserMentionTooltip">
         <div className="github-UserMentionTooltip-avatar">
@@ -36,7 +36,9 @@ class UserMentionTooltip extends React.Component {
             <Octicon icon="mention" /><strong>{login}</strong>
           </div>
           {company && <div><Octicon icon="briefcase" /><span>{company}</span></div>}
-          {members && <div><Octicon icon="organization" /><span>{members.totalCount} members</span></div>}
+          {membersWithRole && (
+            <div><Octicon icon="organization" /><span>{membersWithRole.totalCount} members</span></div>
+          )}
           <div><Octicon icon="repo" /><span>{repositories.totalCount} repositories</span></div>
         </div>
         <div style={{clear: 'both'}} />
@@ -45,12 +47,20 @@ class UserMentionTooltip extends React.Component {
   }
 }
 
-export default createFragmentContainer(UserMentionTooltip, {
+export default createFragmentContainer(BareUserMentionTooltipContainer, {
   repositoryOwner: graphql`
     fragment userMentionTooltipContainer_repositoryOwner on RepositoryOwner {
-      login avatarUrl repositories { totalCount }
-      ... on User { company }
-      ... on Organization { members { totalCount } }
+      login
+      avatarUrl
+      repositories { totalCount }
+      ... on User {
+        company
+      }
+      ... on Organization {
+        membersWithRole {
+          totalCount
+        }
+      }
     }
   `,
 });

lib/containers/user-mention-tooltip-container.js

@@ -4,7 +4,8 @@ import {graphql, createFragmentContainer} from 'react-relay';
 import {EndpointPropType} from '../prop-types';
 import IssueishListView from '../views/issueish-list-view';
 import Issueish from '../models/issueish';
-import ReviewsItem from '../items/reviews-item';
+import {shell, remote} from 'electron';
+const {Menu, MenuItem} = remote;
 import {addEvent} from '../reporter-proxy';
 
 const StatePropType = PropTypes.oneOf(['EXPECTED', 'PENDING', 'SUCCESS', 'ERROR', 'FAILURE']);
@@ -51,12 +52,12 @@ export class BareIssueishListController extends React.Component {
 
     resultFilter: PropTypes.func,
     onOpenIssueish: PropTypes.func.isRequired,
+    onOpenReviews: PropTypes.func.isRequired,
     onOpenMore: PropTypes.func,
 
     emptyComponent: PropTypes.func,
     workspace: PropTypes.object,
     endpoint: EndpointPropType,
-    workingDirectory: PropTypes.string,
     needReviewsButton: PropTypes.bool,
   };
 
@@ -90,21 +91,31 @@ export class BareIssueishListController extends React.Component {
     return null;
   }
 
-  openReviews = async () => {
-    /* istanbul ignore next */
-    if (this.props.results.length < 1) {
-      return;
-    }
-    const result = this.props.results[0];
-    const uri = ReviewsItem.buildURI({
-      host: this.props.endpoint.getHost(),
-      owner: result.repository.owner.login,
-      repo: result.repository.name,
-      number: result.number,
-      workdir: this.props.workingDirectory,
+  openOnGitHub = url => {
+    return new Promise((resolve, reject) => {
+      shell.openExternal(url, {}, err => {
+        if (err) { reject(err); } else {
+          resolve();
+          addEvent('open-issueish-in-browser', {package: 'github', component: this.constructor.name});
+        }
+      });
     });
-    await this.props.workspace.open(uri);
-    addEvent('open-reviews-tab', {package: 'github', from: this.constructor.name});
+  }
+
+  showActionsMenu = /* istanbul ignore next */ issueish => {
+    const menu = new Menu();
+
+    menu.append(new MenuItem({
+      label: 'See reviews',
+      click: () => this.props.onOpenReviews(issueish),
+    }));
+
+    menu.append(new MenuItem({
+      label: 'Open on GitHub',
+      click: () => this.openOnGitHub(issueish.getGitHubURL()),
+    }));
+
+    menu.popup(remote.getCurrentWindow());
   }
 
   render() {
@@ -118,7 +129,9 @@ export class BareIssueishListController extends React.Component {
         needReviewsButton={this.props.needReviewsButton}
         onIssueishClick={this.props.onOpenIssueish}
         onMoreClick={this.props.onOpenMore}
-        openReviews={this.openReviews}
+        openReviews={this.props.onOpenReviews}
+        openOnGitHub={this.openOnGitHub}
+        showActionsMenu={this.showActionsMenu}
         emptyComponent={this.props.emptyComponent}
       />
     );

lib/controllers/issueish-list-controller.js

@@ -9,6 +9,7 @@ import Search from '../models/search';
 import IssueishSearchContainer from '../containers/issueish-search-container';
 import CurrentPullRequestContainer from '../containers/current-pull-request-container';
 import IssueishDetailItem from '../items/issueish-detail-item';
+import ReviewsItem from '../items/reviews-item';
 import {addEvent} from '../reporter-proxy';
 
 export default class IssueishSearchesController extends React.Component {
@@ -68,6 +69,7 @@ export default class IssueishSearchesController extends React.Component {
           workspace={this.props.workspace}
           workingDirectory={this.props.workingDirectory}
           onOpenIssueish={this.onOpenIssueish}
+          onOpenReviews={this.onOpenReviews}
           onCreatePr={this.props.onCreatePr}
         />
         {this.state.searches.map(search => (
@@ -81,12 +83,26 @@ export default class IssueishSearchesController extends React.Component {
 
             onOpenIssueish={this.onOpenIssueish}
             onOpenSearch={this.onOpenSearch}
+            onOpenReviews={this.onOpenReviews}
           />
         ))}
       </div>
     );
   }
 
+  onOpenReviews = issueish => {
+    const uri = ReviewsItem.buildURI({
+      host: this.props.endpoint.getHost(),
+      owner: this.props.remote.getOwner(),
+      repo: this.props.remote.getRepo(),
+      number: issueish.getNumber(),
+      workdir: this.props.workingDirectory,
+    });
+    return this.props.workspace.open(uri).then(() => {
+      addEvent('open-reviews-tab', {package: 'github', from: this.constructor.name});
+    });
+  }
+
   onOpenIssueish = issueish => {
     return this.props.workspace.open(
       IssueishDetailItem.buildURI({

lib/controllers/issueish-searches-controller.js

@@ -45,7 +45,9 @@ export default class ChangedFileItem extends React.Component {
 
     this.refEditor = new RefHolder();
     this.refEditor.observe(editor => {
-      this.emitter.emit('did-change-embedded-text-editor', editor);
+      if (editor.isAlive()) {
+        this.emitter.emit('did-change-embedded-text-editor', editor);
+      }
     });
   }
 
@@ -94,7 +96,7 @@ export default class ChangedFileItem extends React.Component {
   }
 
   observeEmbeddedTextEditor(cb) {
-    this.refEditor.map(editor => cb(editor));
+    this.refEditor.map(editor => editor.isAlive() && cb(editor));
     return this.emitter.on('did-change-embedded-text-editor', cb);
   }
 

lib/items/__generated__/userMentionTooltipItemQuery.graphql.js

@@ -30,7 +30,9 @@ export default class CommitDetailItem extends React.Component {
 
     this.refEditor = new RefHolder();
     this.refEditor.observe(editor => {
-      this.emitter.emit('did-change-embedded-text-editor', editor);
+      if (editor.isAlive()) {
+        this.emitter.emit('did-change-embedded-text-editor', editor);
+      }
     });
   }
 
@@ -81,7 +83,7 @@ export default class CommitDetailItem extends React.Component {
   }
 
   observeEmbeddedTextEditor(cb) {
-    this.refEditor.map(editor => cb(editor));
+    this.refEditor.map(editor => editor.isAlive() && cb(editor));
     return this.emitter.on('did-change-embedded-text-editor', cb);
   }
 

lib/items/changed-file-item.js

@@ -32,7 +32,9 @@ export default class CommitPreviewItem extends React.Component {
 
     this.refEditor = new RefHolder();
     this.refEditor.observe(editor => {
-      this.emitter.emit('did-change-embedded-text-editor', editor);
+      if (editor.isAlive()) {
+        this.emitter.emit('did-change-embedded-text-editor', editor);
+      }
     });
   }
 
@@ -83,7 +85,7 @@ export default class CommitPreviewItem extends React.Component {
   }
 
   observeEmbeddedTextEditor(cb) {
-    this.refEditor.map(editor => cb(editor));
+    this.refEditor.map(editor => editor.isAlive() && cb(editor));
     return this.emitter.on('did-change-embedded-text-editor', cb);
   }