Merge branch '11355-make-cluster-data-presenter' into 'master'

Move cluster_health_data from helper to presenter

Closes #11355

See merge request gitlab-org/gitlab!29056

app/presenters/clusters/cluster_presenter.rb

@@ -89,3 +89,5 @@ module Clusters
     end
   end
 end
+
+Clusters::ClusterPresenter.prepend_if_ee('EE::Clusters::ClusterPresenter')

ee/app/helpers/ee/clusters_helper.rb

@@ -12,21 +12,5 @@ module EE
     def show_cluster_health_graphs?
       clusterable.feature_available?(:cluster_health)
     end
-
-    def cluster_health_data(cluster)
-      {
-        'clusters-path': clusterable.index_path,
-        'metrics-endpoint': clusterable.metrics_cluster_path(cluster, format: :json),
-        'dashboard-endpoint': clusterable.metrics_dashboard_path(cluster),
-        'documentation-path': help_page_path('user/project/clusters/index', anchor: 'monitoring-your-kubernetes-cluster-ultimate'),
-        'empty-getting-started-svg-path': image_path('illustrations/monitoring/getting_started.svg'),
-        'empty-loading-svg-path': image_path('illustrations/monitoring/loading.svg'),
-        'empty-no-data-svg-path': image_path('illustrations/monitoring/no_data.svg'),
-        'empty-unable-to-connect-svg-path': image_path('illustrations/monitoring/unable_to_connect.svg'),
-        'settings-path': '',
-        'project-path': '',
-        'tags-path': ''
-      }
-    end
   end
 end

ee/app/presenters/ee/clusters/cluster_presenter.rb

+# frozen_string_literal: true
+
+module EE
+  module Clusters
+    module ClusterPresenter
+      def health_data(clusterable)
+        {
+          'clusters-path': clusterable.index_path,
+          'metrics-endpoint': clusterable.metrics_cluster_path(cluster, format: :json),
+          'dashboard-endpoint': clusterable.metrics_dashboard_path(cluster),
+          'documentation-path': help_page_path('user/project/clusters/index', anchor: 'monitoring-your-kubernetes-cluster-ultimate'),
+          'empty-getting-started-svg-path': image_path('illustrations/monitoring/getting_started.svg'),
+          'empty-loading-svg-path': image_path('illustrations/monitoring/loading.svg'),
+          'empty-no-data-svg-path': image_path('illustrations/monitoring/no_data.svg'),
+          'empty-unable-to-connect-svg-path': image_path('illustrations/monitoring/unable_to_connect.svg'),
+          'settings-path': '',
+          'project-path': '',
+          'tags-path': ''
+        }
+      end
+
+      private
+
+      def image_path(path)
+        ActionController::Base.helpers.image_path(path)
+      end
+    end
+  end
+end

ee/app/views/clusters/clusters/_health.html.haml

 %section.settings.no-animate.expanded.cluster-health-graphs.qa-cluster-health-section#cluster-health
   - if @cluster&.application_prometheus_available?
-    #prometheus-graphs{ data: cluster_health_data(@cluster).merge({ "alerts-endpoint" => ('/' if Feature.enabled?(:prometheus_computed_alerts)),
+    #prometheus-graphs{ data: @cluster.health_data(clusterable).merge({ "alerts-endpoint" => ('/' if Feature.enabled?(:prometheus_computed_alerts)),
     "prometheus-alerts-available" => ('true' if Feature.enabled?(:prometheus_computed_alerts)) }) }
 
   - else

ee/spec/helpers/ee/clusters_helper_spec.rb

@@ -58,51 +58,4 @@ describe ClustersHelper do
       it_behaves_like 'feature availablilty', :cluster_health
     end
   end
-
-  describe '#cluster_health_data' do
-    shared_examples 'cluster health data' do
-      let(:user) { create(:user) }
-      let(:cluster_presenter) { cluster.present(current_user: user) }
-
-      let(:clusterable_presenter) do
-        ClusterablePresenter.fabricate(clusterable, current_user: user)
-      end
-
-      subject { helper.cluster_health_data(cluster_presenter) }
-
-      before do
-        allow(helper).to receive(:clusterable).and_return(clusterable_presenter)
-      end
-
-      it do
-        is_expected.to match(
-          'clusters-path': clusterable_presenter.index_path,
-          'metrics-endpoint': clusterable_presenter.metrics_cluster_path(cluster, format: :json),
-          'dashboard-endpoint': clusterable_presenter.metrics_dashboard_path(cluster),
-          'documentation-path': help_page_path('user/project/clusters/index', anchor: 'monitoring-your-kubernetes-cluster-ultimate'),
-          'empty-getting-started-svg-path': match_asset_path('/assets/illustrations/monitoring/getting_started.svg'),
-          'empty-loading-svg-path': match_asset_path('/assets/illustrations/monitoring/loading.svg'),
-          'empty-no-data-svg-path': match_asset_path('/assets/illustrations/monitoring/no_data.svg'),
-          'empty-unable-to-connect-svg-path': match_asset_path('/assets/illustrations/monitoring/unable_to_connect.svg'),
-          'settings-path': '',
-          'project-path': '',
-          'tags-path': ''
-        )
-      end
-    end
-
-    context 'with project cluster' do
-      let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
-      let(:clusterable) { cluster.project }
-
-      it_behaves_like 'cluster health data'
-    end
-
-    context 'with group cluster' do
-      let(:cluster) { create(:cluster, :group, :provided_by_gcp) }
-      let(:clusterable) { cluster.group }
-
-      it_behaves_like 'cluster health data'
-    end
-  end
 end

ee/spec/presenters/ee/clusters/cluster_presenter_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Clusters::ClusterPresenter do
+  include Gitlab::Routing.url_helpers
+
+  describe '#health_data' do
+    shared_examples 'cluster health data' do
+      let(:user) { create(:user) }
+      let(:cluster_presenter) { cluster.present(current_user: user) }
+
+      let(:clusterable_presenter) do
+        ClusterablePresenter.fabricate(clusterable, current_user: user)
+      end
+
+      subject { cluster_presenter.health_data(clusterable_presenter) }
+
+      it do
+        is_expected.to match(
+          'clusters-path': clusterable_presenter.index_path,
+          'metrics-endpoint': clusterable_presenter.metrics_cluster_path(cluster, format: :json),
+          'dashboard-endpoint': clusterable_presenter.metrics_dashboard_path(cluster),
+          'documentation-path': help_page_path('user/project/clusters/index', anchor: 'monitoring-your-kubernetes-cluster-ultimate'),
+          'empty-getting-started-svg-path': match_asset_path('/assets/illustrations/monitoring/getting_started.svg'),
+          'empty-loading-svg-path': match_asset_path('/assets/illustrations/monitoring/loading.svg'),
+          'empty-no-data-svg-path': match_asset_path('/assets/illustrations/monitoring/no_data.svg'),
+          'empty-unable-to-connect-svg-path': match_asset_path('/assets/illustrations/monitoring/unable_to_connect.svg'),
+          'settings-path': '',
+          'project-path': '',
+          'tags-path': ''
+        )
+      end
+    end
+
+    context 'with project cluster' do
+      let(:cluster) { create(:cluster, :project, :provided_by_gcp) }
+      let(:clusterable) { cluster.project }
+
+      it_behaves_like 'cluster health data'
+    end
+
+    context 'with group cluster' do
+      let(:cluster) { create(:cluster, :group, :provided_by_gcp) }
+      let(:clusterable) { cluster.group }
+
+      it_behaves_like 'cluster health data'
+    end
+  end
+end