Add latest changes from gitlab-org/gitlab@master

1 files changed, 54 insertions, 48 deletions

diff --git a/lib/gitlab/analytics/cycle_analytics/request_params.rb b/lib/gitlab/analytics/cycle_analytics/request_params.rb
index 2df3680db5f..6452739afd3 100644
--- a/lib/gitlab/analytics/cycle_analytics/request_params.rb
+++ b/lib/gitlab/analytics/cycle_analytics/request_params.rb
@@ -38,13 +38,12 @@ module Gitlab
 
         attribute :created_after, :datetime
         attribute :created_before, :datetime
-        attribute :group
+        attribute :namespace
         attribute :current_user
         attribute :value_stream
         attribute :sort
         attribute :direction
         attribute :page
-        attribute :project
         attribute :stage_id
         attribute :end_event_filter
 
@@ -66,10 +65,6 @@ module Gitlab
           self.end_event_filter ||= Gitlab::Analytics::CycleAnalytics::BaseQueryBuilder::DEFAULT_END_EVENT_FILTER
         end
 
-        def project_ids
-          Array(@project_ids)
-        end
-
         def to_data_collector_params
           {
             current_user: current_user,
@@ -86,12 +81,9 @@ module Gitlab
 
         def to_data_attributes
           {}.tap do |attrs|
-            attrs[:aggregation] = aggregation_attributes if group
-            attrs[:group] = group_data_attributes if group
             attrs[:value_stream] = value_stream_data_attributes.to_json if value_stream
             attrs[:created_after] = created_after.to_date.iso8601
             attrs[:created_before] = created_before.to_date.iso8601
-            attrs[:projects] = group_projects(project_ids) if group && project_ids.present?
             attrs[:labels] = label_name.to_json if label_name.present?
             attrs[:assignees] = assignee_username.to_json if assignee_username.present?
             attrs[:author] = author_username if author_username.present?
@@ -99,35 +91,63 @@ module Gitlab
             attrs[:sort] = sort if sort.present?
             attrs[:direction] = direction if direction.present?
             attrs[:stage] = stage_data_attributes.to_json if stage_id.present?
+            attrs[:namespace] = namespace_attributes
+            attrs[:enable_tasks_by_type_chart] = false
+            attrs[:default_stages] = Gitlab::Analytics::CycleAnalytics::DefaultStages.all.map do |stage_params|
+              ::Analytics::CycleAnalytics::StagePresenter.new(stage_params)
+            end.to_json
+
+            attrs.merge!(foss_project_level_params, resource_paths)
           end
         end
 
+        def project_ids
+          Array(@project_ids)
+        end
+
         private
 
-        def use_aggregated_backend?
-          # for now it's only available on the group-level
-          group.present?
-        end
+        delegate :url_helpers, to: Gitlab::Routing
+
+        def foss_project_level_params
+          return {} unless project
 
-        def aggregation_attributes
           {
-            enabled: aggregation.enabled.to_s,
-            last_run_at: aggregation.last_incremental_run_at&.iso8601,
-            next_run_at: aggregation.estimated_next_run_at&.iso8601
+            project_id: project.id,
+            group_path: project.group&.path,
+            request_path: url_helpers.project_cycle_analytics_path(project),
+            full_path: project.full_path
           }
         end
 
-        def aggregation
-          @aggregation ||= ::Analytics::CycleAnalytics::Aggregation.safe_create_for_namespace(group)
+        def resource_paths
+          helpers = ActionController::Base.helpers
+
+          {}.tap do |paths|
+            paths[:empty_state_svg_path] = helpers.image_path("illustrations/analytics/cycle-analytics-empty-chart.svg")
+            paths[:no_data_svg_path] = helpers.image_path("illustrations/analytics/cycle-analytics-empty-chart.svg")
+            paths[:no_access_svg_path] = helpers.image_path("illustrations/analytics/no-access.svg")
+
+            if project
+              paths[:milestones_path] = url_helpers.project_milestones_path(project, format: :json)
+              paths[:labels_path] = url_helpers.project_labels_path(project, format: :json)
+            end
+          end
+        end
+
+        # FOSS version doesn't use the aggregated VSA backend
+        def use_aggregated_backend?
+          false
         end
 
-        def group_data_attributes
+        def namespace_attributes
+          container = project || namespace
+          return {} unless container
+
           {
-            id: group.id,
-            namespace_id: group.id,
-            name: group.name,
-            full_path: group.full_path,
-            avatar_url: group.avatar_url
+            name: container.name,
+            full_path: container.full_path,
+            avatar_url: container.avatar_url
           }
         end
 
@@ -139,28 +159,6 @@ module Gitlab
           }
         end
 
-        def group_projects(project_ids)
-          GroupProjectsFinder.new(
-            group: group,
-            current_user: current_user,
-            options: { include_subgroups: true },
-            project_ids_relation: project_ids
-          )
-            .execute
-            .with_route
-            .map { |project| project_data_attributes(project) }
-            .to_json
-        end
-
-        def project_data_attributes(project)
-          {
-            id: project.to_gid.to_s,
-            name: project.name,
-            path_with_namespace: project.path_with_namespace,
-            avatar_url: project.avatar_url
-          }
-        end
-
         def stage_data_attributes
           return unless stage
 
@@ -196,10 +194,18 @@ module Gitlab
           return unless value_stream
 
           strong_memoize(:stage) do
-            ::Analytics::CycleAnalytics::StageFinder.new(parent: project&.project_namespace || group, stage_id: stage_id).execute if stage_id
+            ::Analytics::CycleAnalytics::StageFinder.new(parent: namespace, stage_id: stage_id).execute if stage_id
+          end
+        end
+
+        def project
+          strong_memoize(:project) do
+            namespace.project if namespace.is_a?(Namespaces::ProjectNamespace)
           end
         end
       end
     end
   end
 end
+
+Gitlab::Analytics::CycleAnalytics::RequestParams.prepend_mod_with('Gitlab::Analytics::CycleAnalytics::RequestParams')