summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2019-05-03 08:23:14 +1000
committerSimon Knox <psimyn@gmail.com>2019-05-03 08:23:14 +1000
commit36db59dfa6844ef6b0581580e32bcc9847dbf2d7 (patch)
tree2c9223d7d4d2695c0202bf85292c39d5741a586b
parentfc4defe6d2196b0e5bf23d196a9ad6496658f425 (diff)
downloadgitlab-ce-monitoring-vuex.tar.gz
Get groups from Vuexmonitoring-vuex
-rw-r--r--app/assets/javascripts/monitoring/components/dashboard.vue8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue
index 3c8082e956e..4d3d9ded000 100644
--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -185,8 +185,8 @@ export default {
// this.state = 'loading';
Promise.all(this.servicePromises)
.then(() => {
- if (this.store.groups.length < 1) {
- // this.state = 'noData';
+ if (this.groups.length < 1) {
+ this.state = 'noData';
return;
}
@@ -265,6 +265,7 @@ export default {
</gl-dropdown>
</div>
</div>
+ -->
<graph-group
v-for="(groupData, index) in groups"
:key="index"
@@ -308,8 +309,7 @@ export default {
:graph-data="graphData"
/>
</template>
- </graph-group> TODO: Uncomment this once the action that requests all data is in place-->
- <div><h1>Finished loading...</h1></div>
+ </graph-group>
</div>
<empty-state
v-else