From 3179564f74b04c269577427e7521bf7d373cb342 Mon Sep 17 00:00:00 2001
From: Dhiraj Bodicherla <dhiraj@gitlab.com>
Date: Fri, 14 Jun 2019 07:59:42 +0000
Subject: Fix missing deployment rockets in monitor dashboard

Fixed inconsistencies in variable names for deployment
endpoints for monitoring dashboard which causes
deployment rocket icons to disappear
---
 app/assets/javascripts/monitoring/components/dashboard.vue | 14 +++++---------
 app/assets/javascripts/monitoring/stores/actions.js        |  4 ++--
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue
index d716fc211ca..0a652329dfe 100644
--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -70,7 +70,7 @@ export default {
       type: String,
       required: true,
     },
-    deploymentEndpoint: {
+    deploymentsEndpoint: {
       type: String,
       required: false,
       default: null,
@@ -148,7 +148,7 @@ export default {
     this.setEndpoints({
       metricsEndpoint: this.metricsEndpoint,
       environmentsEndpoint: this.environmentsEndpoint,
-      deploymentsEndpoint: this.deploymentEndpoint,
+      deploymentsEndpoint: this.deploymentsEndpoint,
       dashboardEndpoint: this.dashboardEndpoint,
     });
 
@@ -280,9 +280,8 @@ export default {
           <gl-button
             v-gl-modal-directive="$options.addMetric.modalId"
             class="js-add-metric-button text-success border-success"
+            >{{ $options.addMetric.title }}</gl-button
           >
-            {{ $options.addMetric.title }}
-          </gl-button>
           <gl-modal
             ref="addMetricModal"
             :modal-id="$options.addMetric.modalId"
@@ -296,16 +295,13 @@ export default {
               />
             </form>
             <div slot="modal-footer">
-              <gl-button @click="hideAddMetricModal">
-                {{ __('Cancel') }}
-              </gl-button>
+              <gl-button @click="hideAddMetricModal">{{ __('Cancel') }}</gl-button>
               <gl-button
                 :disabled="!formIsValid"
                 variant="success"
                 @click="submitCustomMetricsForm"
+                >{{ __('Save changes') }}</gl-button
               >
-                {{ __('Save changes') }}
-              </gl-button>
             </div>
           </gl-modal>
         </div>
diff --git a/app/assets/javascripts/monitoring/stores/actions.js b/app/assets/javascripts/monitoring/stores/actions.js
index 49ce722b838..f41e215cb5d 100644
--- a/app/assets/javascripts/monitoring/stores/actions.js
+++ b/app/assets/javascripts/monitoring/stores/actions.js
@@ -164,10 +164,10 @@ export const fetchPrometheusMetrics = ({ state, commit, dispatch }, params) => {
 };
 
 export const fetchDeploymentsData = ({ state, dispatch }) => {
-  if (!state.deploymentEndpoint) {
+  if (!state.deploymentsEndpoint) {
     return Promise.resolve([]);
   }
-  return backOffRequest(() => axios.get(state.deploymentEndpoint))
+  return backOffRequest(() => axios.get(state.deploymentsEndpoint))
     .then(resp => resp.data)
     .then(response => {
       if (!response || !response.deployments) {
-- 
cgit v1.2.3