From 2d2b6f6244fe5d777ecb2611fe6d1d617d99a84a Mon Sep 17 00:00:00 2001 From: Sean Fridman Date: Wed, 23 Sep 2015 22:24:23 +0200 Subject: Fix admin dash bug where single resources weren't shown --- app/node_modules/okadminview/index.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'app/node_modules/okadminview/index.js') 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 }, {}) -- cgit v1.2.3-70-g09d2