use workdirs instead of project paths

wadethestealth · wadethestealth · commit ef802dc8672f · 2019-10-25T11:48:28.000-05:00
diff --git a/lib/controllers/root-controller.js b/lib/controllers/root-controller.js
@@ -285,6 +285,8 @@ 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}
               changeWorkingDirectory={this.props.changeWorkingDirectory}
             />
           )}
@@ -298,8 +300,9 @@ 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}
+              getCurrentWorkDirs={this.props.workdirContextPool.getCurrentWorkDirs}
+              onDidChangeWorkDirs={this.props.workdirContextPool.onDidChangePoolContexts}
               changeWorkingDirectory={this.props.changeWorkingDirectory}
             />
           )}
diff --git a/lib/models/workdir-context-pool.js b/lib/models/workdir-context-pool.js
@@ -112,6 +112,10 @@ export default class WorkdirContextPool {
     }
   }
 
+  getCurrentWorkDirs() {
+    return this.context.keys();
+  }
+
   withResidentContexts(callback) {
     const results = [];
     for (const [workdir, context] of this.contexts) {
diff --git a/lib/views/git-tab-view.js b/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}
       />
     );
   }
diff --git a/lib/views/github-tab-view.js b/lib/views/github-tab-view.js
@@ -31,6 +31,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 +99,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}
       />
     );
   }
diff --git a/lib/views/tab-header-view.js b/lib/views/tab-header-view.js
@@ -4,29 +4,48 @@ import path from 'path';
 
 export default class TabHeaderView extends React.Component {
   static propTypes = {
-    currentProject: PropTypes.string,
-    projectPaths: PropTypes.arrayOf(PropTypes.string),
+    currentWorkDir: PropTypes.string,
 
-    handleProjectSelect: PropTypes.func.isRequired,
+    handleWorkDirSelect: PropTypes.func,
+    onDidChangeWorkDirs: PropTypes.func,
+    getCurrentWorkDirs: PropTypes.func,
+  }
+
+  constructor(props) {
+    super(props);
+    this.state = {currentWorkDirs: props.getCurrentWorkDirs()};
+    this.disposable = props.onDidChangeWorkDirs(this.updateWorkDirs);
   }
 
   render() {
     return (
       <header className="github-Project">
         <select className="github-Project-path input-select"
-          value={this.props.currentProject ? this.props.currentProject : undefined}
-          onChange={this.props.handleProjectSelect}>
-          {this.renderProjects()}
+          value={this.props.currentWorkDir ? this.props.currentWorkDir : undefined}
+          onChange={this.props.handleWorkDirSelect ? this.props.handleWorkDirSelect : () => {}}>
+          {this.renderWorkDirs()}
         </select>
       </header>
     );
   }
 
-  renderProjects() {
-    const projects = [];
-    for (const projectPath of this.props.projectPaths) {
-      projects.push(<option key={projectPath} value={projectPath}>{path.basename(projectPath)}</option>);
+  renderWorkDirs() {
+    const workdirs = [];
+    for (const workdir of this.state.currentWorkDirs) {
+      workdirs.push(<option key={workdir} value={workdir}>{path.basename(workdir)}</option>);
+    }
+    return workdirs;
+  }
+
+  updateWorkDirs = () => {
+    this.setState((state, props) => ({
+      currentWorkDirs: props.getCurrentWorkDirs(),
+    }));
+  }
+
+  componentWillUnmount() {
+    if (this.disposable && this.disposable.dispose) {
+      this.disposable.dispose();
     }
-    return projects;
-  };
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,10 @@ export default class WorkdirContextPool {`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
	`115`	`+ getCurrentWorkDirs() {`
	`116`	`+ return this.context.keys();`
	`117`	`+ }`
	`118`	`+`
`115`	`119`	`withResidentContexts(callback) {`
`116`	`120`	`const results = [];`
`117`	`121`	`for (const [workdir, context] of this.contexts) {`