Merge branch 'main' into dev

2026-03-01 08:16:44 +00:00 · 2026-02-28 12:14:41 -08:00
parent ad9289e0c1 50c2aa0111
commit 66c377a5c9
11 changed files with 268 additions and 223 deletions
--- a/server/routers/site/listSites.ts
+++ b/server/routers/site/listSites.ts
@@ -278,7 +278,7 @@ export async function listSites(

        // we need to add `as` so that drizzle filters the result as a subquery
        const countQuery = db.$count(
-            querySitesBase().where(and(...conditions))
+            querySitesBase().where(and(...conditions)).as("filtered_sites")
        );

        const siteListQuery = baseQuery