✨ approval list UI

server/db/pg/schema/privateSchema.ts

@@ -308,10 +308,12 @@ export const approvals = pgTable("approvals", {
     clientId: integer("clientId").references(() => clients.clientId, {
         onDelete: "cascade"
     }), // clients reference user devices (in this case)
-    userId: varchar("userId").references(() => users.userId, {
-        // optionally tied to a user and in this case delete when the user deletes
-        onDelete: "cascade"
-    }),
+    userId: varchar("userId")
+        .references(() => users.userId, {
+            // optionally tied to a user and in this case delete when the user deletes
+            onDelete: "cascade"
+        })
+        .notNull(),
     decision: varchar("decision")
         .$type<"approved" | "denied" | "pending">()
         .default("pending")

server/private/routers/approvals/listApprovals.ts

@@ -50,13 +50,16 @@ async function queryApprovals(orgId: string, limit: number, offset: number) {
             approvalId: approvals.id,
             orgId: approvals.orgId,
             clientId: approvals.clientId,
-            userId: users.userId,
-            username: users.username,
-            name: users.name,
             decision: approvals.decision,
-            type: approvals.type
+            type: approvals.type,
+            user: {
+                name: users.name,
+                userId: users.userId,
+                username: users.username
+            }
         })
         .from(approvals)
+        .innerJoin(users, and(eq(approvals.userId, users.userId)))
         .leftJoin(
             clients,
             and(
@@ -64,7 +67,6 @@ async function queryApprovals(orgId: string, limit: number, offset: number) {
                 not(isNull(clients.userId)) // only user devices
             )
         )
-        .leftJoin(users, and(eq(approvals.userId, users.userId)))
         .where(eq(approvals.orgId, orgId))
         .orderBy(desc(approvals.timestamp))
         .limit(limit)