diff options
| author | Jose Vargas <jvargas@gitlab.com> | 2019-04-02 14:02:29 -0600 |
|---|---|---|
| committer | Jose Vargas <jvargas@gitlab.com> | 2019-04-04 14:53:03 -0600 |
| commit | a6f9f79b73ec1893e00a41ae20c3e17bd33cccb4 (patch) | |
| tree | 24f0196e2e546c3a711cfe4c8247883ad7338c48 /app | |
| parent | 217e9e4db1a81125a06830b9dbf270a15fb9c284 (diff) | |
| download | gitlab-ce-a6f9f79b73ec1893e00a41ae20c3e17bd33cccb4.tar.gz | |
Changed the feature flag usage
In order for the dashboard component not to fail, the feature flag
is now required by default
Diffstat (limited to 'app')
4 files changed, 7 insertions, 15 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 21105d886fb..529f82b4ae1 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -89,6 +89,10 @@ export default { type: String, required: true, }, + showTimeWindowDropdown: { + type: Boolean, + required: true, + }, }, data() { return { @@ -99,11 +103,6 @@ export default { selectedTimeWindow: '', }; }, - computed: { - showTimeWindowDropdown() { - return gon.features.metricsTimeWindow; - }, - }, created() { this.service = new MonitoringService({ metricsEndpoint: this.metricsEndpoint, diff --git a/app/assets/javascripts/monitoring/monitoring_bundle.js b/app/assets/javascripts/monitoring/monitoring_bundle.js index 9d78b5ea110..2b4ddd7afbc 100644 --- a/app/assets/javascripts/monitoring/monitoring_bundle.js +++ b/app/assets/javascripts/monitoring/monitoring_bundle.js @@ -14,6 +14,7 @@ export default () => { props: { ...el.dataset, hasMetrics: parseBoolean(el.dataset.hasMetrics), + showTimeWindowDropdown: gon.features.metricsTimeWindow, }, }); }, diff --git a/app/assets/javascripts/monitoring/services/monitoring_service.js b/app/assets/javascripts/monitoring/services/monitoring_service.js index 64e27856bb9..5fcc2c8cfac 100644 --- a/app/assets/javascripts/monitoring/services/monitoring_service.js +++ b/app/assets/javascripts/monitoring/services/monitoring_service.js @@ -33,13 +33,7 @@ export default class MonitoringService { } getGraphsData(params = {}) { - return backOffRequest(() => - axios.get(this.metricsEndpoint, { - params: { - params, - }, - }), - ) + return backOffRequest(() => axios.get(this.metricsEndpoint, { params })) .then(resp => resp.data) .then(response => { if (!response || !response.data || !response.success) { diff --git a/app/assets/javascripts/monitoring/utils.js b/app/assets/javascripts/monitoring/utils.js index c3e854c5367..b01bee66d9e 100644 --- a/app/assets/javascripts/monitoring/utils.js +++ b/app/assets/javascripts/monitoring/utils.js @@ -1,13 +1,11 @@ import { timeWindows, msPerMinute } from './constants'; -export const getTimeDifferenceMinutes = timeWindow => { +const getTimeDifferenceMinutes = timeWindow => { switch (timeWindow) { case timeWindows.thirtyMinutes: return 30; case timeWindows.threeHours: return 60 * 3; - case timeWindows.eightHours: - return 60 * 8; case timeWindows.oneDay: return 60 * 24 * 1; case timeWindows.threeDays: |