Project Management

lib/containers/github-tab-container.js

@@ -70,8 +70,18 @@ export default class GitHubTabContainer extends React.Component {
     }
 
     if (!this.props.repository.isPresent()) {
-      // TODO include a better message here.
-      return null;
+      return (
+        <GitHubTabController
+          {...this.props}
+          remoteOperationObserver={this.state.remoteOperationObserver}
+
+          allRemotes={new RemoteSet()}
+          branches={new BranchSet()}
+          aheadCount={0}
+          pushInProgress={false}
+          isLoading={false}
+        />
+      );
     }
 
     return (

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

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

lib/controllers/git-tab-controller.js

@@ -33,6 +33,7 @@ export default class GitTabController extends React.Component {
     workingDirectoryPath: PropTypes.string,
     mergeMessage: PropTypes.string,
     fetchInProgress: PropTypes.bool.isRequired,
+    currentWorkDir: PropTypes.string,
 
     workspace: PropTypes.object.isRequired,
     commands: PropTypes.object.isRequired,
@@ -52,6 +53,8 @@ export default class GitTabController extends React.Component {
     openInitializeDialog: PropTypes.func.isRequired,
     controllerRef: RefHolderPropType,
     changeWorkingDirectory: PropTypes.func.isRequired,
+    onDidChangeWorkDirs: PropTypes.func.isRequired,
+    getCurrentWorkDirs: PropTypes.func.isRequired,
   };
 
   constructor(props, context) {
@@ -100,7 +103,7 @@ export default class GitTabController extends React.Component {
         unstagedChanges={this.props.unstagedChanges}
         stagedChanges={this.props.stagedChanges}
         mergeConflicts={this.props.mergeConflicts}
-        workingDirectoryPath={this.props.workingDirectoryPath}
+        workingDirectoryPath={this.props.workingDirectoryPath || this.props.currentWorkDir}
         mergeMessage={this.props.mergeMessage}
         userStore={this.userStore}
         selectedCoAuthors={this.state.selectedCoAuthors}
@@ -121,6 +124,8 @@ export default class GitTabController extends React.Component {
         discardWorkDirChangesForPaths={this.props.discardWorkDirChangesForPaths}
         undoLastDiscard={this.props.undoLastDiscard}
         changeWorkingDirectory={this.props.changeWorkingDirectory}
+        getCurrentWorkDirs={this.props.getCurrentWorkDirs}
+        onDidChangeWorkDirs={this.props.onDidChangeWorkDirs}
 
         attemptFileStageOperation={this.attemptFileStageOperation}
         attemptStageAllOperation={this.attemptStageAllOperation}

lib/controllers/github-tab-controller.js

@@ -8,7 +8,6 @@ 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,
@@ -22,8 +21,11 @@ export default class GitHubTabController extends React.Component {
     aheadCount: PropTypes.number,
     pushInProgress: PropTypes.bool.isRequired,
     isLoading: PropTypes.bool.isRequired,
+    currentWorkDir: PropTypes.string,
 
     changeWorkingDirectory: PropTypes.func.isRequired,
+    onDidChangeWorkDirs: PropTypes.func.isRequired,
+    getCurrentWorkDirs: PropTypes.func.isRequired,
   }
 
   render() {
@@ -40,13 +42,12 @@ export default class GitHubTabController extends React.Component {
 
     return (
       <GitHubTabView
-        project={this.props.project}
         workspace={this.props.workspace}
         remoteOperationObserver={this.props.remoteOperationObserver}
         loginModel={this.props.loginModel}
         rootHolder={this.props.rootHolder}
 
-        workingDirectory={this.props.workingDirectory}
+        workingDirectory={this.props.workingDirectory || this.props.currentWorkDir}
         branches={this.props.branches}
         currentBranch={currentBranch}
         remotes={gitHubRemotes}
@@ -59,6 +60,8 @@ export default class GitHubTabController extends React.Component {
         handlePushBranch={this.handlePushBranch}
         handleRemoteSelect={this.handleRemoteSelect}
         changeWorkingDirectory={this.props.changeWorkingDirectory}
+        getCurrentWorkDirs={this.props.getCurrentWorkDirs}
+        onDidChangeWorkDirs={this.props.onDidChangeWorkDirs}
       />
     );
   }

lib/controllers/root-controller.js

@@ -60,6 +60,8 @@ export default class RootController extends React.Component {
     switchboard: PropTypes.instanceOf(Switchboard),
     pipelineManager: PropTypes.object,
 
+    currentWorkDir: PropTypes.string,
+
     // Git actions
     initialize: PropTypes.func.isRequired,
     clone: PropTypes.func.isRequired,
@@ -259,6 +261,10 @@ export default class RootController extends React.Component {
   }
 
   renderPaneItems() {
+    const {workdirContextPool} = this.props;
+    const getCurrentWorkDirs = workdirContextPool.getCurrentWorkDirs.bind(workdirContextPool);
+    const onDidChangeWorkDirs = workdirContextPool.onDidChangePoolContexts.bind(workdirContextPool);
+
     return (
       <Fragment>
         <PaneItem
@@ -285,6 +291,9 @@ export default class RootController extends React.Component {
               discardWorkDirChangesForPaths={this.discardWorkDirChangesForPaths}
               undoLastDiscard={this.undoLastDiscard}
               refreshResolutionProgress={this.refreshResolutionProgress}
+              currentWorkDir={this.props.currentWorkDir}
+              getCurrentWorkDirs={getCurrentWorkDirs}
+              onDidChangeWorkDirs={onDidChangeWorkDirs}
               changeWorkingDirectory={this.props.changeWorkingDirectory}
             />
           )}
@@ -298,8 +307,10 @@ export default class RootController extends React.Component {
               ref={itemHolder.setter}
               repository={this.props.repository}
               loginModel={this.props.loginModel}
-              project={this.props.project}
               workspace={this.props.workspace}
+              currentWorkDir={this.props.currentWorkDir}
+              getCurrentWorkDirs={getCurrentWorkDirs}
+              onDidChangeWorkDirs={onDidChangeWorkDirs}
               changeWorkingDirectory={this.props.changeWorkingDirectory}
             />
           )}

lib/github-package.js

@@ -303,6 +303,7 @@ export default class GithubPackage {
         startOpen={this.startOpen}
         startRevealed={this.startRevealed}
         removeFilePatchItem={this.removeFilePatchItem}
+        currentWorkDir={this.getActiveWorkdir()}
         changeWorkingDirectory={changeWorkingDirectory}
       />, this.element, callback,
     );
@@ -550,7 +551,7 @@ export default class GithubPackage {
     }
 
     // It is only possible to reach here if there there was no preferred directory, there are no project paths and the
-    // the active context's repository is undetermined.
+    // the active context's repository is not undetermined.
     return this.activeContext;
   }
 

lib/models/workdir-context-pool.js

@@ -1,6 +1,6 @@
 import compareSets from 'compare-sets';
 
-import {Emitter, CompositeDisposable} from 'event-kit';
+import {Emitter} from 'event-kit';
 import WorkdirContext from './workdir-context';
 
 /**
@@ -46,7 +46,7 @@ export default class WorkdirContextPool {
     return filtered.length === 1 ? filtered[0] : WorkdirContext.absent({...this.options});
   }
 
-  add(directory, options = {}) {
+  add(directory, options = {}, silenceEmitter = false) {
     if (this.contexts.has(directory)) {
       return this.getContext(directory);
     }
@@ -67,20 +67,32 @@ export default class WorkdirContextPool {
     forwardEvent('onDidUpdateRepository', 'did-update-repository');
     forwardEvent('onDidDestroyRepository', 'did-destroy-repository');
 
+    if (!silenceEmitter) {
+      this.emitter.emit('did-change-contexts', {added: new Set([directory])});
+    }
+
     return context;
   }
 
-  replace(directory, options = {}) {
-    this.remove(directory);
-    this.add(directory, options);
+  replace(directory, options = {}, silenceEmitter = false) {
+    this.remove(directory, true);
+    this.add(directory, options, true);
+
+    if (!silenceEmitter) {
+      this.emitter.emit('did-change-contexts', {altered: new Set([directory])});
+    }
   }
 
-  remove(directory) {
+  remove(directory, silenceEmitter = false) {
     const existing = this.contexts.get(directory);
     this.contexts.delete(directory);
 
     if (existing) {
       existing.destroy();
+
+      if (!silenceEmitter) {
+        this.emitter.emit('did-change-contexts', {removed: new Set([directory])});
+      }
     }
   }
 
@@ -89,13 +101,21 @@ export default class WorkdirContextPool {
     const {added, removed} = compareSets(previous, directories);
 
     for (const directory of added) {
-      this.add(directory, options);
+      this.add(directory, options, true);
     }
     for (const directory of removed) {
-      this.remove(directory);
+      this.remove(directory, true);
+    }
+
+    if (added.size !== 0 || removed.size !== 0) {
+      this.emitter.emit('did-change-contexts', {added, removed});
     }
   }
 
+  getCurrentWorkDirs() {
+    return this.contexts.keys();
+  }
+
   withResidentContexts(callback) {
     const results = [];
     for (const [workdir, context] of this.contexts) {
@@ -108,6 +128,10 @@ export default class WorkdirContextPool {
     return this.emitter.on('did-start-observer', callback);
   }
 
+  onDidChangePoolContexts(callback) {
+    return this.emitter.on('did-change-contexts', callback);
+  }
+
   onDidChangeWorkdirOrHead(callback) {
     return this.emitter.on('did-change-workdir-or-head', callback);
   }
@@ -125,7 +149,17 @@ export default class WorkdirContextPool {
   }
 
   clear() {
-    this.withResidentContexts(workdir => this.remove(workdir));
+    const workdirs = new Set();
+
+    this.withResidentContexts(workdir => {
+      this.remove(workdir, true);
+      workdirs.add(workdir);
+    });
+
     WorkdirContext.destroyAbsent();
+
+    if (workdirs.size !== 0) {
+      this.emitter.emit('did-change-contexts', {removed: workdirs});
+    }
   }
 }

lib/views/git-tab-view.js

@@ -62,6 +62,8 @@ export default class GitTabView extends React.Component {
     discardWorkDirChangesForPaths: PropTypes.func.isRequired,
     openFiles: PropTypes.func.isRequired,
     changeWorkingDirectory: PropTypes.func.isRequired,
+    onDidChangeWorkDirs: PropTypes.func.isRequired,
+    getCurrentWorkDirs: PropTypes.func.isRequired,
   };
 
   constructor(props, context) {
@@ -118,9 +120,10 @@ export default class GitTabView extends React.Component {
   renderHeader() {
     return (
       <TabHeaderView
-        handleProjectSelect={e => this.props.changeWorkingDirectory(e.target.value)}
-        currentProject={this.props.workingDirectoryPath}
-        projectPaths={this.props.project.getPaths()}
+        handleWorkDirSelect={e => this.props.changeWorkingDirectory(e.target.value)}
+        currentWorkDir={this.props.workingDirectoryPath}
+        getCurrentWorkDirs={this.props.getCurrentWorkDirs}
+        onDidChangeWorkDirs={this.props.onDidChangeWorkDirs}
       />
     );
   }

lib/views/github-tab-view.js

@@ -12,7 +12,6 @@ import RemoteContainer from '../containers/remote-container';
 
 export default class GitHubTabView extends React.Component {
   static propTypes = {
-    project: PropTypes.object.isRequired,
     workspace: PropTypes.object.isRequired,
     remoteOperationObserver: OperationStateObserverPropType.isRequired,
     loginModel: GithubLoginModelPropType.isRequired,
@@ -31,6 +30,8 @@ export default class GitHubTabView extends React.Component {
     handlePushBranch: PropTypes.func.isRequired,
     handleRemoteSelect: PropTypes.func.isRequired,
     changeWorkingDirectory: PropTypes.func.isRequired,
+    onDidChangeWorkDirs: PropTypes.func.isRequired,
+    getCurrentWorkDirs: PropTypes.func.isRequired,
   }
 
   render() {
@@ -97,9 +98,10 @@ export default class GitHubTabView extends React.Component {
   renderHeader() {
     return (
       <TabHeaderView
-        handleProjectSelect={e => this.props.changeWorkingDirectory(e.target.value)}
-        currentProject={this.props.workingDirectory}
-        projectPaths={this.props.project.getPaths()}
+        handleWorkDirSelect={e => this.props.changeWorkingDirectory(e.target.value)}
+        currentWorkDir={this.props.workingDirectory}
+        getCurrentWorkDirs={this.props.getCurrentWorkDirs}
+        onDidChangeWorkDirs={this.props.onDidChangeWorkDirs}
       />
     );
   }