From 54dd38f2ae5bcd64c760afd98d7e1f53222e92e6 Mon Sep 17 00:00:00 2001
From: Jake Fulmine <jake@fulmine.xyz>
Date: Tue, 1 Oct 2024 20:30:43 -0400
Subject: [PATCH] fix: trim string fields before validating them

---
 dashboard/src/components/group/Edit.svelte  | 6 +++---
 dashboard/src/components/member/Edit.svelte | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dashboard/src/components/group/Edit.svelte b/dashboard/src/components/group/Edit.svelte
index c1958454..d51ec2eb 100644
--- a/dashboard/src/components/group/Edit.svelte
+++ b/dashboard/src/components/group/Edit.svelte
@@ -25,6 +25,9 @@
         err = [];
         success = false;
 
+        // trim all string fields
+        Object.keys(data).forEach(k => data[k] = typeof data[k] == "string" ? data[k].trim() : data[k]);
+
         if (!data.name) err.push("Group name cannot be empty.")
 
         if (data.color && !/^#?[A-Fa-f0-9]{6}$/.test(input.color)) {
@@ -35,9 +38,6 @@
             }
         }
 
-        // trim all string fields
-        Object.keys(data).forEach(k => data[k] = typeof data[k] == "string" ? data[k].trim() : data[k]);
-
         err = err;
         if (err.length > 0) return;
 
diff --git a/dashboard/src/components/member/Edit.svelte b/dashboard/src/components/member/Edit.svelte
index bf9a2734..ccf12590 100644
--- a/dashboard/src/components/member/Edit.svelte
+++ b/dashboard/src/components/member/Edit.svelte
@@ -24,6 +24,9 @@
         let data = input;
         err = [];
 
+        // trim all string fields
+        Object.keys(data).forEach(k => data[k] = typeof data[k] == "string" ? data[k].trim() : data[k]);
+
         if (!data.name) err.push("Member name cannot be empty.")
 
         if (data.color && !/^#?[A-Fa-f0-9]{6}$/.test(input.color)) {
@@ -58,9 +61,6 @@
             }
         }
 
-        // trim all string fields
-        Object.keys(data).forEach(k => data[k] = typeof data[k] == "string" ? data[k].trim() : data[k]);
-
         err = err;
         if (err.length > 0) return;