Merge branch 'feature/dashboard_event_filters' of dev.gitlabhq.com:gitlabhq

Dmitriy Zaporozhets
2 parents ba567c8d 949233aa
Showing 11 changed files with 134 additions and 3 deletions Show diff stats
app/assets/images/event_filter_comments.png
app/assets/images/event_filter_merged.png
app/assets/images/event_filter_push.png
app/assets/images/event_filter_team.png
app/assets/javascripts/main.js.coffee
app/assets/stylesheets/sections/events.scss
app/controllers/dashboard_controller.rb
app/helpers/application_helper.rb
app/helpers/events_helper.rb
app/views/dashboard/index.html.haml
lib/event_filter.rb
@@ -27,6 +27,9 @@ $ -&gt;
   # Initialize chosen selects
   $('select.chosen').chosen()
  
+  # Initialize tooltips
+  $('.has_tooltip').tooltip()
+
   # Disable form buttons while a form is submitting
   $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
     buttons = $('[type="submit"]', @)
@@ -115,3 +115,29 @@
     margin: -3px;
   }
 }
+
+/**
+ * Event filter
+ *
+ */
+.event_filter {
+  position: absolute;
+  width: 40px;
+  margin-left: -50px;
+
+  .filter_icon {
+    float: left;
+    border-left: 3px solid #4bc;
+    padding: 7px;
+    background: #f9f9f9;
+    margin-bottom: 10px;
+    img {
+      width:20px;
+    }
+
+    &.inactive {
+      border-left: 3px solid #EEE;
+      opacity: 0.5;
+    }
+  }
+}
 class DashboardController < ApplicationController
   respond_to :html
  
+  before_filter :event_filter, only: :index
+
   def index
     @groups = Group.where(id: current_user.projects.pluck(:group_id))
     @projects = current_user.projects_with_events
     @projects = @projects.page(params[:page]).per(30)
  
-    @events = Event.in_projects(current_user.project_ids).limit(20).offset(params[:offset] || 0)
+    @events = Event.in_projects(current_user.project_ids)
+    @events = @event_filter.apply_filter(@events)
+    @events = @events.limit(20).offset(params[:offset] || 0)
+
     @last_push = current_user.recent_push
  
     respond_to do |format|
@@ -34,4 +39,8 @@ class DashboardController &lt; ApplicationController
       format.atom { render layout: false }
     end
   end
+
+  def event_filter
+    @event_filter ||= EventFilter.new(params[:event_filter])
+  end
 end
@@ -36,7 +36,7 @@ module ApplicationHelper
     else
       gravatar_prefix = request.ssl? ? "https://secure" : "http://www"
       user_email.strip!
-      "#{gravatar_prefix}.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=identicon"
+      "#{gravatar_prefix}.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=mm"
     end
   end
  
@@ -33,4 +33,22 @@ module EventsHelper
       image_tag event_image_path
     end
   end
+
+  def event_filter_link key, tooltip
+    key = key.to_s
+
+    filter = @event_filter.options key
+
+    inactive = if @event_filter.active? key
+                 nil
+               else
+                 'inactive'
+               end
+
+    content_tag :div, class: "filter_icon #{inactive}" do
+      link_to dashboard_path(event_filter: filter), class: 'has_tooltip', 'data-original-title' => tooltip do
+        image_tag "event_filter_#{key}.png"
+      end
+    end
+  end
 end
@@ -3,10 +3,17 @@
     .activities.span8
       = render "events/event_last_push", event: @last_push
       = render 'shared/no_ssh'
+
+      .event_filter
+        = event_filter_link EventFilter.push, 'Push events'
+        = event_filter_link EventFilter.merged, 'Merge events'
+        = event_filter_link EventFilter.comments, 'Comments'
+        = event_filter_link EventFilter.team, 'Team'
+
       - if @events.any?
         .content_list= render @events
       - else
-        %h4.nothing_here_message Projects activity will be displayed here
+        %p.nothing_here_message Projects activity will be displayed here
       .loading.hide
     .side
       - if @groups.present?
@@ -0,0 +1,68 @@
+class EventFilter
+  attr_accessor :params
+
+  class << self
+    def default_filter
+      %w{ push issues merge_requests team}
+    end
+
+    def push
+      'push'
+    end
+
+    def merged
+      'merged'
+    end
+
+    def comments
+      'comments'
+    end
+
+    def team
+      'team'
+    end
+  end
+
+  def initialize params
+    @params = if params
+                params.dup
+              else
+                []#EventFilter.default_filter
+              end
+  end
+
+  def apply_filter events
+    return events unless params.present?
+
+    filter = params.dup
+
+    actions = []
+    actions << Event::Pushed if filter.include? 'push'
+    actions << Event::Merged if filter.include? 'merged'
+
+    if filter.include? 'team'
+      actions << Event::Joined
+      actions << Event::Left
+    end
+
+    actions << Event::Commented if filter.include? 'comments'
+
+    events = events.where(action: actions)
+  end
+
+  def options key
+    filter = params.dup
+
+    if filter.include? key
+      filter.delete key
+    else
+      filter << key
+    end
+
+    filter
+  end
+
+  def active? key
+    params.include? key
+  end
+end
...	...	@@ -27,6 +27,9 @@ $ ->
27	27	# Initialize chosen selects
28	28	$('select.chosen').chosen()
29	29
	30	+ # Initialize tooltips
	31	+ $('.has_tooltip').tooltip()
	32	+
