Merge pull request #2399 from atom/lock-context

Context locking

Author: smashwilson

img/unlock.svg

@@ -2,8 +2,32 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 
+/* eslint-disable max-len */
+const SVG = {
+  unlock: {
+    viewBox: '0 0 24 16',
+    element: (
+      <path
+        fillRule="evenodd"
+        d="m 13.4,13 h -1 v -1 h 1 z m 6,-7 h 1 c 0.55,0 1,0.45 1,1 v 7 c 0,0.55 -0.45,1 -1,1 h -10 c -0.55,0 -1,-0.45 -1,-1 V 7 c 0,-0.55 0.45,-1 1,-1 h 1 V 4.085901 C 11.4,2.1862908 9.8780193,2.4095693 8.904902,2.4143325 8.0404588,2.4185637 6.3689542,2.1882296 6.3689542,4.085901 V 7.4918301 L 4.2521568,7.4509801 4.2930068,4.045051 C 4.3176792,1.987953 5.080245,-0.02206145 8.792353,-0.03403364 13.536238,-0.0493335 13.21,3.1688541 13.21,4.085901 V 6 h -0.01 4.41 m 2.79,1 h -9 v 7 h 9 z m -7,1 h -1 v 1 h 1 z m 0,2 h -1 v 1 h 1 z"
+      />
+    ),
+  },
+};
+/* eslint-enable max-len */
+
 export default function Octicon({icon, ...others}) {
   const classes = cx('icon', `icon-${icon}`, others.className);
+
+  const svgContent = SVG[icon];
+  if (svgContent) {
+    return (
+      <svg {...others} viewBox={svgContent.viewBox} xmlns="http://www.w3.org/2000/svg" className={classes}>
+        {svgContent.element}
+      </svg>
+    );
+  }
+
   return <span {...others} className={classes} />;
 }
 

lib/atom/octicon.js

@@ -17,10 +17,12 @@ export default class GithubTabHeaderContainer extends React.Component {
 
     // Workspace
     currentWorkDir: PropTypes.string,
+    contextLocked: PropTypes.bool.isRequired,
+    changeWorkingDirectory: PropTypes.func.isRequired,
+    setContextLock: PropTypes.func.isRequired,
     getCurrentWorkDirs: PropTypes.func.isRequired,
 
     // Event Handlers
-    handleWorkDirSelect: PropTypes.func,
     onDidChangeWorkDirs: PropTypes.func,
   }
 
@@ -59,12 +61,12 @@ export default class GithubTabHeaderContainer extends React.Component {
         environment={environment}
         variables={{}}
         query={query}
-        render={result => this.renderWithResult(result, token)}
+        render={result => this.renderWithResult(result)}
       />
     );
   }
 
