Merge pull request #2823 from hiroponz/switchable-branch-on-network-graph

Switchable the main branch on network graph

Merge pull request #2823 from hiroponz/switchable-branch-on-network-graph
Switchable the main branch on network graph
Dmitriy Zaporozhets
2 parents 1fdeb9e0 ad33c398
Showing 12 changed files with 59 additions and 38 deletions Show diff stats
app/controllers/graph_controller.rb
app/controllers/projects_controller.rb
app/controllers/refs_controller.rb
app/views/graph/show.html.haml
app/views/layouts/project_resource.html.haml
app/views/projects/graph.html.haml
config/routes.rb
features/steps/project/project_network_graph.rb
features/steps/shared/paths.rb
lib/extracts_path.rb
lib/gitlab/graph/json_builder.rb
vendor/assets/javascripts/branch-graph.js
@@ -0,0 +1,18 @@
+class GraphController < ProjectResourceController
+  include ExtractsPath
+
+  # Authorize
+  before_filter :authorize_read_project!
+  before_filter :authorize_code_access!
+  before_filter :require_non_empty_project
+
+  def show
+    respond_to do |format|
+      format.html
+      format.json do
+        graph = Gitlab::Graph::JsonBuilder.new(project, @ref)
+        render :json => graph.to_json
+      end
+    end
+  end
+end
@@ -90,16 +90,6 @@ class ProjectsController &lt; ProjectResourceController
     end
   end
-  def graph
-    respond_to do |format|
-      format.html
-      format.json do
-        graph = Gitlab::Graph::JsonBuilder.new(project)
-        render :json => graph.to_json
-      end
-    end
-  end
-
   def destroy
     return access_denied! unless can?(current_user, :remove_project, project)
@@ -13,6 +13,8 @@ class RefsController &lt; ProjectResourceController
       format.html do
         new_path = if params[:destination] == "tree"
                      project_tree_path(@project, (@ref + "/" + params[:path]))
+                   elsif params[:destination] == "graph"
+                     project_graph_path(@project, @ref)
                    else
                      project_commits_path(@project, @ref)
                    end
@@ -0,0 +1,19 @@
+%h3.page_title Project Network Graph
+%br
+= render partial: 'shared/ref_switcher', locals: {destination: 'graph', path: @path}
+%br
+.graph_holder
+  %h4
+    %small You can move around the graph by using the arrow keys.
+  #holder.graph
+    .loading.loading-gray
+
+:javascript
+  var branch_graph;
+  $(function(){
+    branch_graph = new BranchGraph($("#holder"), {
+      url: '#{project_graph_path(@project, @ref, format: :json)}',
+      commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
+      ref: '#{@ref}'
+    });
+  });
@@ -20,8 +20,8 @@
               = link_to 'Files', project_tree_path(@project, @ref || @repository.root_ref)
             = nav_link(controller: %w(commit commits compare repositories protected_branches)) do
               = link_to "Commits", project_commits_path(@project, @ref || @repository.root_ref)
-            = nav_link(path: 'projects#graph') do
-              = link_to "Network", graph_project_path(@project)
+            = nav_link(controller: %w(graph)) do
+              = link_to "Network", project_graph_path(@project, @ref || @repository.root_ref)
         - if @project.issues_enabled
           = nav_link(controller: %w(issues milestones labels)) do
@@ -1,17 +0,0 @@
-%h3.page_title Project Network Graph
-%br
-
-.graph_holder
-  %h4
-    %small You can move around the graph by using the arrow keys.
-  #holder.graph
-    .loading.loading-gray
-
-:javascript
-  var branch_graph;
-  $(function(){
-    branch_graph = new BranchGraph($("#holder"), {
-      url: '#{url_for controller: 'projects', action: 'graph', format: :json}',
-      commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}'
-    });
-  });
@@ -163,7 +163,6 @@ Gitlab::Application.routes.draw do
   resources :projects, constraints: { id: /[a-zA-Z.0-9_\-\/]+/ }, except: [:new, :create, :index], path: "/" do
     member do
       get "wall"
-      get "graph"
       get "files"
     end
@@ -173,6 +172,7 @@ Gitlab::Application.routes.draw do
     resources :compare, only: [:index, :create]
     resources :blame,   only: [:show], constraints: {id: /.+/}
     resources :blob,    only: [:show], constraints: {id: /.+/}
+    resources :graph,   only: [:show], constraints: {id: /.+/}
     match "/compare/:from...:to" => "compare#show", as: "compare",
                     :via => [:get, :post], constraints: {from: /.+/, to: /.+/}
@@ -14,6 +14,6 @@ class ProjectNetworkGraph &lt; Spinach::FeatureSteps
     Gitlab::Graph::JsonBuilder.stub(max_count: 10)
     project = Project.find_by_name("Shop")
-    visit graph_project_path(project)
+    visit project_graph_path(project, "master")
   end
 end
@@ -141,7 +141,7 @@ module SharedPaths
     # Stub Graph::JsonBuilder max_size to speed up test (10 commits vs. 650)
     Gitlab::Graph::JsonBuilder.stub(max_count: 10)
-    visit graph_project_path(@project)
+    visit project_graph_path(@project, root_ref)
   end
   Given "I visit my project's issues page" do
