Merge 245bc05 into cc13510

atom · Nov 21, 2018 · 871caf2 · 871caf2
2 parents cc13510 + 245bc05
commit 871caf2
Show file tree

Hide file tree

Showing 12 changed files with 2,417 additions and 523 deletions.
diff --git a/lib/containers/__generated__/issueishDetailContainerQuery.graphql.js b/lib/containers/__generated__/issueishDetailContainerQuery.graphql.js
diff --git a/lib/controllers/__generated__/issueishDetailController_repository.graphql.js b/lib/controllers/__generated__/issueishDetailController_repository.graphql.js
diff --git a/lib/controllers/issueish-detail-controller.js b/lib/controllers/issueish-detail-controller.js
@@ -5,7 +5,8 @@ import PropTypes from 'prop-types';
 import {BranchSetPropType, RemoteSetPropType} from '../prop-types';
 import {GitError} from '../git-shell-out-strategy';
 import EnableableOperation from '../models/enableable-operation';
-import IssueishDetailView, {checkoutStates} from '../views/issueish-detail-view';
+import PullRequestDetailView, {checkoutStates} from '../views/pr-detail-view';
+import IssueDetailView from '../views/issue-detail-view';
 import {incrementCounter} from '../reporter-proxy';
 
 export class BareIssueishDetailController extends React.Component {
@@ -78,15 +79,25 @@ export class BareIssueishDetailController extends React.Component {
     }
 
     this.checkoutOp = this.nextCheckoutOp();
-
-    return (
-      <IssueishDetailView
-        repository={repository}
-        issueish={repository.issueish}
-        checkoutOp={this.checkoutOp}
-        switchToIssueish={this.props.switchToIssueish}
-      />
-    );
+    const isPr = repository.issueish.__typename === 'PullRequest';
+    if (isPr) {
+      return (
+        <PullRequestDetailView
+          repository={repository}
+          issueish={repository.issueish}
+          checkoutOp={this.checkoutOp}
+          switchToIssueish={this.props.switchToIssueish}
+        />
+      );
+    } else {
+      return (
+        <IssueDetailView
+          repository={repository}
+          issueish={repository.issueish}
+          switchToIssueish={this.props.switchToIssueish}
+        />
+      );
+    }
   }
 
   nextCheckoutOp() {
@@ -213,7 +224,12 @@ export default createFragmentContainer(BareIssueishDetailController, {
       commitCount: {type: "Int!"},
       commitCursor: {type: "String"},
     ) {
-      ...issueishDetailView_repository
+      ...issueDetailView_repository
+      name
+      owner {
+        login
+      }
+      ...prDetailView_repository
       name
       owner {
         login
@@ -223,7 +239,7 @@ export default createFragmentContainer(BareIssueishDetailController, {
         ... on Issue {
           title
           number
-          ...issueishDetailView_issueish @arguments(
+          ...issueDetailView_issueish @arguments(
             timelineCount: $timelineCount,
             timelineCursor: $timelineCursor,
             commitCount: $commitCount,
@@ -242,7 +258,7 @@ export default createFragmentContainer(BareIssueishDetailController, {
             url
             sshUrl
           }
-          ...issueishDetailView_issueish @arguments(
+          ...prDetailView_issueish @arguments(
             timelineCount: $timelineCount,
             timelineCursor: $timelineCursor,
             commitCount: $commitCount,