WIP: Remote Management

docs/feature-requests/007-remote-management.md

@@ -0,0 +1,63 @@
+<!---
+For community contributors -- Please fill out Part 1 of the following template. This will help our team collaborate with you and give us an opportunity to provide valuable feedback that could inform your development process. Sections in Part 2 are not mandatory to get the conversation started, but will help our team understand your vision better and allow us to give better feedback.
+--->
+
+**_Part 1 - Required information_**
+
+# Remote Management
+
+## :memo: Summary
+
+This feature should allow users to manage git remotes within Atom.
+
+## :checkered_flag: Motivation
+
+For full support, the minimum features should be as follows.
+  - Be able to add or delete git remotes. (High Priority)
+  - Be able to choose a remote to view GitHub PR's from. (High Priority)
+
+This supports many use cases where people view, commit, pull, or push across multiple forks. It also supports viewing all pull request reviews where their are multiple remotes. Currently, it is only support to see PR's from one remote.
+
+The expected outcome is to move a lot of remote management from the terminal to Atom.
+
+## 🤯 Explanation
+
+Explain the proposal as if it was already implemented in the GitHub package and you were describing it to an Atom user. That generally means:
+
+- Introducing new named concepts.
+- Explaining the feature largely in terms of examples.
+- Explaining any changes to existing workflows.
+- Design mock-ups or diagrams depicting any new UI that will be introduced.
+
+
+**_Part 2 - Additional information_**
+
+## :anchor: Drawbacks
+
+Why should we *not* do this?
+
+## :thinking: Rationale and alternatives
+
+- Why is this approach the best in the space of possible approaches?
+- What other approaches have been considered and what is the rationale for not choosing them?
+- What is the impact of not doing this?
+
+## :question: Unresolved questions
+
+- What unresolved questions do you expect to resolve through the Feature Request process before this gets merged?
+- What unresolved questions do you expect to resolve through the implementation of this feature before it is released in a new version of the package?
+
+## :warning: Out of Scope
+
+- What related issues do you consider out of scope for this Feature Request that could be addressed in the future independently of the solution that comes out of this Feature Request?
+
+## :construction: Implementation phases
+
+- Can this functionality be introduced in multiple, distinct, self-contained pull requests?
+- A specification for when the feature is considered "done."
+
+## :white_check_mark: Feature description for Atom release blog post
+
+- When this feature is shipped, what would we like to say or show in our Atom release blog post (example: http://blog.atom.io/2018/07/31/atom-1-29.html)
+- Feel free to drop ideas and gifs here during development
+- Once development is complete, write a blurb for the release coordinator to copy/paste into the Atom release blog

lib/atom/marker.js

@@ -25,7 +25,7 @@ export const DecorableContext = React.createContext();
 class BareMarker extends React.Component {
   static propTypes = {
     ...markerProps,
-    id: PropTypes.string,
+    id: PropTypes.number,
     bufferRange: RangePropType,
     markableHolder: RefHolderPropType,
     children: PropTypes.node,

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

@@ -37,8 +37,6 @@ export default class CurrentPullRequestContainer extends React.Component {
     aheadCount: PropTypes.number,
     pushInProgress: PropTypes.bool.isRequired,
 
-    workspace: PropTypes.object.isRequired,
-
     // Actions
     onOpenIssueish: PropTypes.func.isRequired,
     onOpenReviews: PropTypes.func.isRequired,
@@ -164,7 +162,6 @@ export default class CurrentPullRequestContainer extends React.Component {
         total={associatedPullRequests.totalCount}
         results={associatedPullRequests.nodes}
         isLoading={false}
-        workspace={this.props.workspace}
         endpoint={this.props.endpoint}
         resultFilter={issueish => issueish.getHeadRepositoryID() === this.props.repository.id}
         {...this.controllerProps()}

lib/containers/github-header-container.js

@@ -0,0 +1,104 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {QueryRenderer, graphql} from 'react-relay';
+
+import {incrementCounter} from '../reporter-proxy';
+import {EndpointPropType, RemoteSetPropType} from '../prop-types';
+import RelayNetworkLayerManager from '../relay-network-layer-manager';
+import {UNAUTHENTICATED, INSUFFICIENT} from '../shared/keytar-strategy';
+import ObserveModel from '../views/observe-model';
+import QueryErrorView from '../views/query-error-view';
+import GithubHeaderView from '../views/github-header-view';
+
+export default class GithubHeaderContainer extends React.Component {
+  static propTypes = {
+    // Connection
+    loginModel: PropTypes.object.isRequired,
+    endpoint: EndpointPropType.isRequired,
+
+    avatarUrl: PropTypes.string,
+    remotes: RemoteSetPropType.isRequired,
+    currentRemoteName: PropTypes.string.isRequired,
+
+    handleRemoteSelect: PropTypes.func.isRequired,
+  }
+
+  fetchToken = loginModel => {
+    return loginModel.getToken(this.props.endpoint.getLoginAccount());
+  }
+
+  render() {
+    return (
+      <ObserveModel model={this.props.loginModel} fetchData={this.fetchToken}>
+        {this.renderWithToken}
+      </ObserveModel>
+    );
+  }
+
+  renderWithToken = token => {
+    if (token === null) {
+      return this.renderWithBlankAvatar();
+    }
+
+    if (token instanceof Error) {
+      return (
+        <QueryErrorView
+          error={token}
+          retry={this.handleTokenRetry}
+          login={this.handleLogin}
+          logout={this.handleLogout}
+        />
+      );
+    }
+
+    if (token === UNAUTHENTICATED || token === INSUFFICIENT) {
+      return this.renderWithBlankAvatar();
+    }
+
+    const environment = RelayNetworkLayerManager.getEnvironmentForHost(this.props.endpoint, token);
+    const query = graphql`
+          query githubHeaderContainerQuery {
+            viewer {
+              avatarUrl
+            }
+          }
+        `;
+
+    return (
+      <QueryRenderer
+        environment={environment}
+        variables={{}}
+        query={query}
+        render={result => this.renderWithResult(result, token)}
+      />
+    );
+  }
+
+  renderWithResult({error, props, retry}, token) {
+    const avatarUrl = !error && props !== null ? props.viewer.avatarUrl : null;
+
+    return (
+      <GithubHeaderView
+        avatarUrl={avatarUrl}
+        remotes={this.props.remotes}
+        currentRemoteName={this.props.currentRemoteName}
+
+        handleRemoteSelect={e => this.props.handleRemoteSelect(e, this.props.remotes.withName(e.target.value))}
+      />
+    );
+  }
+
+  renderWithBlankAvatar = () => this.renderWithResult({props: null});
+
+  handleLogin = token => {
+    incrementCounter('github-login');
+    this.props.loginModel.setToken(this.props.endpoint.getLoginAccount(), token);
+  }
+
+  handleLogout = () => {
+    incrementCounter('github-logout');
+    this.props.loginModel.removeToken(this.props.endpoint.getLoginAccount());
+  }
+
+  handleTokenRetry = () => this.props.loginModel.didUpdate();
+}

lib/controllers/editor-comment-decorations-controller.js

@@ -20,7 +20,10 @@ export default class EditorCommentDecorationsController extends React.Component
     workspace: PropTypes.object.isRequired,
     editor: PropTypes.object.isRequired,
     threadsForPath: PropTypes.arrayOf(PropTypes.shape({
-      rootCommentID: PropTypes.string.isRequired,
+      rootCommentID: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.number,
+      ]).isRequired,
       position: PropTypes.number,
       threadID: PropTypes.string.isRequired,
     })).isRequired,

lib/controllers/git-tab-controller.js

@@ -51,6 +51,7 @@ export default class GitTabController extends React.Component {
     openFiles: PropTypes.func.isRequired,
     openInitializeDialog: PropTypes.func.isRequired,
     controllerRef: RefHolderPropType,
+    changeProjectWorkingDirectory: PropTypes.func.isRequired,
   };
 
   constructor(props, context) {
@@ -119,6 +120,7 @@ export default class GitTabController extends React.Component {
         openFiles={this.props.openFiles}
         discardWorkDirChangesForPaths={this.props.discardWorkDirChangesForPaths}
         undoLastDiscard={this.props.undoLastDiscard}
+        changeProjectWorkingDirectory={this.props.changeProjectWorkingDirectory}
 
         attemptFileStageOperation={this.attemptFileStageOperation}
         attemptStageAllOperation={this.attemptStageAllOperation}

lib/controllers/github-tab-controller.js

@@ -8,6 +8,7 @@ import GitHubTabView from '../views/github-tab-view';
 
 export default class GitHubTabController extends React.Component {
   static propTypes = {
+    project: PropTypes.object.isRequired,
     workspace: PropTypes.object.isRequired,
     repository: PropTypes.object.isRequired,
     remoteOperationObserver: OperationStateObserverPropType.isRequired,
@@ -21,22 +22,25 @@ export default class GitHubTabController extends React.Component {
     aheadCount: PropTypes.number,
     pushInProgress: PropTypes.bool.isRequired,
     isLoading: PropTypes.bool.isRequired,
+
+    changeProjectWorkingDirectory: PropTypes.func.isRequired,
   }
 
   render() {
     const gitHubRemotes = this.props.allRemotes.filter(remote => remote.isGithubRepo());
     const currentBranch = this.props.branches.getHeadBranch();
 
     let currentRemote = gitHubRemotes.withName(this.props.selectedRemoteName);
-    let manyRemotesAvailable = false;
+    let isSelectingRemote = false;
     if (!currentRemote.isPresent() && gitHubRemotes.size() === 1) {
       currentRemote = Array.from(gitHubRemotes)[0];
     } else if (!currentRemote.isPresent() && gitHubRemotes.size() > 1) {
-      manyRemotesAvailable = true;
+      isSelectingRemote = true;
     }
 
     return (
       <GitHubTabView
+        project={this.props.project}
         workspace={this.props.workspace}
         remoteOperationObserver={this.props.remoteOperationObserver}
         loginModel={this.props.loginModel}
@@ -47,13 +51,14 @@ export default class GitHubTabController extends React.Component {
         currentBranch={currentBranch}
         remotes={gitHubRemotes}
         currentRemote={currentRemote}
-        manyRemotesAvailable={manyRemotesAvailable}
+        isSelectingRemote={isSelectingRemote}
         aheadCount={this.props.aheadCount}
         pushInProgress={this.props.pushInProgress}
         isLoading={this.props.isLoading}
 
         handlePushBranch={this.handlePushBranch}
         handleRemoteSelect={this.handleRemoteSelect}
+        changeProjectWorkingDirectory={this.props.changeProjectWorkingDirectory}
       />
     );
   }

lib/controllers/issueish-list-controller.js

@@ -56,7 +56,6 @@ export class BareIssueishListController extends React.Component {
     onOpenMore: PropTypes.func,
 
     emptyComponent: PropTypes.func,
-    workspace: PropTypes.object,
     endpoint: EndpointPropType,
     needReviewsButton: PropTypes.bool,
   };