From 5052d51aa4c55eabc736b3c76a783db2f5208289 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 2 Sep 2016 12:48:43 -0400 Subject: fix sorting issue on groupBy elements --- app/node_modules/okadminview/index.js | 4 +++- examples/db.json | 44 ++++++++++++++++++++++++++++++++++- themes/okadmin/public/js/app.js | 8 ++++++- 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/app/node_modules/okadminview/index.js b/app/node_modules/okadminview/index.js index bee1e1d..3a9056f 100644 --- a/app/node_modules/okadminview/index.js +++ b/app/node_modules/okadminview/index.js @@ -354,11 +354,13 @@ function fetchIndexTemplateData(meta, queries, dashboardConfig) { var spec = resource.spec; var dashConf = resourceConfig[resource.type] || {} var groupBy = dashConf.groupBy + var descending = dashConf.descending acc[key] = { type: resource.type, spec: spec, data: result, - groupBy: groupBy + groupBy: groupBy, + descending: descending, } } return acc diff --git a/examples/db.json b/examples/db.json index 74f460f..b6ab96b 100644 --- a/examples/db.json +++ b/examples/db.json @@ -247,13 +247,55 @@ "dateCreated": "Thu, 21 Apr 2016 21:52:44 GMT" } ], - "card": [], + "card": [ + { + "id": "1", + "title": "1", + "stack": "demo", + "__index": 5, + "dateCreated": "Fri, 02 Sep 2016 16:40:43 GMT" + }, + { + "id": "2", + "title": "2", + "stack": "demo", + "__index": 4, + "dateCreated": "Fri, 02 Sep 2016 16:40:57 GMT" + }, + { + "id": "3", + "title": "3", + "stack": "demo", + "__index": 3, + "dateCreated": "Fri, 02 Sep 2016 16:41:00 GMT" + }, + { + "id": "4", + "title": "4", + "stack": "demo-2", + "__index": 1, + "dateCreated": "Fri, 02 Sep 2016 16:41:17 GMT" + }, + { + "id": "5", + "title": "5", + "stack": "demo-2", + "__index": 2, + "dateCreated": "Fri, 02 Sep 2016 16:41:21 GMT" + } + ], "stack": [ { "id": "demo", "title": "Demo", "__index": 0, "dateCreated": "Fri, 02 Sep 2016 16:20:27 GMT" + }, + { + "id": "demo-2", + "title": "Demo #2", + "__index": 1, + "dateCreated": "Fri, 02 Sep 2016 16:41:10 GMT" } ] } \ No newline at end of file diff --git a/themes/okadmin/public/js/app.js b/themes/okadmin/public/js/app.js index d65fcc6..9891298 100644 --- a/themes/okadmin/public/js/app.js +++ b/themes/okadmin/public/js/app.js @@ -303,10 +303,16 @@ var OKAdmin = function(){ $(".resource-category.root").on("submit", "form", function(e) { var $parent = $(e.delegateTarget); var $resources = $parent.find(".resource-input") + var isDescending = $parent.hasClass("descending") $resources.each(function(index) { var $input = $(this); var parsed = JSON.parse($input.val()); - parsed.__index = index; + if (isDescending) { + parsed.__index = $resources.length - index; + } + else { + parsed.__index = index; + } $input.val(JSON.stringify(parsed)); }) }); -- cgit v1.2.3-70-g09d2