+ {this.renderHeader()}
+ {this.renderBody(type)}
+
+ );
+ }
+
+ renderHeader() {
+ return (
+
-
-
-
Too many changes
-
- The repository at {this.props.workingDirectoryPath} has too many changed files
- to display in Atom. Ensure that you have set up an appropriate
+ .gitignore file.
-
+
+
);
- } else if (this.props.repository.hasDirectory() &&
- !isValidWorkdir(this.props.repository.getWorkingDirectoryPath())) {
+ case 'unsupported-dir':
return (
- Too many changes
+
+ The repository at {this.props.workingDirectoryPath} has too many changed files
+ to display in Atom. Ensure that you have set up an appropriate
.gitignore file.
-
-
-
Unsupported directory
-
- Atom does not support managing Git repositories in your home or root directories.
-
+
+
+
);
- } else if (this.props.repository.showGitTabInit()) {
- const inProgress = this.props.repository.showGitTabInitInProgress();
- const message = this.props.repository.hasDirectory()
- ?
- (
- Initialize {this.props.workingDirectoryPath} with a
- Git repository
- )
- : Initialize a new project directory with a Git repository;
-
+ case 'no-repo':
return (
- Unsupported directory
+
+ Atom does not support managing Git repositories in your home or root directories.
-
-
-
+ 
+
+ );
+ }
+}
diff --git a/lib/views/github-tab-view.js b/lib/views/github-tab-view.js
index 6ce0dbddd2..c1cc3fb9e1 100644
--- a/lib/views/github-tab-view.js
+++ b/lib/views/github-tab-view.js
@@ -7,10 +7,14 @@ import {
} from '../prop-types';
import LoadingView from './loading-view';
import RemoteSelectorView from './remote-selector-view';
+import HeaderView from './header-view';
import RemoteContainer from '../containers/remote-container';
+import GithubHeaderContainer from '../containers/github-header-container';
+
export default class GitHubTabView extends React.Component {
static propTypes = {
+ project: PropTypes.object.isRequired,
workspace: PropTypes.object.isRequired,
remoteOperationObserver: OperationStateObserverPropType.isRequired,
loginModel: GithubLoginModelPropType.isRequired,
@@ -21,18 +25,20 @@ export default class GitHubTabView extends React.Component {
currentBranch: BranchPropType.isRequired,
remotes: RemoteSetPropType.isRequired,
currentRemote: RemotePropType.isRequired,
- manyRemotesAvailable: PropTypes.bool.isRequired,
+ isSelectingRemote: PropTypes.bool.isRequired,
aheadCount: PropTypes.number,
pushInProgress: PropTypes.bool.isRequired,
isLoading: PropTypes.bool.isRequired,
handlePushBranch: PropTypes.func.isRequired,
handleRemoteSelect: PropTypes.func.isRequired,
+ changeProjectWorkingDirectory: PropTypes.func.isRequired,
}
render() {
return (
Create Repository
-{message}
-
+
+
+
);
- } else {
- const isLoading = this.props.isLoading || this.props.repository.showGitTabLoading();
-
+ default:
return (
- Create Repository
+
+ {
+ this.props.repository.hasDirectory()
+ ?
+ (
+ Initialize {this.props.workingDirectoryPath} with a
+ Git repository
+ )
+ : Initialize a new project directory with a Git repository
+ }
+
+
+
);
}
}
diff --git a/lib/views/github-header-view.js b/lib/views/github-header-view.js
new file mode 100644
index 0000000000..4838cd5d2a
--- /dev/null
+++ b/lib/views/github-header-view.js
@@ -0,0 +1,31 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import {RemoteSetPropType} from '../prop-types';
+import RemoteSelector from './remote-selector';
+
+export default class GithubHeaderView extends React.Component {
+ static propTypes = {
+ avatarUrl: PropTypes.string,
+ remotes: RemoteSetPropType.isRequired,
+ currentRemoteName: PropTypes.string.isRequired,
+
+ handleRemoteSelect: PropTypes.func.isRequired,
+ }
+
+ render() {
+ const {avatarUrl} = this.props;
+ return (
+
+ {this.renderHeader()}
);
}
+
+ renderHeader() {
+ return (
+ this.props.changeProjectWorkingDirectory(e.target.value)}
+ currentProject={this.props.workingDirectory}
+ projectPaths={this.props.project.getPaths()}
+ />
+ );
+ }
}
diff --git a/lib/views/header-view.js b/lib/views/header-view.js
new file mode 100644
index 0000000000..b6347c8995
--- /dev/null
+++ b/lib/views/header-view.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import path from 'path';
+
+export default class HeaderView extends React.Component {
+ static propTypes = {
+ currentProject: PropTypes.string,
+ projectPaths: PropTypes.arrayOf(PropTypes.string),
+
+ handleProjectSelect: PropTypes.func.isRequired,
+ }
+
+ render() {
+ return (
+
+
+
+ );
+ }
+
+ renderProjects = () => {
+ const projects = [];
+ for (const projectPath of this.props.projectPaths) {
+ projects.push();
+ }
+ return projects;
+ };
+}
diff --git a/lib/views/remote-selector.js b/lib/views/remote-selector.js
new file mode 100644
index 0000000000..809651010e
--- /dev/null
+++ b/lib/views/remote-selector.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import {RemoteSetPropType} from '../prop-types';
+
+export default class RemoteSelector extends React.Component {
+ static propTypes = {
+ remotes: RemoteSetPropType.isRequired,
+ currentRemoteName: PropTypes.string.isRequired,
+
+ handleRemoteSelect: PropTypes.func.isRequired,
+ }
+
+ render() {
+ return (
+
+ );
+ }
+
+ renderRemotes = () => {
+ const remoteOptions = [];
+ for (const remote of this.props.remotes) {
+ remoteOptions.push();
+ }
+ return remoteOptions;
+ };
+}
diff --git a/styles/project.less b/styles/project.less
new file mode 100644
index 0000000000..6dde98f812
--- /dev/null
+++ b/styles/project.less
@@ -0,0 +1,13 @@
+@import "variables";
+
+.github-Project {
+ display: flex;
+ align-items: center;
+ padding: @component-padding/2 @component-padding;
+ border-bottom: 1px solid @base-border-color;
+
+ &-path {
+ flex: 1;
+ }
+
+}
diff --git a/test/atom/decoration.test.js b/test/atom/decoration.test.js
index b31b040b5e..93d9ca244f 100644
--- a/test/atom/decoration.test.js
+++ b/test/atom/decoration.test.js
@@ -7,6 +7,7 @@ import Decoration from '../../lib/atom/decoration';
import AtomTextEditor from '../../lib/atom/atom-text-editor';
import Marker from '../../lib/atom/marker';
import MarkerLayer from '../../lib/atom/marker-layer';
+import ErrorBoundary from '../../lib/error-boundary';
describe('Decoration', function() {
let atomEnv, workspace, editor, marker;
@@ -128,15 +129,40 @@ describe('Decoration', function() {
assert.isNull(editor.gutterWithName(gutterName));
});
- it('throws an error if `gutterName` prop is not supplied for gutter decorations', function() {
- const app = (
-
-
- );
- assert.throws(() => mount(app), 'You are trying to decorate a gutter but did not supply gutterName prop.');
+ describe('throws an error', function() {
+ let errors;
+
+ // This consumes the error rather than printing it to console.
+ const onError = function(e) {
+ if (e.message === 'Uncaught Error: You are trying to decorate a gutter but did not supply gutterName prop.') {
+ errors.push(e.error);
+ e.preventDefault();
+ }
+ };
+
+ beforeEach(function() {
+ errors = [];
+ window.addEventListener('error', onError);
+ });
+
+ afterEach(function() {
+ errors = [];
+ window.removeEventListener('error', onError);
+ });
+
+ it('if `gutterName` prop is not supplied for gutter decorations', function() {
+ const app = (
+
+
+
+
+ );
+ mount(app);
+ assert(errors[0], 'You are trying to decorate a gutter but did not supply gutterName prop.');
+ });
});
});
@@ -254,7 +280,7 @@ describe('Decoration', function() {
it('decorates a parent Marker on a prop-provided TextEditor', function() {
mount(
-
+
,
);
@@ -266,7 +292,7 @@ describe('Decoration', function() {
let layerID = null;
mount(
{ layerID = id; }}>
- ,
);
diff --git a/test/atom/marker.test.js b/test/atom/marker.test.js
index 297ce3333a..0fb62032f3 100644
--- a/test/atom/marker.test.js
+++ b/test/atom/marker.test.js
@@ -6,6 +6,7 @@ import Marker from '../../lib/atom/marker';
import AtomTextEditor from '../../lib/atom/atom-text-editor';
import RefHolder from '../../lib/models/ref-holder';
import MarkerLayer from '../../lib/atom/marker-layer';
+import ErrorBoundary from '../../lib/error-boundary';
describe('Marker', function() {
let atomEnv, workspace, editor, marker, markerID;
@@ -135,8 +136,31 @@ describe('Marker', function() {
assert.strictEqual(instance.markerHolder.get(), external);
});
- it('fails on construction if its ID is invalid', function() {
- assert.throws(() => mount(
{this.renderRemote()}
@@ -40,6 +46,23 @@ export default class GitHubTabView extends React.Component {
);
}
+ renderHeader() {
+ if (this.props.isLoading || !this.props.currentRemote.isPresent()) { return null; }
+
+ const {currentRemote} = this.props;
+ const currentRemoteName = currentRemote && currentRemote.name ? currentRemote.name : ' ';
+ return (
+
- This is a subtree
-
-
+ This is a subtree
+
+