-  renderWithResult({error, props, retry}, token) {
+  renderWithResult({error, props}) {
     if (error || props === null) {
       return this.renderNoResult();
     }
@@ -78,10 +80,12 @@ export default class GithubTabHeaderContainer extends React.Component {
 
         // Workspace
         currentWorkDir={this.props.currentWorkDir}
+        contextLocked={this.props.contextLocked}
         getCurrentWorkDirs={this.props.getCurrentWorkDirs}
+        changeWorkingDirectory={this.props.changeWorkingDirectory}
+        setContextLock={this.props.setContextLock}
 
         // Event Handlers
-        handleWorkDirSelect={this.props.handleWorkDirSelect}
         onDidChangeWorkDirs={this.props.onDidChangeWorkDirs}
       />
     );
@@ -94,10 +98,12 @@ export default class GithubTabHeaderContainer extends React.Component {
 
         // Workspace
         currentWorkDir={this.props.currentWorkDir}
+        contextLocked={this.props.contextLocked}
+        changeWorkingDirectory={this.props.changeWorkingDirectory}
+        setContextLock={this.props.setContextLock}
         getCurrentWorkDirs={this.props.getCurrentWorkDirs}
 
         // Event Handlers
-        handleWorkDirSelect={this.props.handleWorkDirSelect}
         onDidChangeWorkDirs={this.props.onDidChangeWorkDirs}
       />
     );

lib/containers/github-tab-header-container.js

@@ -51,7 +51,9 @@ export default class GitTabController extends React.Component {
     openFiles: PropTypes.func.isRequired,
     openInitializeDialog: PropTypes.func.isRequired,
     controllerRef: RefHolderPropType,
+    contextLocked: PropTypes.bool.isRequired,
     changeWorkingDirectory: PropTypes.func.isRequired,
+    setContextLock: PropTypes.func.isRequired,
     onDidChangeWorkDirs: PropTypes.func.isRequired,
     getCurrentWorkDirs: PropTypes.func.isRequired,
   };
@@ -122,7 +124,9 @@ export default class GitTabController extends React.Component {
         openFiles={this.props.openFiles}
         discardWorkDirChangesForPaths={this.props.discardWorkDirChangesForPaths}
         undoLastDiscard={this.props.undoLastDiscard}
+        contextLocked={this.props.contextLocked}
         changeWorkingDirectory={this.props.changeWorkingDirectory}
+        setContextLock={this.props.setContextLock}
         getCurrentWorkDirs={this.props.getCurrentWorkDirs}
         onDidChangeWorkDirs={this.props.onDidChangeWorkDirs}
 

lib/controllers/git-tab-controller.js

@@ -11,21 +11,28 @@ export default class GitTabHeaderController extends React.Component {
     // Workspace
     currentWorkDir: PropTypes.string,
     getCurrentWorkDirs: PropTypes.func.isRequired,
+    changeWorkingDirectory: PropTypes.func.isRequired,
+    contextLocked: PropTypes.bool.isRequired,
+    setContextLock: PropTypes.func.isRequired,
 
     // Event Handlers
-    handleWorkDirSelect: PropTypes.func.isRequired,
     onDidChangeWorkDirs: PropTypes.func.isRequired,
     onDidUpdateRepo: PropTypes.func.isRequired,
   }
 
   constructor(props) {
     super(props);
     this._isMounted = false;
-    this.state = {currentWorkDirs: [], committer: nullAuthor};
+    this.state = {
+      currentWorkDirs: [],
+      committer: nullAuthor,
+      changingLock: null,
+      changingWorkDir: null,
+    };
     this.disposable = new CompositeDisposable();
   }
 
-  static getDerivedStateFromProps(props, state) {
+  static getDerivedStateFromProps(props) {
     return {
       currentWorkDirs: props.getCurrentWorkDirs(),
     };
@@ -59,17 +66,49 @@ export default class GitTabHeaderController extends React.Component {
         committer={this.state.committer}
 
         // Workspace
-        workdir={this.props.currentWorkDir}
+        workdir={this.getWorkDir()}
         workdirs={this.state.currentWorkDirs}
+        contextLocked={this.getLocked()}
+        changingWorkDir={this.state.changingWorkDir !== null}
+        changingLock={this.state.changingLock !== null}
 
         // Event Handlers
-        handleWorkDirSelect={this.props.handleWorkDirSelect}
+        handleWorkDirSelect={this.handleWorkDirSelect}
+        handleLockToggle={this.handleLockToggle}
       />
     );
   }
 
+  handleLockToggle = async () => {
+    if (this.state.changingLock !== null) {
+      return;
+    }
+
+    const nextLock = !this.props.contextLocked;
+    try {
+      this.setState({changingLock: nextLock});
+      await this.props.setContextLock(this.getWorkDir(), nextLock);
+    } finally {
+      await new Promise(resolve => this.setState({changingLock: null}, resolve));
+    }
+  }
+
+  handleWorkDirSelect = async e => {
+    if (this.state.changingWorkDir !== null) {
+      return;
+    }
+
+    const nextWorkDir = e.target.value;
+    try {
+      this.setState({changingWorkDir: nextWorkDir});
+      await this.props.changeWorkingDirectory(nextWorkDir);
+    } finally {
+      await new Promise(resolve => this.setState({changingWorkDir: null}, resolve));
+    }
+  }
+
   resetWorkDirs = () => {
-    this.setState((state, props) => ({
+    this.setState(() => ({
       currentWorkDirs: [],
     }));
   }
@@ -81,6 +120,14 @@ export default class GitTabHeaderController extends React.Component {
     }
   }
 
+  getWorkDir() {
+    return this.state.changingWorkDir !== null ? this.state.changingWorkDir : this.props.currentWorkDir;
+  }
+
+  getLocked() {
+    return this.state.changingLock !== null ? this.state.changingLock : this.props.contextLocked;
+  }
+
   componentWillUnmount() {
     this._isMounted = false;
     this.disposable.dispose();

lib/controllers/git-tab-header-controller.js

@@ -24,6 +24,8 @@ export default class GitHubTabController extends React.Component {
     currentWorkDir: PropTypes.string,
 
     changeWorkingDirectory: PropTypes.func.isRequired,
+    setContextLock: PropTypes.func.isRequired,
+    contextLocked: PropTypes.bool.isRequired,
     onDidChangeWorkDirs: PropTypes.func.isRequired,
     getCurrentWorkDirs: PropTypes.func.isRequired,
     openCreateDialog: PropTypes.func.isRequired,
@@ -54,6 +56,7 @@ export default class GitHubTabController extends React.Component {
         rootHolder={this.props.rootHolder}
 
         workingDirectory={this.props.workingDirectory || this.props.currentWorkDir}
+        contextLocked={this.props.contextLocked}
         repository={this.props.repository}
         branches={this.props.branches}
         currentBranch={currentBranch}
@@ -67,6 +70,7 @@ export default class GitHubTabController extends React.Component {
         handlePushBranch={this.handlePushBranch}
         handleRemoteSelect={this.handleRemoteSelect}
         changeWorkingDirectory={this.props.changeWorkingDirectory}
+        setContextLock={this.props.setContextLock}
         getCurrentWorkDirs={this.props.getCurrentWorkDirs}
         onDidChangeWorkDirs={this.props.onDidChangeWorkDirs}
         openCreateDialog={this.props.openCreateDialog}

lib/controllers/github-tab-controller.js

@@ -9,19 +9,26 @@ export default class GithubTabHeaderController extends React.Component {
 
     // Workspace
     currentWorkDir: PropTypes.string,
+    contextLocked: PropTypes.bool.isRequired,
+    changeWorkingDirectory: PropTypes.func.isRequired,
+    setContextLock: PropTypes.func.isRequired,
     getCurrentWorkDirs: PropTypes.func.isRequired,
 
     // Event Handlers
-    handleWorkDirSelect: PropTypes.func.isRequired,
     onDidChangeWorkDirs: PropTypes.func.isRequired,
   }
 
   constructor(props) {
     super(props);
-    this.state = {currentWorkDirs: []};
+
+    this.state = {
+      currentWorkDirs: [],
+      changingLock: null,
+      changingWorkDir: null,
+    };
   }
 
-  static getDerivedStateFromProps(props, state) {
+  static getDerivedStateFromProps(props) {
     return {
       currentWorkDirs: props.getCurrentWorkDirs(),
     };
@@ -46,21 +53,60 @@ export default class GithubTabHeaderController extends React.Component {
         user={this.props.user}
 
         // Workspace
-        workdir={this.props.currentWorkDir}
+        workdir={this.getWorkDir()}
         workdirs={this.state.currentWorkDirs}
+        contextLocked={this.getContextLocked()}
+        changingWorkDir={this.state.changingWorkDir !== null}
+        changingLock={this.state.changingLock !== null}
 
-        // Event Handlers
-        handleWorkDirSelect={this.props.handleWorkDirSelect}
+        handleWorkDirChange={this.handleWorkDirChange}
+        handleLockToggle={this.handleLockToggle}
       />
     );
   }
 
   resetWorkDirs = () => {
-    this.setState((state, props) => ({
+    this.setState(() => ({
       currentWorkDirs: [],
     }));
   }
 
+  handleLockToggle = async () => {
+    if (this.state.changingLock !== null) {
+      return;
+    }
+
+    const nextLock = !this.props.contextLocked;
+    try {
+      this.setState({changingLock: nextLock});
+      await this.props.setContextLock(this.state.changingWorkDir || this.props.currentWorkDir, nextLock);
+    } finally {
+      await new Promise(resolve => this.setState({changingLock: null}, resolve));
+    }
+  }
+
+  handleWorkDirChange = async e => {
+    if (this.state.changingWorkDir !== null) {
+      return;
+    }
+
+    const nextWorkDir = e.target.value;
+    try {
+      this.setState({changingWorkDir: nextWorkDir});
+      await this.props.changeWorkingDirectory(nextWorkDir);
+    } finally {
+      await new Promise(resolve => this.setState({changingWorkDir: null}, resolve));
+    }
+  }
+
+  getWorkDir() {
+    return this.state.changingWorkDir !== null ? this.state.changingWorkDir : this.props.currentWorkDir;
+  }
+
+  getContextLocked() {
+    return this.state.changingLock !== null ? this.state.changingLock : this.props.contextLocked;
+  }
+
   componentWillUnmount() {
     this.disposable.dispose();
   }