1 files changed, 14 insertions, 9 deletions
diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js
index 06656dc..ec3cd86 100644
--- a/app/node_modules/okadminview/index.js
+++ b/app/node_modules/okadminview/index.js
@@ -342,17 +342,22 @@ function fetchIndexTemplateData(meta, queries, dashboardConfig) {
       return query.get();
     })).then(function(results) {
       var templateData = results.reduce(function(acc, result, i) {
+        result = result.length ? result : [result]
         var resource = queries[i].resource;
-        // We want the raw object spec
-        var spec = resource.spec;
-        var dashConf = resourceConfig[resource.type] || {}
-        var groupBy = dashConf.groupBy
         var key = pluralize(resource.type)
-        acc[key] = {
-          type: resource.type,
-          spec: spec,
-          data: result,
-          groupBy: groupBy
+        if (acc[key]) {
+          acc[key].data = acc[key].data.concat(result)
+        } else {
+          // We want the raw object spec
+          var spec = resource.spec;
+          var dashConf = resourceConfig[resource.type] || {}
+          var groupBy = dashConf.groupBy
+          acc[key] = {
+            type: resource.type,
+            spec: spec,
+            data: result,
+            groupBy: groupBy
+          }
         }
         return acc
       }, {})