Merge branch '297340-update-endpoint-to-request-monitor-logs' into 'master'

Improve LCP for Monitor_Logs

See merge request gitlab-org/gitlab!60100

app/assets/javascripts/logs/stores/actions.js

@@ -127,7 +127,7 @@ export const fetchEnvironments = ({ commit, dispatch }, environmentsPath) => {
   return axios
     .get(environmentsPath)
     .then(({ data }) => {
-      commit(types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS, data.environments);
+      commit(types.RECEIVE_ENVIRONMENTS_DATA_SUCCESS, data);
       dispatch('fetchLogs', tracking.ENVIRONMENT_SELECTED);
     })
     .catch(() => {

app/helpers/environments_helper.rb

@@ -34,7 +34,7 @@ module EnvironmentsHelper
   def environment_logs_data(project, environment)
     {
       "environment_name": environment.name,
-      "environments_path": project_environments_path(project, format: :json),
+      "environments_path": api_v4_projects_environments_path(id: project.id),
       "environment_id": environment.id,
       "cluster_applications_documentation_path" => help_page_path('user/clusters/applications.md', anchor: 'elastic-stack'),
       "clusters_path": project_clusters_path(project, format: :json)

ee/spec/helpers/ee/environments_helper_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe EnvironmentsHelper do
     it 'returns environment parameters data' do
       expect(subject).to include(
         "environment_name": environment.name,
-        "environments_path": project_environments_path(project, format: :json)
+        "environments_path": api_v4_projects_environments_path(id: project.id)
       )
     end
 

spec/frontend/logs/stores/actions_spec.js

@@ -191,7 +191,7 @@ describe('Logs Store actions', () => {
     });
 
     it('should commit RECEIVE_ENVIRONMENTS_DATA_SUCCESS mutation on correct data', () => {
-      mock.onGet(mockEnvironmentsEndpoint).replyOnce(200, { environments: mockEnvironments });
+      mock.onGet(mockEnvironmentsEndpoint).replyOnce(200, mockEnvironments);
       return testAction(
         fetchEnvironments,
         mockEnvironmentsEndpoint,

spec/helpers/environments_helper_spec.rb

@@ -191,7 +191,7 @@ RSpec.describe EnvironmentsHelper do
     it 'returns logs data' do
       expected_data = {
         "environment_name": environment.name,
-        "environments_path": project_environments_path(project, format: :json),
+        "environments_path": api_v4_projects_environments_path(id: project.id),
         "environment_id": environment.id,
         "cluster_applications_documentation_path" => help_page_path('user/clusters/applications.md', anchor: 'elastic-stack'),
         "clusters_path": project_clusters_path(project, format: :json)