@@ -54,9 +54,10 @@ module ExtractsPath
     input.gsub!(/^#{Gitlab.config.gitlab.relative_url_root}/, "")
     # Remove project, actions and all other staff from path
     input.gsub!(/^\/#{Regexp.escape(@project.path_with_namespace)}/, "")
-    input.gsub!(/^\/(tree|commits|blame|blob|refs)\//, "") # remove actions
+    input.gsub!(/^\/(tree|commits|blame|blob|refs|graph)\//, "") # remove actions
     input.gsub!(/\?.*$/, "") # remove stamps suffix
     input.gsub!(/.atom$/, "") # remove rss feed
+    input.gsub!(/.json$/, "") # remove json suffix
     input.gsub!(/\/edit$/, "") # remove edit route part
     if input.match(/^([[:alnum:]]{40})(.+)/)
@@ -9,8 +9,9 @@ module Gitlab
         @max_count ||= 650
       end
-      def initialize project
+      def initialize project, ref
         @project = project
+        @ref = ref
         @repo = project.repo
         @ref_cache = {}
@@ -66,9 +67,9 @@ module Gitlab
         heads.select!{|h| h.is_a? Grit::Head or h.is_a? Grit::Remote}
         # sort heads so the master is top and current branches are closer
         heads.sort! do |a,b|
-          if a.name == "master"
+          if a.name == @ref
             -1
-          elsif b.name == "master"
+          elsif b.name == @ref
             1
           else
             b.commit.committed_date <=> a.commit.committed_date
@@ -73,7 +73,8 @@
       , cumonth = ""
       , offsetX = 20
       , offsetY = 60
-      , barWidth = Math.max(graphWidth, this.dayCount * 20 + 320);
+      , barWidth = Math.max(graphWidth, this.dayCount * 20 + 320)
+      , scrollLeft = cw;
     this.raphael = r;
@@ -145,12 +146,18 @@
       if (this.commits[i].refs) {
         this.appendLabel(x, y, this.commits[i].refs);
+
+        // The main branch is displayed in the center.
+        re = new RegExp('(^| )' + this.options.ref + '( |$)');
+        if (this.commits[i].refs.match(re)) {
+          scrollLeft = x - graphWidth / 2;
+        }
       }
       this.appendAnchor(top, this.commits[i], x, y);
     }
     top.toFront();
-    this.element.scrollLeft(cw);
+    this.element.scrollLeft(scrollLeft);
     this.bindEvents();
   };
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+class GraphController < ProjectResourceController
	2	+ include ExtractsPath
	3	+
	4	+ # Authorize
	5	+ before_filter :authorize_read_project!
	6	+ before_filter :authorize_code_access!
	7	+ before_filter :require_non_empty_project
	8	+
	9	+ def show
	10	+ respond_to do \|format\|
	11	+ format.html
	12	+ format.json do
	13	+ graph = Gitlab::Graph::JsonBuilder.new(project, @ref)
	14	+ render :json => graph.to_json
	15	+ end
	16	+ end
	17	+ end
	18	+end
	@@ -90,16 +90,6 @@ class ProjectsController < ProjectResourceController		@@ -90,16 +90,6 @@ class ProjectsController < ProjectResourceController
90	end	90	end
91	end	91	end
92		92
93	- def graph
94	- respond_to do \|format\|
95	- format.html
96	- format.json do
97	- graph = Gitlab::Graph::JsonBuilder.new(project)
98	- render :json => graph.to_json
99	- end
100	- end
101	- end
102	-
103	def destroy	93	def destroy
104	return access_denied! unless can?(current_user, :remove_project, project)	94	return access_denied! unless can?(current_user, :remove_project, project)
105		95
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+%h3.page_title Project Network Graph
	2	+%br
	3	+= render partial: 'shared/ref_switcher', locals: {destination: 'graph', path: @path}
	4	+%br
	5	+.graph_holder
	6	+ %h4
	7	+ %small You can move around the graph by using the arrow keys.
	8	+ #holder.graph
	9	+ .loading.loading-gray
	10	+
	11	+:javascript
	12	+ var branch_graph;
	13	+ $(function(){
	14	+ branch_graph = new BranchGraph($("#holder"), {
	15	+ url: '#{project_graph_path(@project, @ref, format: :json)}',
	16	+ commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}',
	17	+ ref: '#{@ref}'
	18	+ });
	19	+ });
	@@ -1,17 +0,0 @@	@@ -1,17 +0,0 @@
1	-%h3.page_title Project Network Graph
2	-%br
3	-
4	-.graph_holder
5	- %h4
6	- %small You can move around the graph by using the arrow keys.
7	- #holder.graph
8	- .loading.loading-gray
9	-
10	-:javascript
11	- var branch_graph;
12	- $(function(){
13	- branch_graph = new BranchGraph($("#holder"), {
14	- url: '#{url_for controller: 'projects', action: 'graph', format: :json}',
15	- commit_url: '#{project_commit_path(@project, 'ae45ca32').gsub("ae45ca32", "%s")}'
16	- });
17	- });
	@@ -14,6 +14,6 @@ class ProjectNetworkGraph < Spinach::FeatureSteps		@@ -14,6 +14,6 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
14	Gitlab::Graph::JsonBuilder.stub(max_count: 10)	14	Gitlab::Graph::JsonBuilder.stub(max_count: 10)
15		15
16	project = Project.find_by_name("Shop")	16	project = Project.find_by_name("Shop")
17	- visit graph_project_path(project)	17	+ visit project_graph_path(project, "master")
18	end	18	end
19	end	19	end
	@@ -141,7 +141,7 @@ module SharedPaths		@@ -141,7 +141,7 @@ module SharedPaths
141	# Stub Graph::JsonBuilder max_size to speed up test (10 commits vs. 650)	141	# Stub Graph::JsonBuilder max_size to speed up test (10 commits vs. 650)
142	Gitlab::Graph::JsonBuilder.stub(max_count: 10)	142	Gitlab::Graph::JsonBuilder.stub(max_count: 10)
143		143
144	- visit graph_project_path(@project)	144	+ visit project_graph_path(@project, root_ref)
145	end	145	end
146		146
147	Given "I visit my project's issues page" do	147	Given "I visit my project's issues page" do