From 0d5a0a487a5defdabb49f5296bd0db0fe056ebd9 Mon Sep 17 00:00:00 2001
From: Luke Bennett <lbennett@gitlab.com>
Date: Thu, 13 Dec 2018 05:13:59 +0000
Subject: [PATCH] Add "MRs merged per week by priority" team chart

---
 app/assets/javascripts/application/teams.coffee | 8 ++++++--
 app/views/teams/show.haml                       | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/application/teams.coffee b/app/assets/javascripts/application/teams.coffee
index 828c994..1d3a177 100644
--- a/app/assets/javascripts/application/teams.coffee
+++ b/app/assets/javascripts/application/teams.coffee
@@ -50,15 +50,17 @@ TeamMissedDeliverablesPerMilestoneChart = (element) ->
     @query_strings.IssuesScope
   ))
   @charts.BarChart(element, query.query_string, query.view_string)
-MRsMergedPerWeekChart = (element) ->
+MRsMergedPerWeekChart = (element, collection_labels = @query_strings.MergeRequestCategories) ->
   query = @queries.ScopedQuery(@queries.IssuablesMergedPerWeekQuery(
     'Merged',
     team_label_query_segment(null),
-    @query_strings.MergeRequestCategories,
+    collection_labels,
     @query_strings.MergeRequestsScope,
     @query_strings.TeamMRWeeks
   ))
   @charts.StackedBarChart(element, query.query_string, query.view_string)
+MrsMergedPerWeekByPriorityChart = (element) ->
+  MRsMergedPerWeekChart(element, @query_strings.Priorities)
 
 $(document).ready () ->
   if document.getElementById('team-bugs-severity-number')
@@ -75,3 +77,5 @@ $(document).ready () ->
     TeamMissedDeliverablesPerMilestoneChart(document.getElementById('team-missed-deliverables-per-milestone'))
   if document.getElementById('team-mrs-per-week')
     MRsMergedPerWeekChart(document.getElementById('team-mrs-per-week'))
+  if document.getElementById('team-mrs-per-week-by-priority')
+    MrsMergedPerWeekByPriorityChart(document.getElementById('team-mrs-per-week-by-priority'), )
diff --git a/app/views/teams/show.haml b/app/views/teams/show.haml
index 6e4a353..c64728a 100644
--- a/app/views/teams/show.haml
+++ b/app/views/teams/show.haml
@@ -44,6 +44,11 @@
         .card-header
           %h3.card-title Weekly Throughput
         %canvas#team-mrs-per-week
+    .col-lg-6
+      .card
+        .card-header
+          %h3.card-title Weekly Throughput by Priority
+        %canvas#team-mrs-per-week-by-priority
 
 - if @source.is_a? Group
   = render partial: 'shared/project_level_links', locals: { group: @group, name: 'team', link: method(:group_project_team_path), id: @team.downcase }
-- 
GitLab