Disable project selection dropdown when using active panel for project

mattlyons0 · mattlyons0 · commit 1622486763f7 · 2020-01-19T00:22:48.000-05:00
diff --git a/lib/containers/git-tab-container.js b/lib/containers/git-tab-container.js
@@ -25,6 +25,7 @@ const DEFAULT_REPO_DATA = {
 
 export default class GitTabContainer extends React.Component {
   static propTypes = {
+    config: PropTypes.object.isRequired,
     repository: PropTypes.object.isRequired,
   }
 
diff --git a/lib/containers/github-tab-container.js b/lib/containers/github-tab-container.js
@@ -17,6 +17,7 @@ export default class GitHubTabContainer extends React.Component {
     repository: PropTypes.object,
     loginModel: GithubLoginModelPropType.isRequired,
     rootHolder: RefHolderPropType.isRequired,
+    config: PropTypes.object.isRequired,
 
     changeWorkingDirectory: PropTypes.func.isRequired,
     onDidChangeWorkDirs: PropTypes.func.isRequired,
diff --git a/lib/containers/github-tab-header-container.js b/lib/containers/github-tab-header-container.js
@@ -11,6 +11,8 @@ import GithubTabHeaderController from '../controllers/github-tab-header-controll
 
 export default class GithubTabHeaderContainer extends React.Component {
   static propTypes = {
+    config: PropTypes.object.isRequired,
+
     // Connection
     loginModel: PropTypes.object.isRequired,
     endpoint: EndpointPropType.isRequired,
@@ -74,6 +76,7 @@ export default class GithubTabHeaderContainer extends React.Component {
 
     return (
       <GithubTabHeaderController
+        config={this.props.config}
         user={new Author(email, name, login, false, avatarUrl)}
 
         // Workspace
@@ -90,6 +93,7 @@ export default class GithubTabHeaderContainer extends React.Component {
   renderNoResult() {
     return (
       <GithubTabHeaderController
+        config={this.props.config}
         user={nullAuthor}
 
         // Workspace
diff --git a/lib/controllers/git-tab-header-controller.js b/lib/controllers/git-tab-header-controller.js
@@ -6,6 +6,7 @@ import GitTabHeaderView from '../views/git-tab-header-view';
 
 export default class GitTabHeaderController extends React.Component {
   static propTypes = {
+    config: PropTypes.object.isRequired,
     getCommitter: PropTypes.func.isRequired,
 
     // Workspace
@@ -21,7 +22,11 @@ export default class GitTabHeaderController extends React.Component {
   constructor(props) {
     super(props);
     this._isMounted = false;
-    this.state = {currentWorkDirs: [], committer: nullAuthor};
+    this.state = {
+      currentWorkDirs: [],
+      committer: nullAuthor,
+      disableProjectSelection: this.props.config.get('github.useProjectFromActivePanel'),
+    };
     this.disposable = new CompositeDisposable();
   }
 
@@ -33,8 +38,11 @@ export default class GitTabHeaderController extends React.Component {
 
   componentDidMount() {
     this._isMounted = true;
-    this.disposable.add(this.props.onDidChangeWorkDirs(this.resetWorkDirs));
-    this.disposable.add(this.props.onDidUpdateRepo(this.updateCommitter));
+    this.disposable.add(
+      this.props.onDidChangeWorkDirs(this.resetWorkDirs),
+      this.props.onDidUpdateRepo(this.updateCommitter),
+      this.props.config.onDidChange('github.useProjectFromActivePanel', this.handleUseProjectFromActivePanelChange),
+    );
     this.updateCommitter();
   }
 
@@ -45,8 +53,11 @@ export default class GitTabHeaderController extends React.Component {
     ) {
       this.disposable.dispose();
       this.disposable = new CompositeDisposable();
-      this.disposable.add(this.props.onDidChangeWorkDirs(this.resetWorkDirs));
-      this.disposable.add(this.props.onDidUpdateRepo(this.updateCommitter));
+      this.disposable.add(
+        this.props.onDidChangeWorkDirs(this.resetWorkDirs),
+        this.props.onDidUpdateRepo(this.updateCommitter),
+        this.props.config.onDidChange('github.useProjectFromActivePanel', this.handleUseProjectFromActivePanelChange),
+      );
     }
     if (prevProps.getCommitter !== this.props.getCommitter) {
       this.updateCommitter();
@@ -56,6 +67,7 @@ export default class GitTabHeaderController extends React.Component {
   render() {
     return (
       <GitTabHeaderView
+        disableProjectSelection={this.state.disableProjectSelection}
         committer={this.state.committer}
 
         // Workspace
@@ -74,6 +86,10 @@ export default class GitTabHeaderController extends React.Component {
     }));
   }
 
+  handleUseProjectFromActivePanelChange = ({newValue}) => {
+    this.setState({disableProjectSelection: newValue});
+  }
+
   updateCommitter = async () => {
     const committer = await this.props.getCommitter() || nullAuthor;
     if (this._isMounted) {
diff --git a/lib/controllers/github-tab-controller.js b/lib/controllers/github-tab-controller.js
@@ -12,6 +12,7 @@ export default class GitHubTabController extends React.Component {
     refresher: RefresherPropType.isRequired,
     loginModel: GithubLoginModelPropType.isRequired,
     rootHolder: RefHolderPropType.isRequired,
+    config: PropTypes.object.isRequired,
 
     workingDirectory: PropTypes.string,
     repository: PropTypes.object.isRequired,
@@ -52,6 +53,7 @@ export default class GitHubTabController extends React.Component {
         workspace={this.props.workspace}
         refresher={this.props.refresher}
         rootHolder={this.props.rootHolder}
+        config={this.props.config}
 
         workingDirectory={this.props.workingDirectory || this.props.currentWorkDir}
         repository={this.props.repository}
diff --git a/lib/controllers/github-tab-header-controller.js b/lib/controllers/github-tab-header-controller.js
@@ -1,10 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {AuthorPropType} from '../prop-types';
+import {CompositeDisposable} from 'atom';
 import GithubTabHeaderView from '../views/github-tab-header-view';
 
 export default class GithubTabHeaderController extends React.Component {
   static propTypes = {
+    config: PropTypes.object.isRequired,
     user: AuthorPropType.isRequired,
 
     // Workspace
@@ -18,7 +20,11 @@ export default class GithubTabHeaderController extends React.Component {
 
   constructor(props) {
     super(props);
-    this.state = {currentWorkDirs: []};
+    this.state = {
+      currentWorkDirs: [],
+      disableProjectSelection: this.props.config.get('github.useProjectFromActivePanel'),
+    };
+    this.disposable = new CompositeDisposable();
   }
 
   static getDerivedStateFromProps(props, state) {
@@ -28,21 +34,27 @@ export default class GithubTabHeaderController extends React.Component {
   }
 
   componentDidMount() {
-    this.disposable = this.props.onDidChangeWorkDirs(this.resetWorkDirs);
+    this.disposable.add(
+      this.props.onDidChangeWorkDirs(this.resetWorkDirs),
+      this.props.config.onDidChange('github.useProjectFromActivePanel', this.handleUseProjectFromActivePanelChange),
+    );
   }
 
   componentDidUpdate(prevProps) {
     if (prevProps.onDidChangeWorkDirs !== this.props.onDidChangeWorkDirs) {
-      if (this.disposable) {
-        this.disposable.dispose();
-      }
-      this.disposable = this.props.onDidChangeWorkDirs(this.resetWorkDirs);
+      this.disposable.dispose();
+      this.disposeable = new CompositeDisposable();
+      this.disposable.add(
+        this.props.onDidChangeWorkDirs(this.resetWorkDirs),
+        this.props.config.onDidChange('github.useProjectFromActivePanel', this.handleUseProjectFromActivePanelChange),
+      );
     }
   }
 
   render() {
     return (
       <GithubTabHeaderView
+        disableProjectSelection={this.state.disableProjectSelection}
         user={this.props.user}
 
         // Workspace
@@ -55,6 +67,10 @@ export default class GithubTabHeaderController extends React.Component {
     );
   }
 
+  handleUseProjectFromActivePanelChange = ({newValue}) => {
+    this.setState({disableProjectSelection: newValue});
+  }
+
   resetWorkDirs = () => {
     this.setState((state, props) => ({
       currentWorkDirs: [],
diff --git a/lib/controllers/root-controller.js b/lib/controllers/root-controller.js
@@ -308,6 +308,7 @@ export default class RootController extends React.Component {
               repository={this.props.repository}
               loginModel={this.props.loginModel}
               workspace={this.props.workspace}
+              config={this.props.config}
               currentWorkDir={this.props.currentWorkDir}
               getCurrentWorkDirs={getCurrentWorkDirs}
               onDidChangeWorkDirs={onDidChangeWorkDirs}
diff --git a/lib/github-package.js b/lib/github-package.js
@@ -183,7 +183,8 @@ export default class GithubPackage {
     };
 
     const handleActivePaneChange = item => {
-      if (!this.projectFromActivePanel || !item || !this.workspace.isTextEditor(item) || !item.getBuffer() || !item.getBuffer().getPath()) {
+      if (!this.projectFromActivePanel || !item || !this.workspace.isTextEditor(item)
+        || !item.getBuffer() || !item.getBuffer().getPath()) {
         return;
       }
 
diff --git a/lib/items/git-tab-item.js b/lib/items/git-tab-item.js
@@ -6,6 +6,7 @@ import GitTabContainer from '../containers/git-tab-container';
 
 export default class GitTabItem extends React.Component {
   static propTypes = {
+    config: PropTypes.object.isRequired,
     repository: PropTypes.object.isRequired,
   }
 
diff --git a/lib/items/github-tab-item.js b/lib/items/github-tab-item.js
@@ -10,6 +10,7 @@ export default class GitHubTabItem extends React.Component {
     workspace: PropTypes.object.isRequired,
     repository: PropTypes.object,
     loginModel: GithubLoginModelPropType.isRequired,
+    config: PropTypes.object.isRequired,
 
     documentActiveElement: PropTypes.func,
 
diff --git a/lib/views/git-tab-header-view.js b/lib/views/git-tab-header-view.js
@@ -5,6 +5,7 @@ import {AuthorPropType} from '../prop-types';
 
 export default class GitTabHeaderView extends React.Component {
   static propTypes = {
+    disableProjectSelection: PropTypes.bool,
     committer: AuthorPropType.isRequired,
 
     // Workspace
@@ -21,7 +22,8 @@ export default class GitTabHeaderView extends React.Component {
         {this.renderCommitter()}
         <select className="github-Project-path input-select"
           value={this.props.workdir ? path.normalize(this.props.workdir) : undefined}
-          onChange={this.props.handleWorkDirSelect ? this.props.handleWorkDirSelect : () => {}}>
+          onChange={this.props.handleWorkDirSelect ? this.props.handleWorkDirSelect : () => {}}
+          disabled={this.props.disableProjectSelection}>
           {this.renderWorkDirs()}
         </select>
       </header>
diff --git a/lib/views/git-tab-view.js b/lib/views/git-tab-view.js
@@ -121,6 +121,7 @@ export default class GitTabView extends React.Component {
     const {repository} = this.props;
     return (
       <GitTabHeaderController
+        config={this.props.config}
         getCommitter={repository.getCommitter.bind(repository)}
 
         // Workspace
diff --git a/lib/views/github-tab-header-view.js b/lib/views/github-tab-header-view.js
@@ -5,6 +5,7 @@ import {AuthorPropType} from '../prop-types';
 
 export default class GithubTabHeaderView extends React.Component {
   static propTypes = {
+    disableProjectSelection: PropTypes.bool,
     user: AuthorPropType.isRequired,
 
     // Workspace
@@ -21,7 +22,8 @@ export default class GithubTabHeaderView extends React.Component {
         {this.renderUser()}
         <select className="github-Project-path input-select"
           value={this.props.workdir ? path.normalize(this.props.workdir) : undefined}
-          onChange={this.props.handleWorkDirSelect ? this.props.handleWorkDirSelect : () => {}}>
+          onChange={this.props.handleWorkDirSelect ? this.props.handleWorkDirSelect : () => {}}
+          disabled={this.props.disableProjectSelection}>
           {this.renderWorkDirs()}
         </select>
       </header>
diff --git a/lib/views/github-tab-view.js b/lib/views/github-tab-view.js
@@ -19,6 +19,7 @@ export default class GitHubTabView extends React.Component {
   static propTypes = {
     refresher: RefresherPropType.isRequired,
     rootHolder: RefHolderPropType.isRequired,
+    config: PropTypes.object.isRequired,
 
     // Connection
     loginModel: GithubLoginModelPropType.isRequired,
@@ -40,7 +41,7 @@ export default class GitHubTabView extends React.Component {
     aheadCount: PropTypes.number,
     pushInProgress: PropTypes.bool.isRequired,
 
-    // Event Handelrs
+    // Event Handlers
     handleWorkDirSelect: PropTypes.func,
     handlePushBranch: PropTypes.func.isRequired,
     handleRemoteSelect: PropTypes.func.isRequired,
@@ -131,6 +132,8 @@ export default class GitHubTabView extends React.Component {
     if (this.props.currentRemote.isPresent()) {
       return (
         <GithubTabHeaderContainer
+          config={this.props.config}
+
           // Connection
           loginModel={this.props.loginModel}
           endpoint={this.props.currentRemote.getEndpoint()}
@@ -147,6 +150,7 @@ export default class GitHubTabView extends React.Component {
     }
     return (
       <GithubTabHeaderController
+        config={this.props.config}
         user={nullAuthor}
 
         // Workspace
diff --git a/styles/tabs.less b/styles/tabs.less
@@ -57,3 +57,7 @@
     }
   }
 }
+
+.input-select:disabled {
+  color: @text-color-subtle;
+}
diff --git a/test/containers/github-tab-container.test.js b/test/containers/github-tab-container.test.js
@@ -37,9 +37,10 @@ describe('GitHubTabContainer', function() {
         repository={repository}
         loginModel={new GithubLoginModel(InMemoryStrategy)}
         rootHolder={new RefHolder()}
+        config={atomEnv.config}
 
         changeWorkingDirectory={() => {}}
-        onDidChangeWorkDirs={() => {}}
+        onDidChangeWorkDirs={() => { return {dispose: () => {}}; }}
         getCurrentWorkDirs={() => []}
         openCreateDialog={() => {}}
         openPublishDialog={() => {}}
diff --git a/test/containers/github-tab-header-container.test.js b/test/containers/github-tab-header-container.test.js
@@ -25,6 +25,7 @@ describe('GithubTabHeaderContainer', function() {
   function buildApp(overrideProps = {}) {
     return (
       <GithubTabHeaderContainer
+        config={atomEnv.config}
         loginModel={model}
         endpoint={getEndpoint('github.com')}
         getCurrentWorkDirs={() => null}
diff --git a/test/controllers/git-tab-header-controller.test.js b/test/controllers/git-tab-header-controller.test.js
@@ -13,7 +13,10 @@ describe('GitTabHeaderController', function() {
   }
 
   function buildApp(overrides) {
+    const atomEnv = global.buildAtomEnvironment();
+
     const props = {
+      config: atomEnv.config,
       getCommitter: () => nullAuthor,
       getCurrentWorkDirs: () => createWorkdirs([]),
       onDidUpdateRepo: () => new Disposable(),
@@ -117,4 +120,35 @@ describe('GitTabHeaderController', function() {
     wrapper.unmount();
     assert.strictEqual(wrapper.children().length, 0);
   });
+
+  describe('disableProjectSelection', function() {
+    const configKey = 'github.useProjectFromActivePanel';
+
+    it('initializes from config when true', function() {
+      const atomEnv = global.buildAtomEnvironment();
+      atomEnv.config.set(configKey, true);
+      const wrapper = shallow(buildApp({config: atomEnv.config}));
+      assert.strictEqual(wrapper.state('disableProjectSelection'), true);
+    });
+
+    it('initializes from config when false', function() {
+      const atomEnv = global.buildAtomEnvironment();
+      atomEnv.config.set(configKey, false);
+      const wrapper = shallow(buildApp({config: atomEnv.config}));
+      assert.strictEqual(wrapper.state('disableProjectSelection'), false);
+    });
+
+    it('updates state when config changes', function() {
+      const atomEnv = global.buildAtomEnvironment();
+      atomEnv.config.set(configKey, true);
+      const wrapper = shallow(buildApp({config: atomEnv.config}));
+      assert.strictEqual(wrapper.state('disableProjectSelection'), true);
+
+      atomEnv.config.set(configKey, false);
+      assert.strictEqual(wrapper.state('disableProjectSelection'), false);
+
+      atomEnv.config.set(configKey, true);
+      assert.strictEqual(wrapper.state('disableProjectSelection'), true);
+    });
+  });
 });
diff --git a/test/controllers/github-tab-controller.test.js b/test/controllers/github-tab-controller.test.js
@@ -35,6 +35,7 @@ describe('GitHubTabController', function() {
         refresher={new Refresher()}
         loginModel={new GithubLoginModel(InMemoryStrategy)}
         rootHolder={new RefHolder()}
+        config={atomEnv.config}
 
         workingDirectory={repo.getWorkingDirectoryPath()}
         repository={repo}
diff --git a/test/controllers/github-tab-header-controller.test.js b/test/controllers/github-tab-header-controller.test.js
diff --git a/test/items/github-tab-item.test.js b/test/items/github-tab-item.test.js
diff --git a/test/views/git-tab-header-view.test.js b/test/views/git-tab-header-view.test.js
diff --git a/test/views/github-tab-header-view.test.js b/test/views/github-tab-header-view.test.js
diff --git a/test/views/github-tab-view.test.js b/test/views/github-tab-view.test.js

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ const DEFAULT_REPO_DATA = {`
`25`	`25`
`26`	`26`	`export default class GitTabContainer extends React.Component {`
`27`	`27`	`static propTypes = {`
	`28`	`+ config: PropTypes.object.isRequired,`
`28`	`29`	`repository: PropTypes.object.isRequired,`
`29`	`30`	`}`
`30`	`31`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,8 @@ export default class GithubPackage {`
`183`	`183`	`};`
`184`	`184`
`185`	`185`	`const handleActivePaneChange = item => {`
`186`		`- if (!this.projectFromActivePanel \|\| !item \|\| !this.workspace.isTextEditor(item) \|\| !item.getBuffer() \|\| !item.getBuffer().getPath()) {`
	`186`	`+ if (!this.projectFromActivePanel \|\| !item \|\| !this.workspace.isTextEditor(item)`
	`187`	`+ \|\| !item.getBuffer() \|\| !item.getBuffer().getPath()) {`
`187`	`188`	`return;`
`188`	`189`	`}`
`189`	`190`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import GitTabContainer from '../containers/git-tab-container';`
`6`	`6`
`7`	`7`	`export default class GitTabItem extends React.Component {`
`8`	`8`	`static propTypes = {`
	`9`	`+ config: PropTypes.object.isRequired,`
`9`	`10`	`repository: PropTypes.object.isRequired,`
`10`	`11`	`}`
`11`	`12`