Commit 6429dc94 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'fix/49388' into 'master'

Fix metrics graphs environments dropdown

Closes #49388

See merge request gitlab-org/gitlab-ce!24441
parents c1e9b9e8 db054bc1
...@@ -143,7 +143,7 @@ export default { ...@@ -143,7 +143,7 @@ export default {
*/ */
created() { created() {
this.service = new EnvironmentsService(this.endpoint); this.service = new EnvironmentsService(this.endpoint);
this.requestData = { page: this.page, scope: this.scope }; this.requestData = { page: this.page, scope: this.scope, nested: true };
this.poll = new Poll({ this.poll = new Poll({
resource: this.service, resource: this.service,
......
...@@ -7,8 +7,8 @@ export default class EnvironmentsService { ...@@ -7,8 +7,8 @@ export default class EnvironmentsService {
} }
fetchEnvironments(options = {}) { fetchEnvironments(options = {}) {
const { scope, page } = options; const { scope, page, nested } = options;
return axios.get(this.environmentsEndpoint, { params: { scope, page } }); return axios.get(this.environmentsEndpoint, { params: { scope, page, nested } });
} }
// eslint-disable-next-line class-methods-use-this // eslint-disable-next-line class-methods-use-this
......
...@@ -20,7 +20,8 @@ export default class EnvironmentsStore { ...@@ -20,7 +20,8 @@ export default class EnvironmentsStore {
* *
* Stores the received environments. * Stores the received environments.
* *
* In the main environments endpoint, each environment has the following schema * In the main environments endpoint (with { nested: true } in params), each folder
* has the following schema:
* { name: String, size: Number, latest: Object } * { name: String, size: Number, latest: Object }
* In the endpoint to retrieve environments from each folder, the environment does * In the endpoint to retrieve environments from each folder, the environment does
* not have the `latest` key and the data is all in the root level. * not have the `latest` key and the data is all in the root level.
......
...@@ -196,13 +196,13 @@ export default { ...@@ -196,13 +196,13 @@ export default {
class="dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up" class="dropdown-menu dropdown-menu-selectable dropdown-menu-drop-up"
> >
<ul> <ul>
<li v-for="environment in store.environmentsData" :key="environment.latest.id"> <li v-for="environment in store.environmentsData" :key="environment.id">
<a <a
:href="environment.latest.metrics_path" :href="environment.metrics_path"
:class="{ 'is-active': environment.latest.name == currentEnvironmentName }" :class="{ 'is-active': environment.name == currentEnvironmentName }"
class="dropdown-item" class="dropdown-item"
> >
{{ environment.latest.name }} {{ environment.name }}
</a> </a>
</li> </li>
</ul> </ul>
......
...@@ -66,9 +66,7 @@ export default class MonitoringStore { ...@@ -66,9 +66,7 @@ export default class MonitoringStore {
} }
storeEnvironmentsData(environmentsData = []) { storeEnvironmentsData(environmentsData = []) {
this.environmentsData = environmentsData.filter( this.environmentsData = environmentsData.filter(environment => !!environment.last_deployment);
environment => !!environment.latest.last_deployment,
);
} }
getMetricsCount() { getMetricsCount() {
......
...@@ -15,6 +15,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -15,6 +15,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
push_frontend_feature_flag(:area_chart, project) push_frontend_feature_flag(:area_chart, project)
end end
# Returns all environments or all folders based on the :nested param
def index def index
@environments = project.environments @environments = project.environments
.with_state(params[:scope] || :available) .with_state(params[:scope] || :available)
...@@ -25,11 +26,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -25,11 +26,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
Gitlab::PollingInterval.set_header(response, interval: 3_000) Gitlab::PollingInterval.set_header(response, interval: 3_000)
render json: { render json: {
environments: EnvironmentSerializer environments: serialize_environments(request, response, params[:nested]),
.new(project: @project, current_user: @current_user)
.with_pagination(request, response)
.within_folders
.represent(@environments),
available_count: project.environments.available.count, available_count: project.environments.available.count,
stopped_count: project.environments.stopped.count stopped_count: project.environments.stopped.count
} }
...@@ -37,6 +34,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -37,6 +34,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
end end
end end
# Returns all environments for a given folder
# rubocop: disable CodeReuse/ActiveRecord # rubocop: disable CodeReuse/ActiveRecord
def folder def folder
folder_environments = project.environments.where(environment_type: params[:id]) folder_environments = project.environments.where(environment_type: params[:id])
...@@ -48,10 +46,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -48,10 +46,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
format.html format.html
format.json do format.json do
render json: { render json: {
environments: EnvironmentSerializer environments: serialize_environments(request, response),
.new(project: @project, current_user: @current_user)
.with_pagination(request, response)
.represent(@environments),
available_count: folder_environments.available.count, available_count: folder_environments.available.count,
stopped_count: folder_environments.stopped.count stopped_count: folder_environments.stopped.count
} }
...@@ -186,6 +181,14 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -186,6 +181,14 @@ class Projects::EnvironmentsController < Projects::ApplicationController
@environment ||= project.environments.find(params[:id]) @environment ||= project.environments.find(params[:id])
end end
def serialize_environments(request, response, nested = false)
serializer = EnvironmentSerializer
.new(project: @project, current_user: @current_user)
.with_pagination(request, response)
serializer = serializer.within_folders if nested
serializer.represent(@environments)
end
def authorize_stop_environment! def authorize_stop_environment!
access_denied! unless can?(current_user, :stop_environment, environment) access_denied! unless can?(current_user, :stop_environment, environment)
end end
......
---
title: Update metrics environment dropdown to show complete option set
merge_request: 24441
author:
type: fixed
...@@ -47,9 +47,43 @@ describe Projects::EnvironmentsController do ...@@ -47,9 +47,43 @@ describe Projects::EnvironmentsController do
let(:environments) { json_response['environments'] } 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 context 'when requesting available environments scope' do
before do before do
get :index, params: environment_params(format: :json, scope: :available) get :index, params: environment_params(format: :json, nested: true, scope: :available)
end end
it 'responds with a payload describing available environments' do it 'responds with a payload describing available environments' do
...@@ -64,16 +98,11 @@ describe Projects::EnvironmentsController do ...@@ -64,16 +98,11 @@ describe Projects::EnvironmentsController do
expect(json_response['available_count']).to eq 3 expect(json_response['available_count']).to eq 3
expect(json_response['stopped_count']).to eq 1 expect(json_response['stopped_count']).to eq 1
end 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 end
context 'when requesting stopped environments scope' do context 'when requesting stopped environments scope' do
before do before do
get :index, params: environment_params(format: :json, scope: :stopped) get :index, params: environment_params(format: :json, nested: true, scope: :stopped)
end end
it 'responds with a payload describing stopped environments' do it 'responds with a payload describing stopped environments' do
......
...@@ -6597,9 +6597,6 @@ export function convertDatesMultipleSeries(multipleSeries) { ...@@ -6597,9 +6597,6 @@ export function convertDatesMultipleSeries(multipleSeries) {
export const environmentData = [ export const environmentData = [
{ {
name: 'production',
size: 1,
latest: {
id: 34, id: 34,
name: 'production', name: 'production',
state: 'available', state: 'available',
...@@ -6617,11 +6614,7 @@ export const environmentData = [ ...@@ -6617,11 +6614,7 @@ export const environmentData = [
id: 127, id: 127,
}, },
}, },
},
{ {
name: 'review',
size: 1,
latest: {
id: 35, id: 35,
name: 'review/noop-branch', name: 'review/noop-branch',
state: 'available', state: 'available',
...@@ -6639,16 +6632,11 @@ export const environmentData = [ ...@@ -6639,16 +6632,11 @@ export const environmentData = [
id: 128, id: 128,
}, },
}, },
},
{ {
name: 'no-deployment',
size: 1,
latest: {
id: 36, id: 36,
name: 'no-deployment/noop-branch', name: 'no-deployment/noop-branch',
state: 'available', state: 'available',
created_at: '2018-07-04T18:39:41.702Z', created_at: '2018-07-04T18:39:41.702Z',
updated_at: '2018-07-04T18:44:54.010Z', updated_at: '2018-07-04T18:44:54.010Z',
}, },
},
]; ];
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment