diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 00:09:19 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 00:09:19 +0000 |
commit | 0a0e82d1440b06650e5fc524168b1f50a8feec68 (patch) | |
tree | c2202560fb250008cf4109e99537b10604faf01b /app/assets/javascripts/monitoring/components | |
parent | f82d5dcab7c3d9a672abc827c92f86887b683a7d (diff) | |
download | gitlab-ce-0a0e82d1440b06650e5fc524168b1f50a8feec68.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring/components')
-rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/monitoring/components/embed.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 79f32b357fc..a6d10d37103 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -522,7 +522,7 @@ export default { <div v-if="!showEmptyState"> <graph-group - v-for="(groupData, index) in dashboard.panel_groups" + v-for="(groupData, index) in dashboard.panelGroups" :key="`${groupData.group}.${groupData.priority}`" :name="groupData.group" :show-panels="showPanels" diff --git a/app/assets/javascripts/monitoring/components/embed.vue b/app/assets/javascripts/monitoring/components/embed.vue index 49188a7af8f..15366b45618 100644 --- a/app/assets/javascripts/monitoring/components/embed.vue +++ b/app/assets/javascripts/monitoring/components/embed.vue @@ -28,10 +28,10 @@ export default { ...mapState('monitoringDashboard', ['dashboard']), ...mapGetters('monitoringDashboard', ['metricsWithData']), charts() { - if (!this.dashboard || !this.dashboard.panel_groups) { + if (!this.dashboard || !this.dashboard.panelGroups) { return []; } - const groupWithMetrics = this.dashboard.panel_groups.find(group => + const groupWithMetrics = this.dashboard.panelGroups.find(group => group.panels.find(chart => this.chartHasData(chart)), ) || { panels: [] }; |