Refactor main package entry point

lib/controllers/file-patch-controller.js

@@ -5,7 +5,6 @@ import {Emitter, CompositeDisposable} from 'atom'
 import etch from 'etch'
 
 import FilePatchView from '../views/file-patch-view'
-import ModelObserver from '../models/model-observer'
 
 export default class FilePatchController {
   constructor (props) {
@@ -15,23 +14,17 @@ export default class FilePatchController {
     this.unstageHunk = this.unstageHunk.bind(this)
     this.stageLines = this.stageLines.bind(this)
     this.unstageLines = this.unstageLines.bind(this)
-    this.repositoryObserver = new ModelObserver({
-      didUpdate: () => this.props.onRepoRefresh && this.props.onRepoRefresh()
-    })
-    this.repositoryObserver.setActiveModel(props.repository)
     etch.initialize(this)
   }
 
   async update (props) {
     this.props = Object.assign({}, this.props, props)
     this.emitter.emit('did-change-title', this.getTitle())
-    await this.repositoryObserver.setActiveModel(props.repository)
     return etch.update(this)
   }
 
   destroy () {
     this.emitter.emit('did-destroy')
-    this.repositoryObserver.destroy()
     return etch.destroy(this)
   }
 
@@ -105,4 +98,10 @@ export default class FilePatchController {
   didDestroyFilePatch () {
     this.destroy()
   }
+
+  focus () {
+    if (this.refs.filePatchView) {
+      this.refs.filePatchView.focus()
+    }
+  }
 }

lib/controllers/git-controller.js

@@ -0,0 +1,219 @@
+/** @babel */
+
+import path from 'path'
+
+import {CompositeDisposable, Disposable, File} from 'atom'
+
+import React from 'react'
+import ReactDom from 'react-dom'
+
+import EtchWrapper from '../views/etch-wrapper'
+import StatusBar from '../views/status-bar'
+import Panel from '../views/panel'
+import PaneItem from '../views/pane-item'
+import FilePatchController from './file-patch-controller'
+import GitPanelController from './git-panel-controller'
+import StatusBarTileController from './status-bar-tile-controller'
+import ModelObserver from '../models/model-observer'
+
+const nullFilePatchState = {
+  filePath: null,
+  filePatch: null,
+  stagingStatus: null,
+  amending: null,
+}
+
+export default class GitController extends React.Component {
+  static propTypes = {
+    workspace: React.PropTypes.object.isRequired,
+    commandRegistry: React.PropTypes.object.isRequired,
+    notificationManager: React.PropTypes.object.isRequired,
+    repository: React.PropTypes.object,
+    statusBar: React.PropTypes.object,
+    savedState: React.PropTypes.object,
+  }
+
+  static defaultProps = {
+    savedState: {},
+  }
+
+  serialize () {
+    return {
+      gitPanelActive: this.state.gitPanelActive
+    }
+  }
+
+  constructor (props, context) {
+    super(props, context)
+    this.state = {
+      ...nullFilePatchState,
+      gitPanelActive: !!props.savedState.gitPanelActive,
+    }
+
+    this.showFilePatchForPath = this.showFilePatchForPath.bind(this)
+    this.showMergeConflictFileForPath = this.showMergeConflictFileForPath.bind(this)
+    this.didChangeAmending = this.didChangeAmending.bind(this)
+    this.onRepoRefresh = this.onRepoRefresh.bind(this)
+    this.toggleGitPanel = this.toggleGitPanel.bind(this)
+    this.openAndFocusGitPanel = this.openAndFocusGitPanel.bind(this)
+    this.focusFilePatchView = this.focusFilePatchView.bind(this)
+    this.focusGitPanel = this.focusGitPanel.bind(this)
+    this.subscriptions = new CompositeDisposable()
+    this.subscriptions.add(
+      props.commandRegistry.add('atom-workspace', {
+        'git:toggle-git-panel': this.toggleGitPanel.bind(this),
+        'git:focus-git-panel': this.openAndFocusGitPanel.bind(this),
+      })
+    )
+
+    this.repositoryObserver = new ModelObserver({
+      didUpdate: () => this.onRepoRefresh()
+    })
+    this.repositoryObserver.setActiveModel(props.repository)
+    this.subscriptions.add(
+      new Disposable(() => this.repositoryObserver.destroy())
+    )
+  }
+
+  componentWillReceiveProps(newProps) {
+    this.repositoryObserver.setActiveModel(newProps.repository)
+  }
+
+  render () {
+    return (
+      <div>
+        {this.renderStatusBarTile()}
+        {this.renderGitPanel()}
+        {(this.state.filePath && this.state.filePatch) ? this.renderFilePatchController() : null}
+      </div>
+    )
+  }
+
+  renderStatusBarTile () {
+    return (
+      <StatusBar statusBar={this.props.statusBar} onConsumeStatusBar={(sb) => this.onConsumeStatusBar(sb)}>
+        <EtchWrapper type="span">
+          <StatusBarTileController
+            workspace={this.props.workspace}
+            repository={this.props.repository}
+            toggleGitPanel={this.toggleGitPanel}
+          />
+        </EtchWrapper>
+      </StatusBar>
+    )
+  }
+
+  renderGitPanel () {
+    return (
+      <Panel
+        workspace={this.props.workspace}
+        location="right"
+        getItem={({subtree}) => subtree.getWrappedComponent()}
+        onDidClosePanel={() => this.setState({gitPanelActive: false})}
+        visible={!!this.state.gitPanelActive}
+      >
+        <EtchWrapper ref={c => this.gitPanelController = c} reattachDomNode={false}>
+          <GitPanelController
+            workspace={this.props.workspace}
+            commandRegistry={this.props.commandRegistry}
+            notificationManager={this.props.notificationManager}
+            repository={this.props.repository}
+            didSelectFilePath={this.showFilePatchForPath}
+            didSelectMergeConflictFile={this.showMergeConflictFileForPath}
+            didChangeAmending={this.didChangeAmending}
+            focusFilePatchView={this.focusFilePatchView}
+          />
+        </EtchWrapper>
+      </Panel>
+    )
+  }
+
+  renderFilePatchController () {
+    return (
+      <PaneItem
+        workspace={this.props.workspace}
+        getItem={({subtree}) => subtree.getWrappedComponent()}
+        ref={c => this.filePatchControllerPane = c}
+        onDidCloseItem={() => this.setState({...nullFilePatchState})}
+      >
+        <EtchWrapper ref={c => this.filePatchController = c} reattachDomNode={false}>
+          <FilePatchController
+            repository={this.props.repository}
+            filePatch={this.state.filePatch}
+            stagingStatus={this.state.stagingStatus}
+            onRepoRefresh={this.onRepoRefresh}
+          />
+        </EtchWrapper>
+      </PaneItem>
+    )
+  }
+
+  componentWillUnmount () {
+    this.subscriptions.dispose()
+  }
+
+  onConsumeStatusBar (statusBar) {
+    if (statusBar.disableGitInfoTile) {
+      statusBar.disableGitInfoTile()
+    }
+  }
+
+  async showFilePatchForPath (filePath, stagingStatus, {activate, amending} = {}) {
+    if (!filePath) return
+    const repository = this.props.repository
+    if (!repository) return
+
+    const filePatch = await repository.getFilePatchForPath(filePath, {staged: stagingStatus === 'staged', amending})
+    if (filePatch) {
+      this.setState({ filePath, filePatch, stagingStatus, amending }, () => {
+        // TODO: can be better done w/ a prop?
+        if (activate && this.filePatchControllerPane) {
+          this.filePatchControllerPane.activate()
+        }
+      })
+    } else {
+      this.setState({...nullFilePatchState})
+    }
+  }
+
+  onRepoRefresh () {
+    return this.showFilePatchForPath(this.state.filePath, this.state.stagingStatus, {amending: this.state.amending})
+  }
+
+  async showMergeConflictFileForPath (relativeFilePath, {focus} = {}) {
+    const absolutePath = path.join(this.props.repository.getWorkingDirectoryPath(), relativeFilePath)
+    if (await new File(absolutePath).exists()) {
+      return this.props.workspace.open(absolutePath, {activatePane: Boolean(focus), pending: true})
+    } else {
+      this.props.notificationManager.addInfo('File has been deleted.')
+    }
+  }
+
+  didChangeAmending (isAmending) {
+    return this.showFilePatchForPath(this.state.filePath, this.state.stagingStatus, {amending: isAmending})
+  }
+
+  toggleGitPanel () {
+    this.setState(state => ({gitPanelActive: !state.gitPanelActive}))
+  }
+
+  openAndFocusGitPanel () {
+    if (!this.state.gitPanelActive) {
+      this.setState({gitPanelActive: true}, () => this.focusGitPanel())
+    } else {
+      this.focusGitPanel()
+    }
+  }
+
+  focusGitPanel () {
+    if (this.gitPanelController) {
+      this.gitPanelController.getWrappedComponent().focus()
+    }
+  }
+
+  focusFilePatchView () {
+    if (this.filePatchController) {
+      this.filePatchController.getWrappedComponent().focus()
+    }
+  }
+}

lib/controllers/git-panel-controller.js

@@ -66,8 +66,11 @@ export default class GitPanelController {
   }
 
   async update (props) {
+    const oldProps = this.props
     this.props = Object.assign({}, this.props, props)
-    await this.repositoryObserver.setActiveModel(props.repository)
+    if (this.props.repository !== oldProps.repository) {
+      await this.repositoryObserver.setActiveModel(props.repository)
+    }
     return etch.update(this)
   }
 
@@ -157,7 +160,7 @@ export default class GitPanelController {
   }
 
   setAmending (isAmending) {
-    if (this.props.didChangeAmending) this.props.didChangeAmending()
+    if (this.props.didChangeAmending) this.props.didChangeAmending(isAmending)
     this.isAmending = isAmending
     return this.repositoryObserver.refreshModelData(this.getActiveRepository())
   }
@@ -171,6 +174,8 @@ export default class GitPanelController {
   }
 
   focus () {
-    if (this.refs.gitPanel) this.refs.gitPanel.focus()
+    if (this.refs.gitPanel) {
+      this.refs.gitPanel.focus()
+    }
   }
 }

lib/controllers/status-bar-tile-controller.js

@@ -191,9 +191,10 @@ export default class StatusBarTileController {
     this.showingPushPullMenuView = true
   }
 
-  destroy () {
+  destroy (removeDomNode) {
     this.branchTooltipDisposable && this.branchTooltipDisposable.dispose()
     this.pushPullTooltipDisposable && this.pushPullTooltipDisposable.dispose()
     this.repositoryObserver.destroy()
+    etch.destroy(this, removeDomNode)
   }
 }