From bf224cb6bc37e503228ae55543607cdb0d29aae0 Mon Sep 17 00:00:00 2001
From: jtb9 <31317998+jtb9@users.noreply.github.com>
Date: Thu, 18 Dec 2025 16:19:36 -0500
Subject: [PATCH] Adding order to query and ordering tags with it (#19)

---
 src/app/hack/[slug]/edit/page.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/app/hack/[slug]/edit/page.tsx b/src/app/hack/[slug]/edit/page.tsx
index b17fba0..b0b85e0 100644
--- a/src/app/hack/[slug]/edit/page.tsx
+++ b/src/app/hack/[slug]/edit/page.tsx
@@ -3,7 +3,7 @@ import HackForm from "@/components/Hack/HackForm";
 import { createClient } from "@/utils/supabase/server";
 import { FaChevronLeft, FaChevronRight } from "react-icons/fa6";
 import Link from "next/link";
-import { getCoverUrls } from "@/utils/format";
+import { sortOrderedTags, getCoverUrls } from "@/utils/format";
 import { checkEditPermission } from "@/utils/hack";
 
 interface EditPageProps {
@@ -47,9 +47,16 @@ export default async function EditHackPage({ params }: EditPageProps) {
 
   const { data: tagRows } = await supabase
     .from("hack_tags")
-    .select("tags(name)")
+    .select("order,tags(name)")
     .eq("hack_slug", slug);
-  const tags = (tagRows || []).map((r: any) => r.tags?.name).filter(Boolean) as string[];
+
+  const tags = sortOrderedTags(
+    (tagRows || [])
+      .map((r) => ({
+        name: r.tags.name,
+        order: r.order,
+      }))
+  ).map((t) => t.name);
 
   let version = "";
   if (hack.current_patch) {