From 0219f34e71df8e207883925b07d6be356d48ddfb Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Tue, 28 Jul 2020 19:40:52 +0100
Subject: [PATCH] improved sorting logic

---
 packages/standard-components/package.json     |  1 +
 .../standard-components/src/DataTable.svelte  | 34 +++++--------------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 516a888a05..20a19aec74 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -38,6 +38,7 @@
   "gitHead": "eff4fa93ca1db11b97b5fdedc0c488413e277eb8",
   "dependencies": {
     "@beyonk/svelte-googlemaps": "^2.2.0",
+    "fast-sort": "^2.2.0",
     "fusioncharts": "^3.15.1-sr.1",
     "svelte-fusioncharts": "^1.0.0"
   }
diff --git a/packages/standard-components/src/DataTable.svelte b/packages/standard-components/src/DataTable.svelte
index 9c9c256bb2..dc301598e8 100644
--- a/packages/standard-components/src/DataTable.svelte
+++ b/packages/standard-components/src/DataTable.svelte
@@ -1,6 +1,7 @@
 <script>
   import { onMount } from "svelte"
   import { cssVars, createClasses } from "./cssVars"
+  import fsort from "fast-sort"
 
   export let _bb
   export let onLoad
@@ -23,28 +24,7 @@
   }
 
   $: data = $store[model] || []
-  $: sorted = data
-  $: {
-    let result = [...sorted]
-
-    if (!sort.column) sorted = result
-
-    console.log(sort);
-
-    if (sort.direction === "ASC") {
-      result.sort((a, b) =>  {
-        console.log(a[sort.column], b[sort.column])
-        return String(a[sort.column]).localeCompare(String(b[sort.column]))
-      }
-      )
-    }
-
-    if (sort.direction === "DESC") {
-      result.reverse()
-    }
-
-    sorted = result
-  }
+  $: sorted = sort.direction ? fsort(data)[sort.direction](sort.column) : data
   $: if (model) fetchData()
 
   const shouldDisplayField = name => {
@@ -78,15 +58,15 @@
   function sortColumn(column) {
     if (column === sort.column) {
       sort = {
-        direction: sort.direction === "ASC" ? "DESC" : null,
-        column: sort.direction === "ASC" ? sort.column : null,
+        direction: sort.direction === "asc" ? "desc" : null,
+        column: sort.direction === "asc" ? sort.column : null,
       }
       return
     }
 
     sort = {
       column,
-      direction: "ASC",
+      direction: "asc",
     }
   }
 
@@ -101,7 +81,9 @@
       {#each headers as header}
         <th on:click={() => sortColumn(header)}>
           {header}
-          {#if sort.column === header}v{/if}
+          {#if sort.column === header}
+            {#if sort.direction === 'asc'}v{:else}^{/if}
+          {/if}
         </th>
       {/each}
     </tr>