Merge branch 'fix/49388' into 'master'

Fix metrics graphs environments dropdown

Closes #49388

See merge request gitlab-org/gitlab-ce!24441

2 files changed, 70 insertions, 53 deletions

diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index 94fb85f217c..a4d494a820f 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -47,9 +47,43 @@ describe Projects::EnvironmentsController do
 
       let(:environments) { json_response['environments'] }
 
+      context 'with default parameters' do
+        before do
+          get :index, params: environment_params(format: :json)
+        end
+
+        it 'responds with a flat payload describing available environments' do
+          expect(environments.count).to eq 3
+          expect(environments.first['name']).to eq 'production'
+          expect(environments.second['name']).to eq 'staging/review-1'
+          expect(environments.third['name']).to eq 'staging/review-2'
+          expect(json_response['available_count']).to eq 3
+          expect(json_response['stopped_count']).to eq 1
+        end
+
+        it 'sets the polling interval header' do
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response.headers['Poll-Interval']).to eq("3000")
+        end
+      end
+
+      context 'when a folder-based nested structure is requested' do
+        before do
+          get :index, params: environment_params(format: :json, nested: true)
+        end
+
+        it 'responds with a payload containing the latest environment for each folder' do
+          expect(environments.count).to eq 2
+          expect(environments.first['name']).to eq 'production'
+          expect(environments.second['name']).to eq 'staging'
+          expect(environments.second['size']).to eq 2
+          expect(environments.second['latest']['name']).to eq 'staging/review-2'
+        end
+      end
+
       context 'when requesting available environments scope' do
         before do
-          get :index, params: environment_params(format: :json, scope: :available)
+          get :index, params: environment_params(format: :json, nested: true, scope: :available)
         end
 
         it 'responds with a payload describing available environments' do
@@ -64,16 +98,11 @@ describe Projects::EnvironmentsController do
           expect(json_response['available_count']).to eq 3
           expect(json_response['stopped_count']).to eq 1
         end
-
-        it 'sets the polling interval header' do
-          expect(response).to have_gitlab_http_status(:ok)
-          expect(response.headers['Poll-Interval']).to eq("3000")
-        end
       end
 
       context 'when requesting stopped environments scope' do
         before do
-          get :index, params: environment_params(format: :json, scope: :stopped)
+          get :index, params: environment_params(format: :json, nested: true, scope: :stopped)
         end
 
         it 'responds with a payload describing stopped environments' do
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js
index 18ad9843d22..b4e2cd75d47 100644
--- a/spec/javascripts/monitoring/mock_data.js
+++ b/spec/javascripts/monitoring/mock_data.js
@@ -6597,58 +6597,46 @@ export function convertDatesMultipleSeries(multipleSeries) {
 
 export const environmentData = [
   {
+    id: 34,
     name: 'production',
-    size: 1,
-    latest: {
-      id: 34,
-      name: 'production',
-      state: 'available',
-      external_url: 'http://root-autodevops-deploy.my-fake-domain.com',
-      environment_type: null,
-      stop_action: false,
-      metrics_path: '/root/hello-prometheus/environments/34/metrics',
-      environment_path: '/root/hello-prometheus/environments/34',
-      stop_path: '/root/hello-prometheus/environments/34/stop',
-      terminal_path: '/root/hello-prometheus/environments/34/terminal',
-      folder_path: '/root/hello-prometheus/environments/folders/production',
-      created_at: '2018-06-29T16:53:38.301Z',
-      updated_at: '2018-06-29T16:57:09.825Z',
-      last_deployment: {
-        id: 127,
-      },
+    state: 'available',
+    external_url: 'http://root-autodevops-deploy.my-fake-domain.com',
+    environment_type: null,
+    stop_action: false,
+    metrics_path: '/root/hello-prometheus/environments/34/metrics',
+    environment_path: '/root/hello-prometheus/environments/34',
+    stop_path: '/root/hello-prometheus/environments/34/stop',
+    terminal_path: '/root/hello-prometheus/environments/34/terminal',
+    folder_path: '/root/hello-prometheus/environments/folders/production',
+    created_at: '2018-06-29T16:53:38.301Z',
+    updated_at: '2018-06-29T16:57:09.825Z',
+    last_deployment: {
+      id: 127,
     },
   },
   {
-    name: 'review',
-    size: 1,
-    latest: {
-      id: 35,
-      name: 'review/noop-branch',
-      state: 'available',
-      external_url: 'http://root-autodevops-deploy-review-noop-branc-die93w.my-fake-domain.com',
-      environment_type: 'review',
-      stop_action: true,
-      metrics_path: '/root/hello-prometheus/environments/35/metrics',
-      environment_path: '/root/hello-prometheus/environments/35',
-      stop_path: '/root/hello-prometheus/environments/35/stop',
-      terminal_path: '/root/hello-prometheus/environments/35/terminal',
-      folder_path: '/root/hello-prometheus/environments/folders/review',
-      created_at: '2018-07-03T18:39:41.702Z',
-      updated_at: '2018-07-03T18:44:54.010Z',
-      last_deployment: {
-        id: 128,
-      },
+    id: 35,
+    name: 'review/noop-branch',
+    state: 'available',
+    external_url: 'http://root-autodevops-deploy-review-noop-branc-die93w.my-fake-domain.com',
+    environment_type: 'review',
+    stop_action: true,
+    metrics_path: '/root/hello-prometheus/environments/35/metrics',
+    environment_path: '/root/hello-prometheus/environments/35',
+    stop_path: '/root/hello-prometheus/environments/35/stop',
+    terminal_path: '/root/hello-prometheus/environments/35/terminal',
+    folder_path: '/root/hello-prometheus/environments/folders/review',
+    created_at: '2018-07-03T18:39:41.702Z',
+    updated_at: '2018-07-03T18:44:54.010Z',
+    last_deployment: {
+      id: 128,
     },
   },
   {
-    name: 'no-deployment',
-    size: 1,
-    latest: {
-      id: 36,
-      name: 'no-deployment/noop-branch',
-      state: 'available',
-      created_at: '2018-07-04T18:39:41.702Z',
-      updated_at: '2018-07-04T18:44:54.010Z',
-    },
+    id: 36,
+    name: 'no-deployment/noop-branch',
+    state: 'available',
+    created_at: '2018-07-04T18:39:41.702Z',
+    updated_at: '2018-07-04T18:44:54.010Z',
   },
 ];