Merge branch 'fix/cycle-analytics-events-limit' into 'master'

Add limit to the number of events showed in cycle analytics

See merge request !7743

5 files changed, 63 insertions, 2 deletions

diff --git a/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6 b/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
index 513298ba4e7..8652479e7bf 100644
--- a/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
+++ b/app/assets/javascripts/cycle_analytics/components/stage_plan_component.js.es6
@@ -13,6 +13,12 @@
       <div>
         <div class="events-description">
           {{ stage.description }}
+          <span v-if="items.length === 50" class="events-info pull-right">
+            <i class="fa fa-warning has-tooltip"
+              title="Limited to showing 50 events at most"
+              data-placement="top"></i>
+            Showing 50 events
+          </span>
         </div>
         <ul class="stage-event-list">
           <li v-for="commit in items" class="stage-event-item">
diff --git a/app/assets/stylesheets/pages/cycle_analytics.scss b/app/assets/stylesheets/pages/cycle_analytics.scss
index cda069e6c0e..5b777953fb0 100644
--- a/app/assets/stylesheets/pages/cycle_analytics.scss
+++ b/app/assets/stylesheets/pages/cycle_analytics.scss
@@ -284,7 +284,11 @@
 
     .events-description {
       line-height: 65px;
-      padding-left: $gl-padding;
+      padding: 0 $gl-padding;
+    }
+
+    .events-info {
+      color: $gl-text-color-secondary;
     }
   }
 
diff --git a/changelogs/unreleased/fix-cycle-analytics-events-limit.yml b/changelogs/unreleased/fix-cycle-analytics-events-limit.yml
new file mode 100644
index 00000000000..152b37ca430
--- /dev/null
+++ b/changelogs/unreleased/fix-cycle-analytics-events-limit.yml
@@ -0,0 +1,4 @@
+---
+title: Add limit to the number of events showed in cycle analytics
+merge_request: 
+author: 
diff --git a/lib/gitlab/cycle_analytics/base_event_fetcher.rb b/lib/gitlab/cycle_analytics/base_event_fetcher.rb
index 0d8791d396b..ab115afcaa5 100644
--- a/lib/gitlab/cycle_analytics/base_event_fetcher.rb
+++ b/lib/gitlab/cycle_analytics/base_event_fetcher.rb
@@ -5,6 +5,8 @@ module Gitlab
 
       attr_reader :projections, :query, :stage, :order
 
+      MAX_EVENTS = 50
+
       def initialize(project:, stage:, options:)
         @project = project
         @stage = stage
@@ -38,7 +40,7 @@ module Gitlab
       def events_query
         diff_fn = subtract_datetimes_diff(base_query, @options[:start_time_attrs], @options[:end_time_attrs])
 
-        base_query.project(extract_diff_epoch(diff_fn).as('total_time'), *projections).order(order.desc)
+        base_query.project(extract_diff_epoch(diff_fn).as('total_time'), *projections).order(order.desc).take(MAX_EVENTS)
       end
 
       def default_order
diff --git a/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb b/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb
new file mode 100644
index 00000000000..c455cd9b942
--- /dev/null
+++ b/spec/lib/gitlab/cycle_analytics/base_event_fetcher_spec.rb
@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Gitlab::CycleAnalytics::BaseEventFetcher do
+  let(:max_events) { 2 }
+  let(:project) { create(:project) }
+  let(:user) { create(:user, :admin) }
+  let(:start_time_attrs) { Issue.arel_table[:created_at] }
+  let(:end_time_attrs) { [Issue::Metrics.arel_table[:first_associated_with_milestone_at]] }
+  let(:options) do 
+    { start_time_attrs: start_time_attrs,
+      end_time_attrs: end_time_attrs,
+      from: 30.days.ago } 
+  end
+
+  subject do
+    described_class.new(project: project,
+                        stage: :issue,
+                        options: options).fetch
+  end
+
+  before do
+    allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return(Issue.all)
+    allow_any_instance_of(Gitlab::CycleAnalytics::BaseEventFetcher).to receive(:serialize) do |event|
+      event
+    end
+
+    stub_const('Gitlab::CycleAnalytics::BaseEventFetcher::MAX_EVENTS', max_events)
+
+    setup_events(count: 3)
+  end
+
+  it 'limits the rows to the max number' do
+    expect(subject.count).to eq(max_events)
+  end
+
+  def setup_events(count:)
+    count.times do
+      issue = create(:issue, project: project, created_at: 2.days.ago)
+      milestone = create(:milestone, project: project)
+
+      issue.update(milestone: milestone)
+      create_merge_request_closing_issue(issue)
+    end
+  end
+end