use workdirs working prototype

Author: wadethestealth

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/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,8 +291,9 @@ export default class RootController extends React.Component {
               discardWorkDirChangesForPaths={this.discardWorkDirChangesForPaths}
               undoLastDiscard={this.undoLastDiscard}
               refreshResolutionProgress={this.refreshResolutionProgress}
-              getCurrentWorkDirs={this.props.workdirContextPool.getCurrentWorkDirs}
-              onDidChangeWorkDirs={this.props.workdirContextPool.onDidChangePoolContexts}
+              currentWorkDir={this.props.currentWorkDir}
+              getCurrentWorkDirs={getCurrentWorkDirs}
+              onDidChangeWorkDirs={onDidChangeWorkDirs}
               changeWorkingDirectory={this.props.changeWorkingDirectory}
             />
           )}
@@ -301,8 +308,9 @@ export default class RootController extends React.Component {
               repository={this.props.repository}
               loginModel={this.props.loginModel}
               workspace={this.props.workspace}
-              getCurrentWorkDirs={this.props.workdirContextPool.getCurrentWorkDirs}
-              onDidChangeWorkDirs={this.props.workdirContextPool.onDidChangePoolContexts}
+              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,
     );

lib/models/workdir-context-pool.js

@@ -113,7 +113,7 @@ export default class WorkdirContextPool {
   }
 
   getCurrentWorkDirs() {
-    return this.context.keys();
+    return this.contexts.keys();
   }
 
   withResidentContexts(callback) {

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,

lib/views/tab-header-view.js

@@ -13,15 +13,26 @@ export default class TabHeaderView extends React.Component {
 
   constructor(props) {
     super(props);
-    this.state = {currentWorkDirs: props.getCurrentWorkDirs()};
-    this.disposable = props.onDidChangeWorkDirs(this.updateWorkDirs);
+    this.state = {currentWorkDirs: []};
+  }
+
+  static getDerivedStateFromProps(props, state) {
+    return {
+      currentWorkDirs: props.getCurrentWorkDirs(),
+    };
+  }
+
+  componentDidMount() {
+    if (this.props.onDidChangeWorkDirs) {
+      this.disposable = this.props.onDidChangeWorkDirs(this.updateWorkDirs);
+    }
   }
 
   render() {
     return (
       <header className="github-Project">
         <select className="github-Project-path input-select"
-          value={this.props.currentWorkDir ? this.props.currentWorkDir : undefined}
+          value={this.props.currentWorkDir ? path.normalize(this.props.currentWorkDir) : undefined}
           onChange={this.props.handleWorkDirSelect ? this.props.handleWorkDirSelect : () => {}}>
           {this.renderWorkDirs()}
         </select>
@@ -32,7 +43,7 @@ export default class TabHeaderView extends React.Component {
   renderWorkDirs() {
     const workdirs = [];
     for (const workdir of this.state.currentWorkDirs) {
-      workdirs.push(<option key={workdir} value={workdir}>{path.basename(workdir)}</option>);
+      workdirs.push(<option key={workdir} value={path.normalize(workdir)}>{path.basename(workdir)}</option>);
     }
     return workdirs;
   }