Rearange site table?

server/db/schema.ts

@@ -12,7 +12,7 @@ export const sites = sqliteTable("sites", {
     orgId: text("orgId").references(() => orgs.orgId, {
         onDelete: "cascade",
     }),
-    niceId: text("niceId"),
+    niceId: text("niceId").notNull(),
     exitNode: integer("exitNode").references(() => exitNodes.exitNodeId, {
         onDelete: "set null",
     }),

src/app/[orgId]/sites/components/SitesTable.tsx

@@ -22,22 +22,6 @@ export type SiteRow = {
 };
 
 export const columns: ColumnDef<SiteRow>[] = [
-    {
-        accessorKey: "id",
-        header: ({ column }) => {
-            return (
-                <Button
-                    variant="ghost"
-                    onClick={() =>
-                        column.toggleSorting(column.getIsSorted() === "asc")
-                    }
-                >
-                    Site
-                    <ArrowUpDown className="ml-2 h-4 w-4" />
-                </Button>
-            );
-        },
-    },
     {
         accessorKey: "name",
         header: ({ column }) => {
@@ -54,6 +38,22 @@ export const columns: ColumnDef<SiteRow>[] = [
             );
         },
     },
+    {
+        accessorKey: "id",
+        header: ({ column }) => {
+            return (
+                <Button
+                    variant="ghost"
+                    onClick={() =>
+                        column.toggleSorting(column.getIsSorted() === "asc")
+                    }
+                >
+                    Site
+                    <ArrowUpDown className="ml-2 h-4 w-4" />
+                </Button>
+            );
+        },
+    },
     {
         accessorKey: "mbIn",
         header: "MB In",

src/app/[orgId]/sites/page.tsx

@@ -22,8 +22,8 @@ export default async function Page({ params }: SitesPageProps) {
 
     const siteRows: SiteRow[] = sites.map((site) => {
         return {
-            id: site.siteId.toString(),
             name: site.name,
+            id: site.niceId.toString(),
             mbIn: site.megabytesIn || 0,
             mbOut: site.megabytesOut || 0,
             orgId: params.orgId,