4 files changed, 29 insertions, 12 deletions
diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb
index b705258f133..b46e3eb3bc3 100644
--- a/app/helpers/projects/alert_management_helper.rb
+++ b/app/helpers/projects/alert_management_helper.rb
@@ -10,6 +10,7 @@ module Projects::AlertManagementHelper
       'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg'),
       'user-can-enable-alert-management' => can?(current_user, :admin_operations, project).to_s,
       'alert-management-enabled' => alert_management_enabled?(project).to_s,
+      'has-managed-prometheus' => has_managed_prometheus?(project).to_s,
       'text-query': params[:search],
       'assignee-username-query': params[:assignee_username]
     }
@@ -27,6 +28,10 @@ module Projects::AlertManagementHelper
 
   private
 
+  def has_managed_prometheus?(project)
+    project.prometheus_service&.prometheus_available? == true
+  end
+
   def alert_management_enabled?(project)
     !!(
       project.alert_management_alerts.any? ||
diff --git a/app/helpers/projects/incidents_helper.rb b/app/helpers/projects/incidents_helper.rb
index 63504cb55b9..dde2980817f 100644
--- a/app/helpers/projects/incidents_helper.rb
+++ b/app/helpers/projects/incidents_helper.rb
@@ -16,4 +16,4 @@ module Projects::IncidentsHelper
   end
 end
 
-Projects::IncidentsHelper.prepend_if_ee('EE::Projects::IncidentsHelper')
+Projects::IncidentsHelper.prepend_mod_with('Projects::IncidentsHelper')
diff --git a/app/helpers/projects/project_members_helper.rb b/app/helpers/projects/project_members_helper.rb
index 662afbcfd25..fa68bbad135 100644
--- a/app/helpers/projects/project_members_helper.rb
+++ b/app/helpers/projects/project_members_helper.rb
@@ -27,29 +27,41 @@ module Projects::ProjectMembersHelper
     project.group.has_owner?(current_user)
   end
 
-  def project_group_links_data_json(group_links)
-    GroupLink::ProjectGroupLinkSerializer.new.represent(group_links, { current_user: current_user }).to_json
+  def project_members_list_data_json(project, members, pagination = {})
+    project_members_list_data(project, members, pagination).to_json
   end
 
-  def project_members_data_json(project, members)
-    MemberSerializer.new.represent(members, { current_user: current_user, group: project.group, source: project }).to_json
+  def project_group_links_list_data_json(project, group_links)
+    project_group_links_list_data(project, group_links).to_json
   end
 
-  def project_members_list_data_attributes(project, members)
+  private
+
+  def project_members_serialized(project, members)
+    MemberSerializer.new.represent(members, { current_user: current_user, group: project.group, source: project })
+  end
+
+  def project_group_links_serialized(group_links)
+    GroupLink::ProjectGroupLinkSerializer.new.represent(group_links, { current_user: current_user })
+  end
+
+  def project_members_list_data(project, members, pagination)
     {
-      members: project_members_data_json(project, members),
+      members: project_members_serialized(project, members),
+      pagination: members_pagination_data(members, pagination),
       member_path: project_project_member_path(project, ':id'),
       source_id: project.id,
-      can_manage_members: can_manage_project_members?(project).to_s
+      can_manage_members: can_manage_project_members?(project)
     }
   end
 
-  def project_group_links_list_data_attributes(project, group_links)
+  def project_group_links_list_data(project, group_links)
     {
-      members: project_group_links_data_json(group_links),
+      members: project_group_links_serialized(group_links),
+      pagination: members_pagination_data(group_links),
       member_path: project_group_link_path(project, ':id'),
       source_id: project.id,
-      can_manage_members: can_manage_project_members?(project).to_s
+      can_manage_members: can_manage_project_members?(project)
     }
   end
 end
diff --git a/app/helpers/projects/security/configuration_helper.rb b/app/helpers/projects/security/configuration_helper.rb
index 265d46cbc41..dee106ab3ae 100644
--- a/app/helpers/projects/security/configuration_helper.rb
+++ b/app/helpers/projects/security/configuration_helper.rb
@@ -10,4 +10,4 @@ module Projects
   end
 end
 
-::Projects::Security::ConfigurationHelper.prepend_if_ee('::EE::Projects::Security::ConfigurationHelper')
+::Projects::Security::ConfigurationHelper.prepend_mod_with('Projects::Security::ConfigurationHelper')