Skip to content
代码片段 群组 项目
提交 c6452cd4 编辑于 作者: Felipe Artur's avatar Felipe Artur 提交者: Jan Provaznik
浏览文件

Allow to select project value stream using URL parameter

Select project value stream using value_stream_id
parameter on URL.

Changelog: fixed
EE: true
上级 2a887184
No related branches found
No related tags found
无相关合并请求
......@@ -6,10 +6,10 @@ class Projects::CycleAnalyticsController < Projects::ApplicationController
include CycleAnalyticsParams
include GracefulTimeoutHandling
include ProductAnalyticsTracking
include Gitlab::Utils::StrongMemoize
extend ::Gitlab::Utils::Override
before_action :authorize_read_cycle_analytics!
before_action :load_value_stream, only: :show
track_event :show,
name: 'p_analytics_valuestream',
......@@ -51,12 +51,13 @@ def show
override :all_cycle_analytics_params
def all_cycle_analytics_params
super.merge({ namespace: @project.project_namespace, value_stream: @value_stream })
super.merge({ namespace: @project.project_namespace, value_stream: value_stream })
end
def load_value_stream
@value_stream = Analytics::CycleAnalytics::ValueStream.build_default_value_stream(@project.project_namespace)
def value_stream
Analytics::CycleAnalytics::ValueStream.build_default_value_stream(@project.project_namespace)
end
strong_memoize_attr :value_stream
def cycle_analytics_json
{
......@@ -74,3 +75,5 @@ def tracking_project_source
project
end
end
Projects::CycleAnalyticsController.prepend_mod
# frozen_string_literal: true
module EE
module Projects
module CycleAnalyticsController
include ::Gitlab::Utils::StrongMemoize
extend ::Gitlab::Utils::Override
override :value_stream
def value_stream
return super unless params[:value_stream_id]
project.project_namespace.value_streams.find_by_id(params[:value_stream_id])
end
strong_memoize_attr :value_stream
end
end
end
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe Projects::CycleAnalyticsController, feature_category: :product_analytics do
let_it_be(:project) { create(:project) }
let_it_be(:user) { create(:user) }
before do
sign_in(user)
project.add_maintainer(user)
end
context 'with project and value stream id params' do
let(:value_stream) { create(:cycle_analytics_value_stream, namespace: project.project_namespace) }
it 'builds request params with project and value stream' do
expect_next_instance_of(Gitlab::Analytics::CycleAnalytics::RequestParams) do |instance|
expect(instance).to have_attributes(namespace: project.project_namespace, value_stream: value_stream)
end
get project_cycle_analytics_path(project, value_stream_id: value_stream)
end
end
end
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册