30	33	# Disable form buttons while a form is submitting
31	34	$('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->
32	35	buttons = $('[type="submit"]', @)
...	...
...	...	@@ -115,3 +115,29 @@
115	115	margin: -3px;
116	116	}
117	117	}
	118	+
	119	+/**
	120	+ * Event filter
	121	+ *
	122	+ */
	123	+.event_filter {
	124	+ position: absolute;
	125	+ width: 40px;
	126	+ margin-left: -50px;
	127	+
	128	+ .filter_icon {
	129	+ float: left;
	130	+ border-left: 3px solid #4bc;
	131	+ padding: 7px;
	132	+ background: #f9f9f9;
	133	+ margin-bottom: 10px;
	134	+ img {
	135	+ width:20px;
	136	+ }
	137	+
	138	+ &.inactive {
	139	+ border-left: 3px solid #EEE;
	140	+ opacity: 0.5;
	141	+ }
	142	+ }
	143	+}
...	...
1	1	class DashboardController < ApplicationController
2	2	respond_to :html
3	3
	4	+ before_filter :event_filter, only: :index
	5	+
4	6	def index
5	7	@groups = Group.where(id: current_user.projects.pluck(:group_id))
6	8	@projects = current_user.projects_with_events
7	9	@projects = @projects.page(params[:page]).per(30)
8	10
9		- @events = Event.in_projects(current_user.project_ids).limit(20).offset(params[:offset] \|\| 0)
	11	+ @events = Event.in_projects(current_user.project_ids)
	12	+ @events = @event_filter.apply_filter(@events)
	13	+ @events = @events.limit(20).offset(params[:offset] \|\| 0)
	14	+
10	15	@last_push = current_user.recent_push
11	16
12	17	respond_to do \|format\|
...	...	@@ -34,4 +39,8 @@ class DashboardController < ApplicationController
34	39	format.atom { render layout: false }
35	40	end
36	41	end
	42	+
	43	+ def event_filter
	44	+ @event_filter \|\|= EventFilter.new(params[:event_filter])
	45	+ end
37	46	end
...	...
...	...	@@ -36,7 +36,7 @@ module ApplicationHelper
36	36	else
37	37	gravatar_prefix = request.ssl? ? "https://secure" : "http://www"
38	38	user_email.strip!
39		- "#{gravatar_prefix}.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=identicon"
	39	+ "#{gravatar_prefix}.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=mm"
40	40	end
41	41	end
42	42
...	...
...	...	@@ -33,4 +33,22 @@ module EventsHelper
33	33	image_tag event_image_path
34	34	end
35	35	end
	36	+
	37	+ def event_filter_link key, tooltip
	38	+ key = key.to_s
	39	+
	40	+ filter = @event_filter.options key
	41	+
	42	+ inactive = if @event_filter.active? key
	43	+ nil
	44	+ else
	45	+ 'inactive'
	46	+ end
	47	+
	48	+ content_tag :div, class: "filter_icon #{inactive}" do
	49	+ link_to dashboard_path(event_filter: filter), class: 'has_tooltip', 'data-original-title' => tooltip do
	50	+ image_tag "event_filter_#{key}.png"
	51	+ end
	52	+ end
	53	+ end
36	54	end
...	...
...	...	@@ -3,10 +3,17 @@
3	3	.activities.span8
4	4	= render "events/event_last_push", event: @last_push
5	5	= render 'shared/no_ssh'
	6	+
	7	+ .event_filter
	8	+ = event_filter_link EventFilter.push, 'Push events'
	9	+ = event_filter_link EventFilter.merged, 'Merge events'
	10	+ = event_filter_link EventFilter.comments, 'Comments'
	11	+ = event_filter_link EventFilter.team, 'Team'
	12	+
6	13	- if @events.any?
7	14	.content_list= render @events
8	15	- else
9		- %h4.nothing_here_message Projects activity will be displayed here
	16	+ %p.nothing_here_message Projects activity will be displayed here
10	17	.loading.hide
11	18	.side
12	19	- if @groups.present?
...	...
...	...	@@ -0,0 +1,68 @@
	1	+class EventFilter
	2	+ attr_accessor :params
	3	+
	4	+ class << self
	5	+ def default_filter
	6	+ %w{ push issues merge_requests team}
	7	+ end
	8	+
	9	+ def push
	10	+ 'push'
	11	+ end
	12	+
	13	+ def merged
	14	+ 'merged'
	15	+ end
	16	+
	17	+ def comments
	18	+ 'comments'
	19	+ end
	20	+
	21	+ def team
	22	+ 'team'
	23	+ end
	24	+ end
	25	+
	26	+ def initialize params
	27	+ @params = if params
	28	+ params.dup
	29	+ else
	30	+ []#EventFilter.default_filter
	31	+ end
	32	+ end
	33	+
	34	+ def apply_filter events
	35	+ return events unless params.present?
	36	+
	37	+ filter = params.dup
	38	+
	39	+ actions = []
	40	+ actions << Event::Pushed if filter.include? 'push'
	41	+ actions << Event::Merged if filter.include? 'merged'
	42	+
	43	+ if filter.include? 'team'
	44	+ actions << Event::Joined
	45	+ actions << Event::Left
	46	+ end
	47	+
	48	+ actions << Event::Commented if filter.include? 'comments'
	49	+
	50	+ events = events.where(action: actions)
	51	+ end
	52	+
	53	+ def options key
	54	+ filter = params.dup
	55	+
	56	+ if filter.include? key
	57	+ filter.delete key
	58	+ else
	59	+ filter << key
	60	+ end
	61	+
	62	+ filter
	63	+ end
	64	+
	65	+ def active? key
	66	+ params.include? key
	67	+ end
	68	+end
...	...