From 2d6a8d9ff51c224177d7dcee2df44b4a920edfd5 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Tue, 3 Sep 2024 18:50:01 +0100
Subject: [PATCH] Fix for sorting, didn't account for some primitive types.

---
 packages/server/src/api/controllers/row/utils/basic.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/api/controllers/row/utils/basic.ts b/packages/server/src/api/controllers/row/utils/basic.ts
index 9d5a315628..b754e288ed 100644
--- a/packages/server/src/api/controllers/row/utils/basic.ts
+++ b/packages/server/src/api/controllers/row/utils/basic.ts
@@ -143,12 +143,16 @@ export function basicProcessing({
             return relatedRow
           })
           .sort((a, b) => {
-            if (!a?.[sortField]) {
+            const aField = a?.[sortField],
+              bField = b?.[sortField]
+            if (!aField) {
               return 1
-            } else if (!b?.[sortField]) {
+            } else if (!bField) {
               return -1
             }
-            return a[sortField].localeCompare(b[sortField])
+            return aField.localeCompare
+              ? aField.localeCompare(bField)
+              : aField - bField
           })
       }
     }