Merge pull request #9 from tkgdsg/set_defaultbranch_at_init

branch list modification & initial branch modification

Author: mrkm4ntr

scripts/components/App.js

@@ -7,7 +7,11 @@ import 'whatwg-fetch';
 export default class App extends React.Component {
 
   static get allBranchName() {
-    return 'all branches';
+    return 'All Branches';
+  }
+
+  static get defaultBranchName() {
+    return 'Default Branch';
   }
 
   constructor(props) {
@@ -28,19 +32,28 @@ export default class App extends React.Component {
     this.fetchData({ count: 100 });
   }
 
-  selectBranch(branch) {
-    const params = { count: this.state.count };
-    if (branch !== App.allBranchName) {
-      params.branch = branch;
+  setParams(branchName, params) {
+    const returnParams = params;
+    switch (branchName) {
+      case App.allBranchName:
+        returnParams.all = 1;
+        break;
+      case App.defaultBranchName:
+        returnParams.branch = this.state.defaultBranch;
+        break;
+      default:
+        returnParams.branch = branchName;
     }
+    return returnParams;
+  }
+
+  selectBranch(branch) {
+    const params = this.setParams(branch, { count: this.state.count });
     this.fetchData(params);
   }
 
   selectCount(count) {
-    const params = { count };
-    if (this.state.currentBranch !== App.allBranchName) {
-      params.branch = this.state.currentBranch;
-    }
+    const params = this.setParams(this.state.currentBranch, { count });
     this.fetchData(params);
   }
 
@@ -51,8 +64,7 @@ export default class App extends React.Component {
       r => r.json()
     ).then(data => {
       const newState = Object.assign({ count: params.count, isFetching: false }, data);
-      newState.branches.push(App.allBranchName);
-      if (!data.currentBranch) {
+      if (data.all) {
         newState.currentBranch = App.allBranchName;
       }
       this.setState(newState);
@@ -72,6 +84,13 @@ export default class App extends React.Component {
           onSelect={this.selectBranch}
           style={{ marginBottom: '10px' }}
         >
+          <MenuItem key={App.allBranchName} eventKey={App.allBranchName}>
+            {App.allBranchName}
+          </MenuItem>
+          <MenuItem key={App.defaultBranchName} eventKey={App.defaultBranchName}>
+            {App.defaultBranchName}
+          </MenuItem>
+          <MenuItem divider />
           {this.state.branches.map(branch =>
             <MenuItem key={branch} eventKey={branch}>{branch}</MenuItem>
           )}

src/main/scala/mrkm4ntr/gitbucket/network/controller/NetworkController.scala

@@ -64,21 +64,23 @@ trait NetworkControllerBase extends ControllerBase {
           }
         }
 
-        val currentBranch = params.get("branch")
+        val allBranches = params.get("all")
+        val currentBranch = params.getOrElse("branch", repository.repository.defaultBranch)
         val count = params.getOrElse("count", "100").toInt
         val repo = git.getRepository
         val revWalk = new PlotWalk(repo)
         revWalk.sort(RevSort.COMMIT_TIME_DESC)
         try {
-          currentBranch match {
-            case Some(branch) => revWalk.markStart(revWalk.parseCommit(repo.resolve(branch)))
-            case _ => revWalk.markStart(repository.branchList.map(repo.resolve(_)).map(revWalk.parseCommit(_)).asJava)
+	  if(allBranches != None) {
+            revWalk.markStart(repository.branchList.map(repo.resolve(_)).map(revWalk.parseCommit(_)).asJava)
+          } else {
+            revWalk.markStart(revWalk.parseCommit(repo.resolve(currentBranch)))
           }
           val plotCommitList = new PlotCommitList[PlotLane]
           plotCommitList.source(revWalk)
           plotCommitList.fillTo(count)
           val result = traverse(plotCommitList.asScala.zipWithIndex.toList, None, 0, Nil)
-          Data(result._1, result._2.reverse, repository.branchList, currentBranch)
+          Data(result._1, result._2.reverse, repository.branchList, currentBranch, repository.repository.defaultBranch, allBranches)
         } finally {
           revWalk.dispose()
         }
@@ -136,7 +138,9 @@ case class Data(
   maxLane: Int,
   commits: Seq[Commit],
   branches: Seq[String],
-  currentBranch: Option[String])
+  currentBranch: String,
+  defaultBranch: String,
+  all: Option[String])
 
 case class Commit(
   index: Int,

test/components/App.spec.js

@@ -86,7 +86,7 @@ describe('App', () => {
     const wrapper = shallow(<App />);
     const instance = wrapper.instance();
     const mock = sinon.mock(instance);
-    mock.expects('fetchData').withArgs({ count: 1000 });
+    mock.expects('fetchData').withArgs({ all: 1, count: 1000 });
     instance.selectCount(1000);
     assert(mock.verify());
   });