summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Read <tread@gitlab.com>2019-04-04 14:39:54 +0200
committerTristan Read <tread@gitlab.com>2019-04-04 14:39:54 +0200
commit707dcb69b55dcf76ac8c15d655b09bdeda12c8ac (patch)
treec7982067d316212c3d21738250364dbe6e07fc04
parent4e2b8536e1fb5099cb7dc1805e57dea756135fa3 (diff)
downloadgitlab-ce-tr-gitlab-ui-version-bump.tar.gz
Change prop type of area chart thresholdtr-gitlab-ui-version-bump
-rw-r--r--app/assets/javascripts/monitoring/components/charts/area.vue4
-rw-r--r--app/assets/javascripts/monitoring/components/dashboard.vue2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/area.vue b/app/assets/javascripts/monitoring/components/charts/area.vue
index d453dc1fdb7..f98b155137e 100644
--- a/app/assets/javascripts/monitoring/components/charts/area.vue
+++ b/app/assets/javascripts/monitoring/components/charts/area.vue
@@ -42,9 +42,9 @@ export default {
default: () => [],
},
alertData: {
- type: Object,
+ type: Array,
required: false,
- default: () => ({}),
+ default: () => [],
},
},
data() {
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue
index ba6a17827f7..ddb132ee315 100644
--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -143,7 +143,7 @@ export default {
},
methods: {
getGraphAlerts(graphId) {
- return this.alertData ? this.alertData[graphId] || {} : {};
+ return this.alertData ? this.alertData[graphId] || [] : [];
},
getGraphsData() {
this.state = 'loading';