From 1a729aca9147f077e1b3c15ad79f03c8fa42f359 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Thu, 13 May 2021 15:35:54 +0100
Subject: [PATCH] Remove sorting by auto ID when output processing rows

---
 .../bbui/src/Pagination/Pagination.svelte     |  1 +
 .../src/api/controllers/search/utils.js       |  5 ++---
 packages/server/src/utilities/rowProcessor.js | 20 -------------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/packages/bbui/src/Pagination/Pagination.svelte b/packages/bbui/src/Pagination/Pagination.svelte
index cfe989ea14..e9ee31cc65 100644
--- a/packages/bbui/src/Pagination/Pagination.svelte
+++ b/packages/bbui/src/Pagination/Pagination.svelte
@@ -47,6 +47,7 @@
 <style>
   .spectrum-Pagination-counter {
     margin-left: 0;
+    user-select: none;
   }
   .is-disabled:hover {
     cursor: initial;
diff --git a/packages/server/src/api/controllers/search/utils.js b/packages/server/src/api/controllers/search/utils.js
index 53648eb989..80cf620d7a 100644
--- a/packages/server/src/api/controllers/search/utils.js
+++ b/packages/server/src/api/controllers/search/utils.js
@@ -166,9 +166,8 @@ class QueryBuilder {
     }
     if (this.sort) {
       const orderChar = this.sortOrder === "descending" ? "-" : ""
-      url += `&sort="${orderChar}${this.sort.replace(/ /, "_")}<${
-        this.sortType
-      }>"`
+      url += `&sort="${orderChar}${this.sort.replace(/ /, "_")}`
+      url += `<${this.sortType}>"`
     }
     if (this.bookmark) {
       url += `&bookmark=${this.bookmark}`
diff --git a/packages/server/src/utilities/rowProcessor.js b/packages/server/src/utilities/rowProcessor.js
index fd79751c3e..2267c9e986 100644
--- a/packages/server/src/utilities/rowProcessor.js
+++ b/packages/server/src/utilities/rowProcessor.js
@@ -123,24 +123,6 @@ function processAutoColumn(user, table, row) {
   return { table, row }
 }
 
-/**
- * Given a set of rows and the table they came from this function will sort by auto ID or a custom
- * method if provided (not implemented yet).
- */
-function sortRows(table, rows) {
-  // sort based on auto ID (if found)
-  let autoIDColumn = Object.entries(table.schema).find(
-    schema => schema[1].subtype === AutoFieldSubTypes.AUTO_ID
-  )
-  // get the column name, this is the first element in the array (Object.entries)
-  autoIDColumn = autoIDColumn && autoIDColumn.length ? autoIDColumn[0] : null
-  if (autoIDColumn) {
-    // sort in ascending order
-    rows.sort((a, b) => a[autoIDColumn] - b[autoIDColumn])
-  }
-  return rows
-}
-
 /**
  * Looks through the rows provided and finds formulas - which it then processes.
  */
@@ -213,8 +195,6 @@ exports.outputProcessing = async (appId, table, rows) => {
     rows = [rows]
     wasArray = false
   }
-  // sort by auto ID
-  rows = sortRows(table, rows)
   // attach any linked row information
   let enriched = await linkRows.attachFullLinkedDocs(appId, table, rows)