fix: trim institution names before sorting

Author: khrnchn

app/(admin)/admin/institutions/_lib/actions.ts

@@ -219,7 +219,8 @@ export async function updateInstitutionByAdmin(
 		updatePayload.category = normalizeInstitutionCategory(payload.category);
 	}
 	if (payload.name) {
-		const newSlug = await generateUniqueSlug(payload.name, id);
+		updatePayload.name = payload.name.trim();
+		const newSlug = await generateUniqueSlug(updatePayload.name, id);
 		updatePayload.slug = newSlug;
 	}
 

app/(user)/contribute/_lib/submit-institution.ts

@@ -69,11 +69,20 @@ export async function submitInstitution(
 
 	// --- Extract raw values
 	const rawFromForm = {
-		name: formData.get("name"),
+		name:
+			typeof formData.get("name") === "string"
+				? formData.get("name")?.toString().trim()
+				: formData.get("name"),
 		category: formData.get("category"),
 		state: formData.get("state"),
-		city: formData.get("city"),
-		address: formData.get("address"),
+		city:
+			typeof formData.get("city") === "string"
+				? formData.get("city")?.toString().trim()
+				: formData.get("city"),
+		address:
+			typeof formData.get("address") === "string"
+				? formData.get("address")?.toString().trim()
+				: formData.get("address"),
 		contributorRemarks: formData.get("contributorRemarks"),
 		sourceUrl: formData.get("sourceUrl"),
 		contributorId: formData.get("contributorId"),

lib/queries/institutions.ts

@@ -1,13 +1,13 @@
 "use server";
 
-import { and, eq } from "drizzle-orm";
+import { and, asc, eq, sql } from "drizzle-orm";
 import { unstable_cache } from "next/cache";
 import { db } from "@/db";
 import { institutions, users } from "@/db/schema";
 import { normalizeInstitutionCategory } from "@/lib/institution-categories";
 import { slugify } from "@/lib/utils";
 
-const INSTITUTIONS_CACHE_VERSION = "v2";
+const INSTITUTIONS_CACHE_VERSION = "v3";
 
 const getInstitutionsInternal = unstable_cache(
 	async () => {
@@ -42,7 +42,10 @@ const getInstitutionsInternal = unstable_cache(
 			.from(institutions)
 			.leftJoin(users, eq(institutions.contributorId, users.id))
 			.where(eq(institutions.status, "approved"))
-			.orderBy(institutions.name);
+			.orderBy(
+				asc(sql`lower(btrim(${institutions.name}))`),
+				asc(institutions.id),
+			);
 
 		return results.map((institution) => ({
 			...institution,