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

@@ -23,7 +23,7 @@ export type SiteRow = {
 
 export const columns: ColumnDef<SiteRow>[] = [
     {
-        accessorKey: "id",
+        accessorKey: "name",
         header: ({ column }) => {
             return (
                 <Button
@@ -32,14 +32,14 @@ export const columns: ColumnDef<SiteRow>[] = [
                         column.toggleSorting(column.getIsSorted() === "asc")
                     }
                 >
-                    Site
+                    Name
                     <ArrowUpDown className="ml-2 h-4 w-4" />
                 </Button>
             );
         },
     },
     {
-        accessorKey: "name",
+        accessorKey: "id",
         header: ({ column }) => {
             return (
                 <Button
@@ -48,7 +48,7 @@ export const columns: ColumnDef<SiteRow>[] = [
                         column.toggleSorting(column.getIsSorted() === "asc")
                     }
                 >
-                    Name
+                    Site
                     <ArrowUpDown className="ml-2 h-4 w-4" />
                 </Button>
             );

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,