From dd428c13e6447084225f20ea68d9192a3831a302 Mon Sep 17 00:00:00 2001
From: Gabriel Candal <gcc@platforme.com>
Date: Mon, 7 Sep 2020 12:45:06 +0100
Subject: [PATCH] Fix sorting

---
 js/data/model.js   | 2 +-
 js/util/data.js    | 2 +-
 test/util/data.js  | 4 ++--
 test/util/model.js | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/data/model.js b/js/data/model.js
index 219c4f3..f847c19 100644
--- a/js/data/model.js
+++ b/js/data/model.js
@@ -257,7 +257,7 @@ export class ModelStore extends Model {
 
         const sortObject = {};
         if (sort) {
-            sortObject[sort[0]] = sort[1];
+            sort.forEach(([key, value]) => (sortObject[key] = value));
         }
 
         const found = await this.collection.find(params, this.fields, {
diff --git a/js/util/data.js b/js/util/data.js
index 3a7dd08..13aea9a 100644
--- a/js/util/data.js
+++ b/js/util/data.js
@@ -107,7 +107,7 @@ const _toSort = function(value) {
     if (values.length === 1) values.push("descending");
     const [name, direction] = values;
     if (name === "default") return null;
-    return [name, SORT_MAP[direction] || 1];
+    return [[name, SORT_MAP[direction] || 1]];
 };
 
 const _findTypes = function(params) {
diff --git a/test/util/data.js b/test/util/data.js
index eeebc87..0d1bc79 100644
--- a/test/util/data.js
+++ b/test/util/data.js
@@ -77,7 +77,7 @@ describe("#getObject()", function() {
             {
                 limit: 50,
                 skip: 0,
-                sort: ["id", 1]
+                sort: [["id", 1]]
             }
         );
     });
@@ -95,7 +95,7 @@ describe("#getObject()", function() {
             {
                 limit: 50,
                 skip: 0,
-                sort: ["id", -1]
+                sort: [["id", -1]]
             }
         );
     });
diff --git a/test/util/model.js b/test/util/model.js
index 834d247..4318e26 100644
--- a/test/util/model.js
+++ b/test/util/model.js
@@ -8,6 +8,7 @@ class MockCollection {
             fields: fields,
             options: options
         };
+        return [];
     }
 }
 
@@ -79,7 +80,7 @@ describe("#find()", function() {
             filter_operator: "$or",
             skip: 5,
             limit: 10,
-            sort: ["name", 1]
+            sort: [["name", 1]]
         });
         assert.deepStrictEqual(MockModel.lastCall.params, {
             brand: {