From 9f56213d2f093807a2028167ec9b8648759898f3 Mon Sep 17 00:00:00 2001
From: Christoph Kluge <christoph.kluge@fau.de>
Date: Tue, 4 Feb 2025 17:52:11 +0100
Subject: [PATCH] fix list view sorting of string fields

---
 web/frontend/src/List.root.svelte             | 28 +++++++++++++------
 .../src/generic/helper/TextFilter.svelte      |  2 +-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/web/frontend/src/List.root.svelte b/web/frontend/src/List.root.svelte
index ef57e27..1a88b36 100644
--- a/web/frontend/src/List.root.svelte
+++ b/web/frontend/src/List.root.svelte
@@ -83,16 +83,26 @@
   }
 
   function sort(stats, sorting, nameFilter) {
-    const cmp =
-      sorting.field == "id"
-        ? sorting.direction == "up"
-          ? (a, b) => a.id < b.id
-          : (a, b) => a.id > b.id
-        : sorting.direction == "up"
-          ? (a, b) => a[sorting.field] - b[sorting.field]
-          : (a, b) => b[sorting.field] - a[sorting.field];
+    const idCmp = sorting.direction == "up"
+      ? (a, b) => b.id.localeCompare(a.id)
+      : (a, b) => a.id.localeCompare(b.id)
 
-    return stats.filter((u) => u.id.includes(nameFilter)).sort(cmp);
+    // "-50": Forces empty strings to the end of the list
+    const nameCmp = sorting.direction == "up"
+      ? (a, b) => (a.name == '') ? -50 : b.name.localeCompare(a.name)
+      : (a, b) => (b.name == '') ? -50 : a.name.localeCompare(b.name)
+
+    const intCmp = sorting.direction == "up"
+      ? (a, b) => a[sorting.field] - b[sorting.field]
+      : (a, b) => b[sorting.field] - a[sorting.field];
+
+    if (sorting.field == "id") {
+      return stats.filter((u) => u.id.includes(nameFilter)).sort(idCmp)
+    } else if (sorting.field == "name") {
+      return stats.filter((u) => u.id.includes(nameFilter)).sort(nameCmp)
+    } else {
+      return stats.filter((u) => u.id.includes(nameFilter)).sort(intCmp)
+    }
   }
 
   onMount(() => filterComponent.updateFilters());
diff --git a/web/frontend/src/generic/helper/TextFilter.svelte b/web/frontend/src/generic/helper/TextFilter.svelte
index c9da886..5ac9203 100644
--- a/web/frontend/src/generic/helper/TextFilter.svelte
+++ b/web/frontend/src/generic/helper/TextFilter.svelte
@@ -80,7 +80,7 @@
     project = ""
     jobName = ""
     user = ""
-    termChanged(0, true);
+    termChanged(0);
   }
 </script>