Bump the prod-minor-updates group across 1 directory with 8 updates

Dependabot couldn't find the original pull request head commit, ecb2814927.

.dockerignore

@@ -32,5 +32,4 @@ migrations/
 config/
 build.ts
 tsconfig.json
-Dockerfile*
 migrations/

.github/workflows/cicd.yml

@@ -525,41 +525,10 @@ jobs:
                           VERIFIED_INDEX_KEYLESS=false
                         fi
 
-                        # If index verification fails, attempt to verify child platform manifests
-                        if [ "${VERIFIED_INDEX}" != "true" ] || [ "${VERIFIED_INDEX_KEYLESS}" != "true" ]; then
-                          echo "Index verification not available; attempting child manifest verification for ${BASE_IMAGE}:${IMAGE_TAG}"
-                          CHILD_VERIFIED=false
-
-                          for ARCH in arm64 amd64; do
-                            CHILD_TAG="${IMAGE_TAG}-${ARCH}"
-                            echo "Resolving child digest for ${BASE_IMAGE}:${CHILD_TAG}"
-                            CHILD_DIGEST="$(skopeo inspect --retry-times 3 docker://${BASE_IMAGE}:${CHILD_TAG} | jq -r '.Digest' || true)"
-                            if [ -n "${CHILD_DIGEST}" ] && [ "${CHILD_DIGEST}" != "null" ]; then
-                              CHILD_REF="${BASE_IMAGE}@${CHILD_DIGEST}"
-                              echo "==> cosign verify (public key) child ${CHILD_REF}"
-                              if retry_verify "cosign verify --key env://COSIGN_PUBLIC_KEY '${CHILD_REF}' -o text"; then
-                                CHILD_VERIFIED=true
-                                echo "Public key verification succeeded for child ${CHILD_REF}"
-                              else
-                                echo "Public key verification failed for child ${CHILD_REF}"
-                              fi
-
-                              echo "==> cosign verify (keyless policy) child ${CHILD_REF}"
-                              if retry_verify "cosign verify --certificate-oidc-issuer '${issuer}' --certificate-identity-regexp '${id_regex}' '${CHILD_REF}' -o text"; then
-                                CHILD_VERIFIED=true
-                                echo "Keyless verification succeeded for child ${CHILD_REF}"
-                              else
-                                echo "Keyless verification failed for child ${CHILD_REF}"
-                              fi
-                            else
-                              echo "No child digest found for ${BASE_IMAGE}:${CHILD_TAG}; skipping"
-                            fi
-                          done
-
-                          if [ "${CHILD_VERIFIED}" != "true" ]; then
-                            echo "Failed to verify index and no child manifests verified for ${BASE_IMAGE}:${IMAGE_TAG}"
-                            exit 1
-                          fi
+                        # Check if verification succeeded
+                        if [ "${VERIFIED_INDEX}" != "true" ] && [ "${VERIFIED_INDEX_KEYLESS}" != "true" ]; then
+                          echo "⚠️  WARNING: Verification not available for ${BASE_IMAGE}:${IMAGE_TAG}"
+                          echo "This may be due to registry propagation delays. Continuing anyway."
                         fi
                       ) || TAG_FAILED=true
 

.gitignore

@@ -53,4 +53,3 @@ tsconfig.json
 hydrateSaas.ts
 CLAUDE.md
 drizzle.config.ts
-server/setup/migrations.ts

.vscode/settings.json

@@ -10,7 +10,7 @@
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
     "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "vscode.typescript-language-features"
     },
     "[typescriptreact]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"

Dockerfile

@@ -1,54 +1,33 @@
-FROM node:24-alpine AS base
+FROM node:24-alpine AS builder
 
 WORKDIR /app
 
+ARG BUILD=oss
+ARG DATABASE=sqlite
+
 RUN apk add --no-cache python3 make g++
 
+# COPY package.json package-lock.json ./
 COPY package*.json ./
-
-FROM base AS builder-dev
-
 RUN npm ci
 
 COPY . .
 
-ARG BUILD=oss
-ARG DATABASE=sqlite
-
 RUN if [ "$BUILD" = "oss" ]; then rm -rf server/private; fi && \
     npm run set:$DATABASE && \
     npm run set:$BUILD && \
     npm run db:generate && \
     npm run build && \
-    npm run build:cli && \
-    test -f dist/server.mjs
+    npm run build:cli
 
-FROM base AS builder
+# test to make sure the build output is there and error if not
+RUN test -f dist/server.mjs
 
-RUN npm ci --omit=dev
+# Prune dev dependencies and clean up to prepare for copy to runner
+RUN npm prune --omit=dev && npm cache clean --force
 
 FROM node:24-alpine AS runner
 
-WORKDIR /app
-
-RUN apk add --no-cache curl tzdata
-
-COPY --from=builder /app/node_modules ./node_modules
-COPY --from=builder /app/package.json ./package.json
-
-COPY --from=builder-dev /app/.next/standalone ./
-COPY --from=builder-dev /app/.next/static ./.next/static
-COPY --from=builder-dev /app/dist ./dist
-COPY --from=builder-dev /app/server/migrations ./dist/init
-
-COPY ./cli/wrapper.sh /usr/local/bin/pangctl
-RUN chmod +x /usr/local/bin/pangctl ./dist/cli.mjs
-
-COPY server/db/names.json ./dist/names.json
-COPY server/db/ios_models.json ./dist/ios_models.json
-COPY server/db/mac_models.json ./dist/mac_models.json
-COPY public ./public
-
 # OCI Image Labels - Build Args for dynamic values
 ARG VERSION="dev"
 ARG REVISION=""
@@ -59,6 +38,28 @@ ARG LICENSE="AGPL-3.0"
 ARG IMAGE_TITLE="Pangolin"
 ARG IMAGE_DESCRIPTION="Identity-aware VPN and proxy for remote access to anything, anywhere"
 
+WORKDIR /app
+
+# Only curl and tzdata needed at runtime - no build tools!
+RUN apk add --no-cache curl tzdata
+
+# Copy pre-built node_modules from builder (already pruned to production only)
+# This includes the compiled native modules like better-sqlite3
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/.next/standalone ./
+COPY --from=builder /app/.next/static ./.next/static
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/server/migrations ./dist/init
+COPY --from=builder /app/package.json ./package.json
+
+COPY ./cli/wrapper.sh /usr/local/bin/pangctl
+RUN chmod +x /usr/local/bin/pangctl ./dist/cli.mjs
+
+COPY server/db/names.json ./dist/names.json
+COPY server/db/ios_models.json ./dist/ios_models.json
+COPY server/db/mac_models.json ./dist/mac_models.json
+COPY public ./public
+
 # OCI Image Labels
 # https://github.com/opencontainers/image-spec/blob/main/annotations.md
 LABEL org.opencontainers.image.source="https://github.com/fosrl/pangolin" \

Dockerfile.dev

@@ -1,9 +1,7 @@
-FROM node:24-alpine
+FROM node:22-alpine
 
 WORKDIR /app
 
-RUN apk add --no-cache python3 make g++
-
 COPY package*.json ./
 
 # Install dependencies

esbuild.mjs

@@ -281,7 +281,7 @@ esbuild
             })
         ],
         sourcemap: "inline",
-        target: "node24"
+        target: "node22"
     })
     .then((result) => {
         // Check if there were any errors in the build result

messages/en-US.json

@@ -473,8 +473,6 @@
     "filterByApprovalState": "Filter By Approval State",
     "approvalListEmpty": "No approvals",
     "approvalState": "Approval State",
-    "approvalLoadMore": "Load more",
-    "loadingApprovals": "Loading Approvals",
     "approve": "Approve",
     "approved": "Approved",
     "denied": "Denied",
@@ -1183,8 +1181,7 @@
     "actionViewLogs": "View Logs",
     "noneSelected": "None selected",
     "orgNotFound2": "No organizations found.",
-    "searchPlaceholder": "Search...",
-    "emptySearchOptions": "No options found",
+    "searchProgress": "Search...",
     "create": "Create",
     "orgs": "Organizations",
     "loginError": "An unexpected error occurred. Please try again.",
@@ -1931,9 +1928,6 @@
     "authPageBrandingQuestionRemove": "Are you sure you want to remove the branding for Auth Pages ?",
     "authPageBrandingDeleteConfirm": "Confirm Delete Branding",
     "brandingLogoURL": "Logo URL",
-    "brandingLogoURLOrPath": "Logo URL or Path",
-    "brandingLogoPathDescription": "Enter a URL or a local path.",
-    "brandingLogoURLDescription": "Enter a publicly accessible URL to your logo image.",
     "brandingPrimaryColor": "Primary Color",
     "brandingLogoWidth": "Width (px)",
     "brandingLogoHeight": "Height (px)",

package.json

@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@asteasolutions/zod-to-openapi": "8.4.0",
-        "@aws-sdk/client-s3": "3.989.0",
+        "@aws-sdk/client-s3": "3.990.0",
         "@faker-js/faker": "10.3.0",
         "@headlessui/react": "2.2.9",
         "@hookform/resolvers": "5.2.2",
@@ -59,65 +59,67 @@
         "@radix-ui/react-tabs": "1.1.13",
         "@radix-ui/react-toast": "1.2.15",
         "@radix-ui/react-tooltip": "1.2.8",
-        "@react-email/components": "1.0.7",
-        "@react-email/render": "2.0.4",
-        "@react-email/tailwind": "2.0.4",
+        "@react-email/components": "1.0.2",
+        "@react-email/render": "2.0.0",
+        "@react-email/tailwind": "2.0.2",
         "@simplewebauthn/browser": "13.2.2",
         "@simplewebauthn/server": "13.2.2",
         "@tailwindcss/forms": "0.5.11",
-        "@tanstack/react-query": "5.90.21",
+        "@tanstack/react-query": "5.90.12",
         "@tanstack/react-table": "8.21.3",
         "arctic": "3.7.0",
-        "axios": "1.13.5",
+        "axios": "1.13.2",
         "better-sqlite3": "11.9.1",
         "canvas-confetti": "1.9.4",
         "class-variance-authority": "0.7.1",
         "clsx": "2.1.1",
         "cmdk": "1.1.1",
         "cookie-parser": "1.4.7",
-        "cors": "2.8.6",
+        "cors": "2.8.5",
         "crypto-js": "4.2.0",
         "d3": "7.9.0",
+        "date-fns": "4.1.0",
         "drizzle-orm": "0.45.1",
+        "eslint": "9.39.2",
+        "eslint-config-next": "16.1.0",
         "express": "5.2.1",
         "express-rate-limit": "8.2.1",
-        "glob": "13.0.3",
+        "glob": "13.0.0",
         "helmet": "8.1.0",
         "http-errors": "2.0.1",
         "input-otp": "1.4.2",
-        "ioredis": "5.9.3",
+        "ioredis": "5.9.2",
         "jmespath": "0.16.0",
         "js-yaml": "4.1.1",
         "jsonwebtoken": "9.0.3",
-        "lucide-react": "0.563.0",
-        "maxmind": "5.0.5",
+        "lucide-react": "0.564.0",
+        "maxmind": "5.0.1",
         "moment": "2.30.1",
-        "next": "15.5.12",
+        "next": "15.5.9",
         "next-intl": "4.8.2",
         "next-themes": "0.4.6",
         "nextjs-toploader": "3.9.17",
         "node-cache": "5.1.2",
-        "nodemailer": "8.0.1",
+        "nodemailer": "7.0.11",
         "oslo": "1.2.1",
         "pg": "8.18.0",
         "posthog-node": "5.24.15",
         "qrcode.react": "4.2.0",
-        "react": "19.2.4",
-        "react-day-picker": "9.13.2",
-        "react-dom": "19.2.4",
+        "react": "19.2.3",
+        "react-day-picker": "9.13.0",
+        "react-dom": "19.2.3",
         "react-easy-sort": "1.8.0",
         "react-hook-form": "7.71.1",
         "react-icons": "5.5.0",
         "recharts": "2.15.4",
         "reodotdev": "1.0.0",
         "resend": "6.9.2",
-        "semver": "7.7.4",
+        "semver": "7.7.3",
         "stripe": "20.3.1",
         "swagger-ui-express": "5.0.1",
         "tailwind-merge": "3.4.0",
         "topojson-client": "3.1.0",
         "tw-animate-css": "1.4.0",
-        "use-debounce": "^10.1.0",
         "uuid": "13.0.0",
         "vaul": "1.1.2",
         "visionscarto-world-atlas": "1.0.0",
@@ -126,15 +128,14 @@
         "ws": "8.19.0",
         "yaml": "2.8.2",
         "yargs": "18.0.0",
-        "zod": "4.3.6",
+        "zod": "4.3.5",
         "zod-validation-error": "5.0.0"
     },
     "devDependencies": {
-        "@dotenvx/dotenvx": "1.52.0",
+        "@dotenvx/dotenvx": "1.51.2",
         "@esbuild-plugins/tsconfig-paths": "0.1.2",
-        "@react-email/preview-server": "5.2.8",
         "@tailwindcss/postcss": "4.1.18",
-        "@tanstack/react-query-devtools": "5.91.3",
+        "@tanstack/react-query-devtools": "5.91.1",
         "@types/better-sqlite3": "7.6.13",
         "@types/cookie-parser": "1.4.10",
         "@types/cors": "2.8.19",
@@ -143,32 +144,30 @@
         "@types/express": "5.0.6",
         "@types/express-session": "1.18.2",
         "@types/jmespath": "0.15.2",
-        "@types/js-yaml": "4.0.9",
         "@types/jsonwebtoken": "9.0.10",
-        "@types/node": "25.2.3",
-        "@types/nodemailer": "7.0.9",
+        "@types/node": "24.10.2",
+        "@types/nodemailer": "7.0.4",
         "@types/nprogress": "0.2.3",
         "@types/pg": "8.16.0",
-        "@types/react": "19.2.14",
+        "@types/react": "19.2.7",
         "@types/react-dom": "19.2.3",
         "@types/semver": "7.7.1",
         "@types/swagger-ui-express": "4.1.8",
         "@types/topojson-client": "3.1.5",
         "@types/ws": "8.18.1",
         "@types/yargs": "17.0.35",
+        "@types/js-yaml": "4.0.9",
         "babel-plugin-react-compiler": "1.0.0",
-        "drizzle-kit": "0.31.9",
-        "esbuild": "0.27.3",
+        "drizzle-kit": "0.31.8",
+        "esbuild": "0.27.2",
         "esbuild-node-externals": "1.20.1",
-        "eslint": "9.39.2",
-        "eslint-config-next": "16.1.6",
         "postcss": "8.5.6",
-        "prettier": "3.8.1",
-        "react-email": "5.2.8",
+        "prettier": "3.8.0",
+        "react-email": "5.2.5",
         "tailwindcss": "4.1.18",
         "tsc-alias": "1.8.16",
         "tsx": "4.21.0",
         "typescript": "5.9.3",
-        "typescript-eslint": "8.55.0"
+        "typescript-eslint": "8.53.1"
     }
 }

server/db/pg/schema/schema.ts

@@ -1,16 +1,18 @@
-import { randomUUID } from "crypto";
-import { InferSelectModel } from "drizzle-orm";
 import {
-    bigint,
-    boolean,
-    index,
-    integer,
     pgTable,
-    real,
     serial,
+    varchar,
+    boolean,
+    integer,
+    bigint,
+    real,
     text,
-    varchar
+    index,
+    uniqueIndex
 } from "drizzle-orm/pg-core";
+import { InferSelectModel } from "drizzle-orm";
+import { randomUUID } from "crypto";
+import { alias } from "yargs";
 
 export const domains = pgTable("domains", {
     domainId: varchar("domainId").primaryKey(),
@@ -186,9 +188,7 @@ export const targetHealthCheck = pgTable("targetHealthCheck", {
     hcFollowRedirects: boolean("hcFollowRedirects").default(true),
     hcMethod: varchar("hcMethod").default("GET"),
     hcStatus: integer("hcStatus"), // http code
-    hcHealth: text("hcHealth")
-        .$type<"unknown" | "healthy" | "unhealthy">()
-        .default("unknown"), // "unknown", "healthy", "unhealthy"
+    hcHealth: text("hcHealth").default("unknown"), // "unknown", "healthy", "unhealthy"
     hcTlsServerName: text("hcTlsServerName")
 });
 
@@ -218,7 +218,7 @@ export const siteResources = pgTable("siteResources", {
         .references(() => orgs.orgId, { onDelete: "cascade" }),
     niceId: varchar("niceId").notNull(),
     name: varchar("name").notNull(),
-    mode: varchar("mode").$type<"host" | "cidr">().notNull(), // "host" | "cidr" | "port"
+    mode: varchar("mode").notNull(), // "host" | "cidr" | "port"
     protocol: varchar("protocol"), // only for port mode
     proxyPort: integer("proxyPort"), // only for port mode
     destinationPort: integer("destinationPort"), // only for port mode

server/db/sqlite/schema/schema.ts

@@ -1,6 +1,13 @@
 import { randomUUID } from "crypto";
 import { InferSelectModel } from "drizzle-orm";
-import { index, integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
+import {
+    sqliteTable,
+    text,
+    integer,
+    index,
+    uniqueIndex
+} from "drizzle-orm/sqlite-core";
+import { no } from "zod/v4/locales";
 
 export const domains = sqliteTable("domains", {
     domainId: text("domainId").primaryKey(),
@@ -207,9 +214,7 @@ export const targetHealthCheck = sqliteTable("targetHealthCheck", {
     }).default(true),
     hcMethod: text("hcMethod").default("GET"),
     hcStatus: integer("hcStatus"), // http code
-    hcHealth: text("hcHealth")
-        .$type<"unknown" | "healthy" | "unhealthy">()
-        .default("unknown"), // "unknown", "healthy", "unhealthy"
+    hcHealth: text("hcHealth").default("unknown"), // "unknown", "healthy", "unhealthy"
     hcTlsServerName: text("hcTlsServerName")
 });
 
@@ -241,7 +246,7 @@ export const siteResources = sqliteTable("siteResources", {
         .references(() => orgs.orgId, { onDelete: "cascade" }),
     niceId: text("niceId").notNull(),
     name: text("name").notNull(),
-    mode: text("mode").$type<"host" | "cidr">().notNull(), // "host" | "cidr" | "port"
+    mode: text("mode").notNull(), // "host" | "cidr" | "port"
     protocol: text("protocol"), // only for port mode
     proxyPort: integer("proxyPort"), // only for port mode
     destinationPort: integer("destinationPort"), // only for port mode

server/private/routers/approvals/countApprovals.ts

@@ -19,7 +19,7 @@ import { fromError } from "zod-validation-error";
 
 import type { Request, Response, NextFunction } from "express";
 import { approvals, db, type Approval } from "@server/db";
-import { eq, sql, and, inArray } from "drizzle-orm";
+import { eq, sql, and } from "drizzle-orm";
 import response from "@server/lib/response";
 
 const paramsSchema = z.strictObject({
@@ -88,7 +88,7 @@ export async function countApprovals(
             .where(
                 and(
                     eq(approvals.orgId, orgId),
-                    inArray(approvals.decision, state)
+                    sql`${approvals.decision} in ${state}`
                 )
             );
 

server/private/routers/approvals/listApprovals.ts

@@ -28,7 +28,7 @@ import {
     currentFingerprint,
     type Approval
 } from "@server/db";
-import { eq, isNull, sql, not, and, desc, gte, lte } from "drizzle-orm";
+import { eq, isNull, sql, not, and, desc } from "drizzle-orm";
 import response from "@server/lib/response";
 import { getUserDeviceName } from "@server/db/names";
 
@@ -37,26 +37,18 @@ const paramsSchema = z.strictObject({
 });
 
 const querySchema = z.strictObject({
-    limit: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
+    limit: z
+        .string()
         .optional()
-        .catch(20)
-        .default(20),
-    cursorPending: z.coerce // pending cursor
-        .number<string>()
-        .int()
-        .max(1) // 0 means non pending
-        .min(0) // 1 means pending
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().nonnegative()),
+    offset: z
+        .string()
         .optional()
-        .catch(undefined),
-    cursorTimestamp: z.coerce
-        .number<string>()
-        .int()
-        .positive()
-        .optional()
-        .catch(undefined),
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative()),
     approvalState: z
         .enum(["pending", "approved", "denied", "all"])
         .optional()
@@ -69,21 +61,13 @@ const querySchema = z.strictObject({
         .pipe(z.number().int().positive().optional())
 });
 
-async function queryApprovals({
-    orgId,
-    limit,
-    approvalState,
-    cursorPending,
-    cursorTimestamp,
-    clientId
-}: {
-    orgId: string;
-    limit: number;
-    approvalState: z.infer<typeof querySchema>["approvalState"];
-    cursorPending?: number;
-    cursorTimestamp?: number;
-    clientId?: number;
-}) {
+async function queryApprovals(
+    orgId: string,
+    limit: number,
+    offset: number,
+    approvalState: z.infer<typeof querySchema>["approvalState"],
+    clientId?: number
+) {
     let state: Array<Approval["decision"]> = [];
     switch (approvalState) {
         case "pending":
@@ -99,26 +83,6 @@ async function queryApprovals({
             state = ["approved", "denied", "pending"];
     }
 
-    const conditions = [
-        eq(approvals.orgId, orgId),
-        sql`${approvals.decision} in ${state}`
-    ];
-
-    if (clientId) {
-        conditions.push(eq(approvals.clientId, clientId));
-    }
-
-    const pendingSortKey = sql`CASE ${approvals.decision} WHEN 'pending' THEN 1 ELSE 0 END`;
-
-    if (cursorPending != null && cursorTimestamp != null) {
-        // https://stackoverflow.com/a/79720298/10322846
-        // composite cursor, next data means (pending, timestamp) <= cursor
-        conditions.push(
-            lte(pendingSortKey, cursorPending),
-            lte(approvals.timestamp, cursorTimestamp)
-        );
-    }
-
     const res = await db
         .select({
             approvalId: approvals.approvalId,
@@ -141,8 +105,7 @@ async function queryApprovals({
             fingerprintArch: currentFingerprint.arch,
             fingerprintSerialNumber: currentFingerprint.serialNumber,
             fingerprintUsername: currentFingerprint.username,
-            fingerprintHostname: currentFingerprint.hostname,
-            timestamp: approvals.timestamp
+            fingerprintHostname: currentFingerprint.hostname
         })
         .from(approvals)
         .innerJoin(users, and(eq(approvals.userId, users.userId)))
@@ -155,12 +118,22 @@ async function queryApprovals({
         )
         .leftJoin(olms, eq(clients.clientId, olms.clientId))
         .leftJoin(currentFingerprint, eq(olms.olmId, currentFingerprint.olmId))
-        .where(and(...conditions))
-        .orderBy(desc(pendingSortKey), desc(approvals.timestamp))
-        .limit(limit + 1); // the `+1` is used for the cursor
+        .where(
+            and(
+                eq(approvals.orgId, orgId),
+                sql`${approvals.decision} in ${state}`,
+                ...(clientId ? [eq(approvals.clientId, clientId)] : [])
+            )
+        )
+        .orderBy(
+            sql`CASE ${approvals.decision} WHEN 'pending' THEN 0 ELSE 1 END`,
+            desc(approvals.timestamp)
+        )
+        .limit(limit)
+        .offset(offset);
 
     // Process results to format device names and build fingerprint objects
-    const approvalsList = res.slice(0, limit).map((approval) => {
+    return res.map((approval) => {
         const model = approval.deviceModel || null;
         const deviceName = approval.clientName
             ? getUserDeviceName(model, approval.clientName)
@@ -179,15 +152,15 @@ async function queryApprovals({
 
         const fingerprint = hasFingerprintData
             ? {
-                  platform: approval.fingerprintPlatform ?? null,
-                  osVersion: approval.fingerprintOsVersion ?? null,
-                  kernelVersion: approval.fingerprintKernelVersion ?? null,
-                  arch: approval.fingerprintArch ?? null,
-                  deviceModel: approval.deviceModel ?? null,
-                  serialNumber: approval.fingerprintSerialNumber ?? null,
-                  username: approval.fingerprintUsername ?? null,
-                  hostname: approval.fingerprintHostname ?? null
-              }
+                platform: approval.fingerprintPlatform || null,
+                osVersion: approval.fingerprintOsVersion || null,
+                kernelVersion: approval.fingerprintKernelVersion || null,
+                arch: approval.fingerprintArch || null,
+                deviceModel: approval.deviceModel || null,
+                serialNumber: approval.fingerprintSerialNumber || null,
+                username: approval.fingerprintUsername || null,
+                hostname: approval.fingerprintHostname || null
+            }
             : null;
 
         const {
@@ -210,30 +183,11 @@ async function queryApprovals({
             niceId: approval.niceId || null
         };
     });
-    let nextCursorPending: number | null = null;
-    let nextCursorTimestamp: number | null = null;
-    if (res.length > limit) {
-        const lastItem = res[limit];
-        nextCursorPending = lastItem.decision === "pending" ? 1 : 0;
-        nextCursorTimestamp = lastItem.timestamp;
-    }
-    return {
-        approvalsList,
-        nextCursorPending,
-        nextCursorTimestamp
-    };
 }
 
 export type ListApprovalsResponse = {
-    approvals: NonNullable<
-        Awaited<ReturnType<typeof queryApprovals>>
-    >["approvalsList"];
-    pagination: {
-        total: number;
-        limit: number;
-        cursorPending: number | null;
-        cursorTimestamp: number | null;
-    };
+    approvals: NonNullable<Awaited<ReturnType<typeof queryApprovals>>>;
+    pagination: { total: number; limit: number; offset: number };
 };
 
 export async function listApprovals(
@@ -261,25 +215,17 @@ export async function listApprovals(
                 )
             );
         }
-        const {
-            limit,
-            cursorPending,
-            cursorTimestamp,
-            approvalState,
-            clientId
-        } = parsedQuery.data;
+        const { limit, offset, approvalState, clientId } = parsedQuery.data;
 
         const { orgId } = parsedParams.data;
 
-        const { approvalsList, nextCursorPending, nextCursorTimestamp } =
-            await queryApprovals({
-                orgId: orgId.toString(),
-                limit,
-                cursorPending,
-                cursorTimestamp,
-                approvalState,
-                clientId
-            });
+        const approvalsList = await queryApprovals(
+            orgId.toString(),
+            limit,
+            offset,
+            approvalState,
+            clientId
+        );
 
         const [{ count }] = await db
             .select({ count: sql<number>`count(*)` })
@@ -291,8 +237,7 @@ export async function listApprovals(
                 pagination: {
                     total: count,
                     limit,
-                    cursorPending: nextCursorPending,
-                    cursorTimestamp: nextCursorTimestamp
+                    offset
                 }
             },
             success: true,

server/private/routers/generatedLicense/generateNewEnterpriseLicense.ts

@@ -37,9 +37,8 @@ export async function generateNewEnterpriseLicense(
     next: NextFunction
 ): Promise<any> {
     try {
-        const parsedParams = generateNewEnterpriseLicenseParamsSchema.safeParse(
-            req.params
-        );
+
+        const parsedParams = generateNewEnterpriseLicenseParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
             return next(
                 createHttpError(
@@ -64,10 +63,7 @@ export async function generateNewEnterpriseLicense(
 
         const licenseData = req.body;
 
-        if (
-            licenseData.tier != "big_license" &&
-            licenseData.tier != "small_license"
-        ) {
+        if (licenseData.tier != "big_license" && licenseData.tier != "small_license") {
             return next(
                 createHttpError(
                     HttpCode.BAD_REQUEST,
@@ -83,8 +79,7 @@ export async function generateNewEnterpriseLicense(
             return next(
                 createHttpError(
                     apiResponse.status || HttpCode.BAD_REQUEST,
-                    apiResponse.message ||
-                        "Failed to create license from Fossorial API"
+                    apiResponse.message || "Failed to create license from Fossorial API"
                 )
             );
         }
@@ -117,10 +112,7 @@ export async function generateNewEnterpriseLicense(
             );
         }
 
-        const tier =
-            licenseData.tier === "big_license"
-                ? LicenseId.BIG_LICENSE
-                : LicenseId.SMALL_LICENSE;
+        const tier = licenseData.tier === "big_license" ? LicenseId.BIG_LICENSE : LicenseId.SMALL_LICENSE;
         const tierPrice = getLicensePriceSet()[tier];
 
         const session = await stripe!.checkout.sessions.create({
@@ -130,7 +122,7 @@ export async function generateNewEnterpriseLicense(
                 {
                     price: tierPrice, // Use the standard tier
                     quantity: 1
-                }
+                },
             ], // Start with the standard feature set that matches the free limits
             customer: customer.customerId,
             mode: "subscription",

server/private/routers/loginPage/upsertLoginPageBranding.ts

@@ -26,7 +26,6 @@ import logger from "@server/logger";
 import { fromError } from "zod-validation-error";
 import { eq, InferInsertModel } from "drizzle-orm";
 import { build } from "@server/build";
-import { validateLocalPath } from "@app/lib/validateLocalPath";
 import config from "#private/lib/config";
 
 const paramsSchema = z.strictObject({
@@ -38,36 +37,14 @@ const bodySchema = z.strictObject({
         .union([
             z.literal(""),
             z
-                .string()
-                .superRefine(async (urlOrPath, ctx) => {
-                    const parseResult = z.url().safeParse(urlOrPath);
-                    if (!parseResult.success) {
-                        if (build !== "enterprise") {
-                            ctx.addIssue({
-                                code: "custom",
-                                message: "Must be a valid URL"
-                            });
-                            return;
-                        } else {
-                            try {
-                                validateLocalPath(urlOrPath);
-                            } catch (error) {
-                                ctx.addIssue({
-                                    code: "custom",
-                                    message: "Must be either a valid image URL or a valid pathname starting with `/` and not containing query parameters, `..` or `*`"
-                                });
-                            } finally {
-                                return;
-                            }
-                        }
-                    }
-
+                .url("Must be a valid URL")
+                .superRefine(async (url, ctx) => {
                     try {
-                        const response = await fetch(urlOrPath, {
+                        const response = await fetch(url, {
                             method: "HEAD"
                         }).catch(() => {
                             // If HEAD fails (CORS or method not allowed), try GET
-                            return fetch(urlOrPath, { method: "GET" });
+                            return fetch(url, { method: "GET" });
                         });
 
                         if (response.status !== 200) {

server/routers/client/index.ts

@@ -6,7 +6,6 @@ export * from "./unarchiveClient";
 export * from "./blockClient";
 export * from "./unblockClient";
 export * from "./listClients";
-export * from "./listUserDevices";
 export * from "./updateClient";
 export * from "./getClient";
 export * from "./createUserClient";

server/routers/client/listClients.ts

@@ -1,38 +1,34 @@
+import { db, olms, users } from "@server/db";
 import {
     clients,
-    clientSitesAssociationsCache,
-    currentFingerprint,
-    db,
-    olms,
     orgs,
     roleClients,
     sites,
     userClients,
-    users
+    clientSitesAssociationsCache,
+    currentFingerprint
 } from "@server/db";
-import response from "@server/lib/response";
 import logger from "@server/logger";
-import { OpenAPITags, registry } from "@server/openApi";
 import HttpCode from "@server/types/HttpCode";
-import type { PaginatedResponse } from "@server/types/Pagination";
+import response from "@server/lib/response";
 import {
     and,
-    asc,
-    desc,
+    count,
     eq,
     inArray,
+    isNotNull,
     isNull,
-    like,
     or,
-    sql,
-    type SQL
+    sql
 } from "drizzle-orm";
 import { NextFunction, Request, Response } from "express";
 import createHttpError from "http-errors";
-import NodeCache from "node-cache";
-import semver from "semver";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
+import NodeCache from "node-cache";
+import semver from "semver";
+import { getUserDeviceName } from "@server/db/names";
 
 const olmVersionCache = new NodeCache({ stdTTL: 3600 });
 
@@ -93,86 +89,38 @@ const listClientsParamsSchema = z.strictObject({
 });
 
 const listClientsSchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
+    limit: z
+        .string()
         .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().positive()),
+    offset: z
+        .string()
         .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional(),
-    sort_by: z
-        .enum(["megabytesIn", "megabytesOut"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["megabytesIn", "megabytesOut"],
-            description: "Field to sort by"
-        }),
-    order: z
-        .enum(["asc", "desc"])
-        .optional()
-        .default("asc")
-        .catch("asc")
-        .openapi({
-            type: "string",
-            enum: ["asc", "desc"],
-            default: "asc",
-            description: "Sort order"
-        }),
-    online: z
-        .enum(["true", "false"])
-        .transform((v) => v === "true")
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "boolean",
-            description: "Filter by online status"
-        }),
-    status: z.preprocess(
-        (val: string | undefined) => {
-            if (val) {
-                return val.split(","); // the search query array is an array joined by commas
-            }
-            return undefined;
-        },
-        z
-            .array(z.enum(["active", "blocked", "archived"]))
-            .optional()
-            .default(["active"])
-            .catch(["active"])
-            .openapi({
-                type: "array",
-                items: {
-                    type: "string",
-                    enum: ["active", "blocked", "archived"]
-                },
-                default: ["active"],
-                description:
-                    "Filter by client status. Can be a comma-separated list of values. Defaults to 'active'."
-            })
-    )
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative()),
+    filter: z.enum(["user", "machine"]).optional()
 });
 
-function queryClientsBase() {
+function queryClients(
+    orgId: string,
+    accessibleClientIds: number[],
+    filter?: "user" | "machine"
+) {
+    const conditions = [
+        inArray(clients.clientId, accessibleClientIds),
+        eq(clients.orgId, orgId)
+    ];
+
+    // Add filter condition based on filter type
+    if (filter === "user") {
+        conditions.push(isNotNull(clients.userId));
+    } else if (filter === "machine") {
+        conditions.push(isNull(clients.userId));
+    }
+
     return db
         .select({
             clientId: clients.clientId,
@@ -194,13 +142,22 @@ function queryClientsBase() {
             approvalState: clients.approvalState,
             olmArchived: olms.archived,
             archived: clients.archived,
-            blocked: clients.blocked
+            blocked: clients.blocked,
+            deviceModel: currentFingerprint.deviceModel,
+            fingerprintPlatform: currentFingerprint.platform,
+            fingerprintOsVersion: currentFingerprint.osVersion,
+            fingerprintKernelVersion: currentFingerprint.kernelVersion,
+            fingerprintArch: currentFingerprint.arch,
+            fingerprintSerialNumber: currentFingerprint.serialNumber,
+            fingerprintUsername: currentFingerprint.username,
+            fingerprintHostname: currentFingerprint.hostname
         })
         .from(clients)
         .leftJoin(orgs, eq(clients.orgId, orgs.orgId))
         .leftJoin(olms, eq(clients.clientId, olms.clientId))
         .leftJoin(users, eq(clients.userId, users.userId))
-        .leftJoin(currentFingerprint, eq(olms.olmId, currentFingerprint.olmId));
+        .leftJoin(currentFingerprint, eq(olms.olmId, currentFingerprint.olmId))
+        .where(and(...conditions));
 }
 
 async function getSiteAssociations(clientIds: number[]) {
@@ -218,7 +175,7 @@ async function getSiteAssociations(clientIds: number[]) {
         .where(inArray(clientSitesAssociationsCache.clientId, clientIds));
 }
 
-type ClientWithSites = Awaited<ReturnType<typeof queryClientsBase>>[0] & {
+type ClientWithSites = Awaited<ReturnType<typeof queryClients>>[0] & {
     sites: Array<{
         siteId: number;
         siteName: string | null;
@@ -229,9 +186,10 @@ type ClientWithSites = Awaited<ReturnType<typeof queryClientsBase>>[0] & {
 
 type OlmWithUpdateAvailable = ClientWithSites;
 
-export type ListClientsResponse = PaginatedResponse<{
+export type ListClientsResponse = {
     clients: Array<ClientWithSites>;
-}>;
+    pagination: { total: number; limit: number; offset: number };
+};
 
 registry.registerPath({
     method: "get",
@@ -260,8 +218,7 @@ export async function listClients(
                 )
             );
         }
-        const { page, pageSize, online, query, status, sort_by, order } =
-            parsedQuery.data;
+        const { limit, offset, filter } = parsedQuery.data;
 
         const parsedParams = listClientsParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
@@ -310,73 +267,28 @@ export async function listClients(
         const accessibleClientIds = accessibleClients.map(
             (client) => client.clientId
         );
+        const baseQuery = queryClients(orgId, accessibleClientIds, filter);
 
         // Get client count with filter
-        const conditions = [
-            and(
-                inArray(clients.clientId, accessibleClientIds),
-                eq(clients.orgId, orgId),
-                isNull(clients.userId)
-            )
+        const countConditions = [
+            inArray(clients.clientId, accessibleClientIds),
+            eq(clients.orgId, orgId)
         ];
 
-        if (typeof online !== "undefined") {
-            conditions.push(eq(clients.online, online));
+        if (filter === "user") {
+            countConditions.push(isNotNull(clients.userId));
+        } else if (filter === "machine") {
+            countConditions.push(isNull(clients.userId));
         }
 
-        if (status.length > 0) {
-            const filterAggregates: (SQL<unknown> | undefined)[] = [];
+        const countQuery = db
+            .select({ count: count() })
+            .from(clients)
+            .where(and(...countConditions));
 
-            if (status.includes("active")) {
-                filterAggregates.push(
-                    and(eq(clients.archived, false), eq(clients.blocked, false))
-                );
-            }
-
-            if (status.includes("archived")) {
-                filterAggregates.push(eq(clients.archived, true));
-            }
-            if (status.includes("blocked")) {
-                filterAggregates.push(eq(clients.blocked, true));
-            }
-
-            conditions.push(or(...filterAggregates));
-        }
-
-        if (query) {
-            conditions.push(
-                or(
-                    like(
-                        sql`LOWER(${clients.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${clients.niceId})`,
-                        "%" + query.toLowerCase() + "%"
-                    )
-                )
-            );
-        }
-
-        const baseQuery = queryClientsBase().where(and(...conditions));
-
-        const countQuery = db.$count(baseQuery.as("filtered_clients"));
-
-        const listMachinesQuery = baseQuery
-            .limit(page)
-            .offset(pageSize * (page - 1))
-            .orderBy(
-                sort_by
-                    ? order === "asc"
-                        ? asc(clients[sort_by])
-                        : desc(clients[sort_by])
-                    : asc(clients.clientId)
-            );
-
-        const [clientsList, totalCount] = await Promise.all([
-            listMachinesQuery,
-            countQuery
-        ]);
+        const clientsList = await baseQuery.limit(limit).offset(offset);
+        const totalCountResult = await countQuery;
+        const totalCount = totalCountResult[0].count;
 
         // Get associated sites for all clients
         const clientIds = clientsList.map((client) => client.clientId);
@@ -407,8 +319,14 @@ export async function listClients(
 
         // Merge clients with their site associations and replace name with device name
         const clientsWithSites = clientsList.map((client) => {
+            const model = client.deviceModel || null;
+            let newName = client.name;
+            if (filter === "user") {
+                newName = getUserDeviceName(model, client.name);
+            }
             return {
                 ...client,
+                name: newName,
                 sites: sitesByClient[client.clientId] || []
             };
         });
@@ -453,8 +371,8 @@ export async function listClients(
                 clients: olmsWithUpdates,
                 pagination: {
                     total: totalCount,
-                    page,
-                    pageSize
+                    limit,
+                    offset
                 }
             },
             success: true,

server/routers/client/listUserDevices.ts

@@ -1,500 +0,0 @@
-import { build } from "@server/build";
-import {
-    clients,
-    currentFingerprint,
-    db,
-    olms,
-    orgs,
-    roleClients,
-    userClients,
-    users
-} from "@server/db";
-import { getUserDeviceName } from "@server/db/names";
-import response from "@server/lib/response";
-import logger from "@server/logger";
-import { OpenAPITags, registry } from "@server/openApi";
-import HttpCode from "@server/types/HttpCode";
-import type { PaginatedResponse } from "@server/types/Pagination";
-import {
-    and,
-    asc,
-    desc,
-    eq,
-    inArray,
-    isNotNull,
-    isNull,
-    like,
-    or,
-    sql,
-    type SQL
-} from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import NodeCache from "node-cache";
-import semver from "semver";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
-
-const olmVersionCache = new NodeCache({ stdTTL: 3600 });
-
-async function getLatestOlmVersion(): Promise<string | null> {
-    try {
-        const cachedVersion = olmVersionCache.get<string>("latestOlmVersion");
-        if (cachedVersion) {
-            return cachedVersion;
-        }
-
-        const controller = new AbortController();
-        const timeoutId = setTimeout(() => controller.abort(), 1500);
-
-        const response = await fetch(
-            "https://api.github.com/repos/fosrl/olm/tags",
-            {
-                signal: controller.signal
-            }
-        );
-
-        clearTimeout(timeoutId);
-
-        if (!response.ok) {
-            logger.warn(
-                `Failed to fetch latest Olm version from GitHub: ${response.status} ${response.statusText}`
-            );
-            return null;
-        }
-
-        let tags = await response.json();
-        if (!Array.isArray(tags) || tags.length === 0) {
-            logger.warn("No tags found for Olm repository");
-            return null;
-        }
-        tags = tags.filter((version) => !version.name.includes("rc"));
-        const latestVersion = tags[0].name;
-
-        olmVersionCache.set("latestOlmVersion", latestVersion);
-
-        return latestVersion;
-    } catch (error: any) {
-        if (error.name === "AbortError") {
-            logger.warn("Request to fetch latest Olm version timed out (1.5s)");
-        } else if (error.cause?.code === "UND_ERR_CONNECT_TIMEOUT") {
-            logger.warn("Connection timeout while fetching latest Olm version");
-        } else {
-            logger.warn(
-                "Error fetching latest Olm version:",
-                error.message || error
-            );
-        }
-        return null;
-    }
-}
-
-const listUserDevicesParamsSchema = z.strictObject({
-    orgId: z.string()
-});
-
-const listUserDevicesSchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
-        .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
-        .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional(),
-    sort_by: z
-        .enum(["megabytesIn", "megabytesOut"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["megabytesIn", "megabytesOut"],
-            description: "Field to sort by"
-        }),
-    order: z
-        .enum(["asc", "desc"])
-        .optional()
-        .default("asc")
-        .catch("asc")
-        .openapi({
-            type: "string",
-            enum: ["asc", "desc"],
-            default: "asc",
-            description: "Sort order"
-        }),
-    online: z
-        .enum(["true", "false"])
-        .transform((v) => v === "true")
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "boolean",
-            description: "Filter by online status"
-        }),
-    agent: z
-        .enum([
-            "windows",
-            "android",
-            "cli",
-            "olm",
-            "macos",
-            "ios",
-            "ipados",
-            "unknown"
-        ])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: [
-                "windows",
-                "android",
-                "cli",
-                "olm",
-                "macos",
-                "ios",
-                "ipados",
-                "unknown"
-            ],
-            description:
-                "Filter by agent type. Use 'unknown' to filter clients with no agent detected."
-        }),
-    status: z.preprocess(
-        (val: string | undefined) => {
-            if (val) {
-                return val.split(","); // the search query array is an array joined by commas
-            }
-            return undefined;
-        },
-        z
-            .array(
-                z.enum(["active", "pending", "denied", "blocked", "archived"])
-            )
-            .optional()
-            .default(["active", "pending"])
-            .catch(["active", "pending"])
-            .openapi({
-                type: "array",
-                items: {
-                    type: "string",
-                    enum: ["active", "pending", "denied", "blocked", "archived"]
-                },
-                default: ["active", "pending"],
-                description:
-                    "Filter by device status. Can include multiple values separated by commas. 'active' means not archived, not blocked, and if approval is enabled, approved. 'pending' and 'denied' are only applicable if approval is enabled."
-            })
-    )
-});
-
-function queryUserDevicesBase() {
-    return db
-        .select({
-            clientId: clients.clientId,
-            orgId: clients.orgId,
-            name: clients.name,
-            pubKey: clients.pubKey,
-            subnet: clients.subnet,
-            megabytesIn: clients.megabytesIn,
-            megabytesOut: clients.megabytesOut,
-            orgName: orgs.name,
-            type: clients.type,
-            online: clients.online,
-            olmVersion: olms.version,
-            userId: clients.userId,
-            username: users.username,
-            userEmail: users.email,
-            niceId: clients.niceId,
-            agent: olms.agent,
-            approvalState: clients.approvalState,
-            olmArchived: olms.archived,
-            archived: clients.archived,
-            blocked: clients.blocked,
-            deviceModel: currentFingerprint.deviceModel,
-            fingerprintPlatform: currentFingerprint.platform,
-            fingerprintOsVersion: currentFingerprint.osVersion,
-            fingerprintKernelVersion: currentFingerprint.kernelVersion,
-            fingerprintArch: currentFingerprint.arch,
-            fingerprintSerialNumber: currentFingerprint.serialNumber,
-            fingerprintUsername: currentFingerprint.username,
-            fingerprintHostname: currentFingerprint.hostname
-        })
-        .from(clients)
-        .leftJoin(orgs, eq(clients.orgId, orgs.orgId))
-        .leftJoin(olms, eq(clients.clientId, olms.clientId))
-        .leftJoin(users, eq(clients.userId, users.userId))
-        .leftJoin(currentFingerprint, eq(olms.olmId, currentFingerprint.olmId));
-}
-
-type OlmWithUpdateAvailable = Awaited<
-    ReturnType<typeof queryUserDevicesBase>
->[0] & {
-    olmUpdateAvailable?: boolean;
-};
-
-export type ListUserDevicesResponse = PaginatedResponse<{
-    devices: Array<OlmWithUpdateAvailable>;
-}>;
-
-registry.registerPath({
-    method: "get",
-    path: "/org/{orgId}/user-devices",
-    description: "List all user devices for an organization.",
-    tags: [OpenAPITags.Client, OpenAPITags.Org],
-    request: {
-        query: listUserDevicesSchema,
-        params: listUserDevicesParamsSchema
-    },
-    responses: {}
-});
-
-export async function listUserDevices(
-    req: Request,
-    res: Response,
-    next: NextFunction
-): Promise<any> {
-    try {
-        const parsedQuery = listUserDevicesSchema.safeParse(req.query);
-        if (!parsedQuery.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedQuery.error)
-                )
-            );
-        }
-        const { page, pageSize, query, sort_by, online, status, agent, order } =
-            parsedQuery.data;
-
-        const parsedParams = listUserDevicesParamsSchema.safeParse(req.params);
-        if (!parsedParams.success) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    fromError(parsedParams.error)
-                )
-            );
-        }
-        const { orgId } = parsedParams.data;
-
-        if (req.user && orgId && orgId !== req.userOrgId) {
-            return next(
-                createHttpError(
-                    HttpCode.FORBIDDEN,
-                    "User does not have access to this organization"
-                )
-            );
-        }
-
-        let accessibleClients;
-        if (req.user) {
-            accessibleClients = await db
-                .select({
-                    clientId: sql<number>`COALESCE(${userClients.clientId}, ${roleClients.clientId})`
-                })
-                .from(userClients)
-                .fullJoin(
-                    roleClients,
-                    eq(userClients.clientId, roleClients.clientId)
-                )
-                .where(
-                    or(
-                        eq(userClients.userId, req.user!.userId),
-                        eq(roleClients.roleId, req.userOrgRoleId!)
-                    )
-                );
-        } else {
-            accessibleClients = await db
-                .select({ clientId: clients.clientId })
-                .from(clients)
-                .where(eq(clients.orgId, orgId));
-        }
-
-        const accessibleClientIds = accessibleClients.map(
-            (client) => client.clientId
-        );
-        // Get client count with filter
-        const conditions = [
-            and(
-                inArray(clients.clientId, accessibleClientIds),
-                eq(clients.orgId, orgId),
-                isNotNull(clients.userId)
-            )
-        ];
-
-        if (query) {
-            conditions.push(
-                or(
-                    like(
-                        sql`LOWER(${clients.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${clients.niceId})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${users.email})`,
-                        "%" + query.toLowerCase() + "%"
-                    )
-                )
-            );
-        }
-
-        if (typeof online !== "undefined") {
-            conditions.push(eq(clients.online, online));
-        }
-
-        const agentValueMap = {
-            windows: "Pangolin Windows",
-            android: "Pangolin Android",
-            ios: "Pangolin iOS",
-            ipados: "Pangolin iPadOS",
-            macos: "Pangolin macOS",
-            cli: "Pangolin CLI",
-            olm: "Olm CLI"
-        } satisfies Record<
-            Exclude<typeof agent, undefined | "unknown">,
-            string
-        >;
-        if (typeof agent !== "undefined") {
-            if (agent === "unknown") {
-                conditions.push(isNull(olms.agent));
-            } else {
-                conditions.push(eq(olms.agent, agentValueMap[agent]));
-            }
-        }
-
-        if (status.length > 0) {
-            const filterAggregates: (SQL<unknown> | undefined)[] = [];
-
-            if (status.includes("active")) {
-                filterAggregates.push(
-                    and(
-                        eq(clients.archived, false),
-                        eq(clients.blocked, false),
-                        build !== "oss"
-                            ? or(
-                                  eq(clients.approvalState, "approved"),
-                                  isNull(clients.approvalState) // approval state of `NULL` means approved by default
-                              )
-                            : undefined // undefined are automatically ignored by `drizzle-orm`
-                    )
-                );
-            }
-
-            if (status.includes("archived")) {
-                filterAggregates.push(eq(clients.archived, true));
-            }
-            if (status.includes("blocked")) {
-                filterAggregates.push(eq(clients.blocked, true));
-            }
-
-            if (build !== "oss") {
-                if (status.includes("pending")) {
-                    filterAggregates.push(eq(clients.approvalState, "pending"));
-                }
-                if (status.includes("denied")) {
-                    filterAggregates.push(eq(clients.approvalState, "denied"));
-                }
-            }
-
-            conditions.push(or(...filterAggregates));
-        }
-
-        const baseQuery = queryUserDevicesBase().where(and(...conditions));
-
-        const countQuery = db.$count(baseQuery.as("filtered_clients"));
-
-        const listDevicesQuery = baseQuery
-            .limit(pageSize)
-            .offset(pageSize * (page - 1))
-            .orderBy(
-                sort_by
-                    ? order === "asc"
-                        ? asc(clients[sort_by])
-                        : desc(clients[sort_by])
-                    : asc(clients.clientId)
-            );
-
-        const [clientsList, totalCount] = await Promise.all([
-            listDevicesQuery,
-            countQuery
-        ]);
-
-        // Merge clients with their site associations and replace name with device name
-        const olmsWithUpdates: OlmWithUpdateAvailable[] = clientsList.map(
-            (client) => {
-                const model = client.deviceModel || null;
-                const newName = getUserDeviceName(model, client.name);
-                const OlmWithUpdate: OlmWithUpdateAvailable = {
-                    ...client,
-                    name: newName
-                };
-                // Initially set to false, will be updated if version check succeeds
-                OlmWithUpdate.olmUpdateAvailable = false;
-                return OlmWithUpdate;
-            }
-        );
-
-        // Try to get the latest version, but don't block if it fails
-        try {
-            const latestOlmVersion = await getLatestOlmVersion();
-
-            if (latestOlmVersion) {
-                olmsWithUpdates.forEach((client) => {
-                    try {
-                        client.olmUpdateAvailable = semver.lt(
-                            client.olmVersion ? client.olmVersion : "",
-                            latestOlmVersion
-                        );
-                    } catch (error) {
-                        client.olmUpdateAvailable = false;
-                    }
-                });
-            }
-        } catch (error) {
-            // Log the error but don't let it block the response
-            logger.warn(
-                "Failed to check for OLM updates, continuing without update info:",
-                error
-            );
-        }
-
-        return response<ListUserDevicesResponse>(res, {
-            data: {
-                devices: olmsWithUpdates,
-                pagination: {
-                    total: totalCount,
-                    page,
-                    pageSize
-                }
-            },
-            success: true,
-            error: false,
-            message: "Clients retrieved successfully",
-            status: HttpCode.OK
-        });
-    } catch (error) {
-        logger.error(error);
-        return next(
-            createHttpError(HttpCode.INTERNAL_SERVER_ERROR, "An error occurred")
-        );
-    }
-}

server/routers/external.ts

@@ -145,13 +145,6 @@ authenticated.get(
     client.listClients
 );
 
-authenticated.get(
-    "/org/:orgId/user-devices",
-    verifyOrgAccess,
-    verifyUserHasAction(ActionsEnum.listClients),
-    client.listUserDevices
-);
-
 authenticated.get(
     "/client/:clientId",
     verifyClientAccess,

server/routers/idp/createIdpOrgPolicy.ts

@@ -70,15 +70,6 @@ export async function createIdpOrgPolicy(
         const { idpId, orgId } = parsedParams.data;
         const { roleMapping, orgMapping } = parsedBody.data;
 
-        if (process.env.IDENTITY_PROVIDER_MODE === "org") {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Global IdP creation is not allowed in the current identity provider mode. Set app.identity_provider_mode to 'global' in the private configuration to enable this feature."
-                )
-            );
-        }
-
         const [existing] = await db
             .select()
             .from(idp)

server/routers/idp/createOidcIdp.ts

@@ -80,17 +80,6 @@ export async function createOidcIdp(
             tags
         } = parsedBody.data;
 
-        if (
-            process.env.IDENTITY_PROVIDER_MODE === "org"
-        ) {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Global IdP creation is not allowed in the current identity provider mode. Set app.identity_provider_mode to 'global' in the private configuration to enable this feature."
-                )
-            );
-        }
-
         const key = config.getRawConfig().server.secret!;
 
         const encryptedSecret = encrypt(clientSecret, key);

server/routers/idp/updateIdpOrgPolicy.ts

@@ -69,15 +69,6 @@ export async function updateIdpOrgPolicy(
         const { idpId, orgId } = parsedParams.data;
         const { roleMapping, orgMapping } = parsedBody.data;
 
-        if (process.env.IDENTITY_PROVIDER_MODE === "org") {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Global IdP creation is not allowed in the current identity provider mode. Set app.identity_provider_mode to 'global' in the private configuration to enable this feature."
-                )
-            );
-        }
-
         // Check if IDP and policy exist
         const [existing] = await db
             .select()

server/routers/idp/updateOidcIdp.ts

@@ -99,15 +99,6 @@ export async function updateOidcIdp(
             tags
         } = parsedBody.data;
 
-        if (process.env.IDENTITY_PROVIDER_MODE === "org") {
-            return next(
-                createHttpError(
-                    HttpCode.BAD_REQUEST,
-                    "Global IdP creation is not allowed in the current identity provider mode. Set app.identity_provider_mode to 'global' in the private configuration to enable this feature."
-                )
-            );
-        }
-
         // Check if IDP exists and is of type OIDC
         const [existingIdp] = await db
             .select()

server/routers/integration.ts

@@ -866,13 +866,6 @@ authenticated.get(
     client.listClients
 );
 
-authenticated.get(
-    "/org/:orgId/user-devices",
-    verifyApiKeyOrgAccess,
-    verifyApiKeyHasAction(ActionsEnum.listClients),
-    client.listUserDevices
-);
-
 authenticated.get(
     "/client/:clientId",
     verifyApiKeyClientAccess,

server/routers/resource/listResources.ts

@@ -1,99 +1,74 @@
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
 import {
     db,
     resourceHeaderAuth,
-    resourceHeaderAuthExtendedCompatibility,
+    resourceHeaderAuthExtendedCompatibility
+} from "@server/db";
+import {
+    resources,
+    userResources,
+    roleResources,
     resourcePassword,
     resourcePincode,
-    resources,
-    roleResources,
-    targetHealthCheck,
     targets,
-    userResources
+    targetHealthCheck
 } from "@server/db";
 import response from "@server/lib/response";
-import logger from "@server/logger";
-import { OpenAPITags, registry } from "@server/openApi";
 import HttpCode from "@server/types/HttpCode";
-import type { PaginatedResponse } from "@server/types/Pagination";
-import {
-    and,
-    asc,
-    count,
-    eq,
-    inArray,
-    isNull,
-    like,
-    not,
-    or,
-    sql,
-    type SQL
-} from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
 import createHttpError from "http-errors";
-import { z } from "zod";
+import { sql, eq, or, inArray, and, count } from "drizzle-orm";
+import logger from "@server/logger";
 import { fromZodError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
 
 const listResourcesParamsSchema = z.strictObject({
     orgId: z.string()
 });
 
 const listResourcesSchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
+    limit: z
+        .string()
         .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().nonnegative()),
+
+    offset: z
+        .string()
         .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional(),
-    enabled: z
-        .enum(["true", "false"])
-        .transform((v) => v === "true")
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "boolean",
-            description: "Filter resources based on enabled status"
-        }),
-    authState: z
-        .enum(["protected", "not_protected", "none"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["protected", "not_protected", "none"],
-            description:
-                "Filter resources based on authentication state. `protected` means the resource has at least one auth mechanism (password, pincode, header auth, SSO, or email whitelist). `not_protected` means the resource has no auth mechanisms. `none` means the resource is not protected by HTTP (i.e. it has no auth mechanisms and http is false)."
-        }),
-    healthStatus: z
-        .enum(["no_targets", "healthy", "degraded", "offline", "unknown"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["no_targets", "healthy", "degraded", "offline", "unknown"],
-            description:
-                "Filter resources based on health status of their targets. `healthy` means all targets are healthy. `degraded` means at least one target is unhealthy, but not all are unhealthy. `offline` means all targets are unhealthy. `unknown` means all targets have unknown health status. `no_targets` means the resource has no targets."
-        })
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative())
 });
 
+// (resource fields + a single joined target)
+type JoinedRow = {
+    resourceId: number;
+    niceId: string;
+    name: string;
+    ssl: boolean;
+    fullDomain: string | null;
+    passwordId: number | null;
+    sso: boolean;
+    pincodeId: number | null;
+    whitelist: boolean;
+    http: boolean;
+    protocol: string;
+    proxyPort: number | null;
+    enabled: boolean;
+    domainId: string | null;
+    headerAuthId: number | null;
+
+    targetId: number | null;
+    targetIp: string | null;
+    targetPort: number | null;
+    targetEnabled: boolean | null;
+
+    hcHealth: string | null;
+    hcEnabled: boolean | null;
+};
+
 // grouped by resource with targets[])
 export type ResourceWithTargets = {
     resourceId: number;
@@ -116,32 +91,11 @@ export type ResourceWithTargets = {
         ip: string;
         port: number;
         enabled: boolean;
-        healthStatus: "healthy" | "unhealthy" | "unknown" | null;
+        healthStatus?: "healthy" | "unhealthy" | "unknown";
     }>;
 };
 
-// Aggregate filters
-const total_targets = count(targets.targetId);
-const healthy_targets = sql<number>`SUM(
-                    CASE
-                    WHEN ${targetHealthCheck.hcHealth} = 'healthy' THEN 1
-                    ELSE 0
-                    END
-                ) `;
-const unknown_targets = sql<number>`SUM(
-                    CASE
-                    WHEN ${targetHealthCheck.hcHealth} = 'unknown' THEN 1
-                    ELSE 0
-                    END
-                ) `;
-const unhealthy_targets = sql<number>`SUM(
-                    CASE
-                    WHEN ${targetHealthCheck.hcHealth} = 'unhealthy' THEN 1
-                    ELSE 0
-                    END
-                ) `;
-
-function queryResourcesBase() {
+function queryResources(accessibleResourceIds: number[], orgId: string) {
     return db
         .select({
             resourceId: resources.resourceId,
@@ -160,7 +114,14 @@ function queryResourcesBase() {
             niceId: resources.niceId,
             headerAuthId: resourceHeaderAuth.headerAuthId,
             headerAuthExtendedCompatibilityId:
-                resourceHeaderAuthExtendedCompatibility.headerAuthExtendedCompatibilityId
+                resourceHeaderAuthExtendedCompatibility.headerAuthExtendedCompatibilityId,
+            targetId: targets.targetId,
+            targetIp: targets.ip,
+            targetPort: targets.port,
+            targetEnabled: targets.enabled,
+
+            hcHealth: targetHealthCheck.hcHealth,
+            hcEnabled: targetHealthCheck.hcEnabled
         })
         .from(resources)
         .leftJoin(
@@ -187,18 +148,18 @@ function queryResourcesBase() {
             targetHealthCheck,
             eq(targetHealthCheck.targetId, targets.targetId)
         )
-        .groupBy(
-            resources.resourceId,
-            resourcePassword.passwordId,
-            resourcePincode.pincodeId,
-            resourceHeaderAuth.headerAuthId,
-            resourceHeaderAuthExtendedCompatibility.headerAuthExtendedCompatibilityId
+        .where(
+            and(
+                inArray(resources.resourceId, accessibleResourceIds),
+                eq(resources.orgId, orgId)
+            )
         );
 }
 
-export type ListResourcesResponse = PaginatedResponse<{
+export type ListResourcesResponse = {
     resources: ResourceWithTargets[];
-}>;
+    pagination: { total: number; limit: number; offset: number };
+};
 
 registry.registerPath({
     method: "get",
@@ -229,8 +190,7 @@ export async function listResources(
                 )
             );
         }
-        const { page, pageSize, authState, enabled, query, healthStatus } =
-            parsedQuery.data;
+        const { limit, offset } = parsedQuery.data;
 
         const parsedParams = listResourcesParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
@@ -292,133 +252,14 @@ export async function listResources(
             (resource) => resource.resourceId
         );
 
-        const conditions = [
-            and(
-                inArray(resources.resourceId, accessibleResourceIds),
-                eq(resources.orgId, orgId)
-            )
-        ];
+        const countQuery: any = db
+            .select({ count: count() })
+            .from(resources)
+            .where(inArray(resources.resourceId, accessibleResourceIds));
 
-        if (query) {
-            conditions.push(
-                or(
-                    like(
-                        sql`LOWER(${resources.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${resources.niceId})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${resources.fullDomain})`,
-                        "%" + query.toLowerCase() + "%"
-                    )
-                )
-            );
-        }
-        if (typeof enabled !== "undefined") {
-            conditions.push(eq(resources.enabled, enabled));
-        }
+        const baseQuery = queryResources(accessibleResourceIds, orgId);
 
-        if (typeof authState !== "undefined") {
-            switch (authState) {
-                case "none":
-                    conditions.push(eq(resources.http, false));
-                    break;
-                case "protected":
-                    conditions.push(
-                        or(
-                            eq(resources.sso, true),
-                            eq(resources.emailWhitelistEnabled, true),
-                            not(isNull(resourceHeaderAuth.headerAuthId)),
-                            not(isNull(resourcePincode.pincodeId)),
-                            not(isNull(resourcePassword.passwordId))
-                        )
-                    );
-                    break;
-                case "not_protected":
-                    conditions.push(
-                        not(eq(resources.sso, true)),
-                        not(eq(resources.emailWhitelistEnabled, true)),
-                        isNull(resourceHeaderAuth.headerAuthId),
-                        isNull(resourcePincode.pincodeId),
-                        isNull(resourcePassword.passwordId)
-                    );
-                    break;
-            }
-        }
-
-        let aggregateFilters: SQL<any> | undefined = sql`1 = 1`;
-
-        if (typeof healthStatus !== "undefined") {
-            switch (healthStatus) {
-                case "healthy":
-                    aggregateFilters = and(
-                        sql`${total_targets} > 0`,
-                        sql`${healthy_targets} = ${total_targets}`
-                    );
-                    break;
-                case "degraded":
-                    aggregateFilters = and(
-                        sql`${total_targets} > 0`,
-                        sql`${unhealthy_targets} > 0`
-                    );
-                    break;
-                case "no_targets":
-                    aggregateFilters = sql`${total_targets} = 0`;
-                    break;
-                case "offline":
-                    aggregateFilters = and(
-                        sql`${total_targets} > 0`,
-                        sql`${healthy_targets} = 0`,
-                        sql`${unhealthy_targets} = ${total_targets}`
-                    );
-                    break;
-                case "unknown":
-                    aggregateFilters = and(
-                        sql`${total_targets} > 0`,
-                        sql`${unknown_targets} = ${total_targets}`
-                    );
-                    break;
-            }
-        }
-
-        const baseQuery = queryResourcesBase()
-            .where(and(...conditions))
-            .having(aggregateFilters);
-
-        // we need to add `as` so that drizzle filters the result as a subquery
-        const countQuery = db.$count(baseQuery.as("filtered_resources"));
-
-        const [rows, totalCount] = await Promise.all([
-            baseQuery
-                .limit(pageSize)
-                .offset(pageSize * (page - 1))
-                .orderBy(asc(resources.resourceId)),
-            countQuery
-        ]);
-
-        const resourceIdList = rows.map((row) => row.resourceId);
-        const allResourceTargets =
-            resourceIdList.length === 0
-                ? []
-                : await db
-                      .select({
-                          targetId: targets.targetId,
-                          resourceId: targets.resourceId,
-                          ip: targets.ip,
-                          port: targets.port,
-                          enabled: targets.enabled,
-                          healthStatus: targetHealthCheck.hcHealth,
-                          hcEnabled: targetHealthCheck.hcEnabled
-                      })
-                      .from(targets)
-                      .where(inArray(targets.resourceId, resourceIdList))
-                      .leftJoin(
-                          targetHealthCheck,
-                          eq(targetHealthCheck.targetId, targets.targetId)
-                      );
+        const rows: JoinedRow[] = await baseQuery.limit(limit).offset(offset);
 
         // avoids TS issues with reduce/never[]
         const map = new Map<number, ResourceWithTargets>();
@@ -447,20 +288,44 @@ export async function listResources(
                 map.set(row.resourceId, entry);
             }
 
-            entry.targets = allResourceTargets.filter(
-                (t) => t.resourceId === entry.resourceId
-            );
+            if (
+                row.targetId != null &&
+                row.targetIp &&
+                row.targetPort != null &&
+                row.targetEnabled != null
+            ) {
+                let healthStatus: "healthy" | "unhealthy" | "unknown" =
+                    "unknown";
+
+                if (row.hcEnabled && row.hcHealth) {
+                    healthStatus = row.hcHealth as
+                        | "healthy"
+                        | "unhealthy"
+                        | "unknown";
+                }
+
+                entry.targets.push({
+                    targetId: row.targetId,
+                    ip: row.targetIp,
+                    port: row.targetPort,
+                    enabled: row.targetEnabled,
+                    healthStatus: healthStatus
+                });
+            }
         }
 
         const resourcesList: ResourceWithTargets[] = Array.from(map.values());
 
+        const totalCountResult = await countQuery;
+        const totalCount = totalCountResult[0]?.count ?? 0;
+
         return response<ListResourcesResponse>(res, {
             data: {
                 resources: resourcesList,
                 pagination: {
                     total: totalCount,
-                    pageSize,
-                    page
+                    limit,
+                    offset
                 }
             },
             success: true,

server/routers/site/listSites.ts

@@ -1,25 +1,17 @@
-import {
-    db,
-    exitNodes,
-    newts,
-    orgs,
-    remoteExitNodes,
-    roleSites,
-    sites,
-    userSites
-} from "@server/db";
-import cache from "@server/lib/cache";
-import response from "@server/lib/response";
+import { db, exitNodes, newts } from "@server/db";
+import { orgs, roleSites, sites, userSites } from "@server/db";
+import { remoteExitNodes } from "@server/db";
 import logger from "@server/logger";
-import { OpenAPITags, registry } from "@server/openApi";
 import HttpCode from "@server/types/HttpCode";
-import type { PaginatedResponse } from "@server/types/Pagination";
-import { and, asc, desc, eq, inArray, like, or, sql } from "drizzle-orm";
+import response from "@server/lib/response";
+import { and, count, eq, inArray, or, sql } from "drizzle-orm";
 import { NextFunction, Request, Response } from "express";
 import createHttpError from "http-errors";
-import semver from "semver";
 import { z } from "zod";
 import { fromError } from "zod-validation-error";
+import { OpenAPITags, registry } from "@server/openApi";
+import semver from "semver";
+import cache from "@server/lib/cache";
 
 async function getLatestNewtVersion(): Promise<string | null> {
     try {
@@ -82,63 +74,21 @@ const listSitesParamsSchema = z.strictObject({
 });
 
 const listSitesSchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
+    limit: z
+        .string()
         .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().positive()),
+    offset: z
+        .string()
         .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional(),
-    sort_by: z
-        .enum(["megabytesIn", "megabytesOut"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["megabytesIn", "megabytesOut"],
-            description: "Field to sort by"
-        }),
-    order: z
-        .enum(["asc", "desc"])
-        .optional()
-        .default("asc")
-        .catch("asc")
-        .openapi({
-            type: "string",
-            enum: ["asc", "desc"],
-            default: "asc",
-            description: "Sort order"
-        }),
-    online: z
-        .enum(["true", "false"])
-        .transform((v) => v === "true")
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "boolean",
-            description: "Filter by online status"
-        })
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative())
 });
 
-function querySitesBase() {
+function querySites(orgId: string, accessibleSiteIds: number[]) {
     return db
         .select({
             siteId: sites.siteId,
@@ -165,16 +115,23 @@ function querySitesBase() {
         .leftJoin(
             remoteExitNodes,
             eq(remoteExitNodes.exitNodeId, sites.exitNodeId)
+        )
+        .where(
+            and(
+                inArray(sites.siteId, accessibleSiteIds),
+                eq(sites.orgId, orgId)
+            )
         );
 }
 
-type SiteWithUpdateAvailable = Awaited<ReturnType<typeof querySitesBase>>[0] & {
+type SiteWithUpdateAvailable = Awaited<ReturnType<typeof querySites>>[0] & {
     newtUpdateAvailable?: boolean;
 };
 
-export type ListSitesResponse = PaginatedResponse<{
+export type ListSitesResponse = {
     sites: SiteWithUpdateAvailable[];
-}>;
+    pagination: { total: number; limit: number; offset: number };
+};
 
 registry.registerPath({
     method: "get",
@@ -203,6 +160,7 @@ export async function listSites(
                 )
             );
         }
+        const { limit, offset } = parsedQuery.data;
 
         const parsedParams = listSitesParamsSchema.safeParse(req.params);
         if (!parsedParams.success) {
@@ -245,67 +203,34 @@ export async function listSites(
                 .where(eq(sites.orgId, orgId));
         }
 
-        const { pageSize, page, query, sort_by, order, online } =
-            parsedQuery.data;
-
         const accessibleSiteIds = accessibleSites.map((site) => site.siteId);
+        const baseQuery = querySites(orgId, accessibleSiteIds);
 
-        const conditions = [
-            and(
-                inArray(sites.siteId, accessibleSiteIds),
-                eq(sites.orgId, orgId)
-            )
-        ];
-        if (query) {
-            conditions.push(
-                or(
-                    like(
-                        sql`LOWER(${sites.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${sites.niceId})`,
-                        "%" + query.toLowerCase() + "%"
-                    )
+        const countQuery = db
+            .select({ count: count() })
+            .from(sites)
+            .where(
+                and(
+                    inArray(sites.siteId, accessibleSiteIds),
+                    eq(sites.orgId, orgId)
                 )
             );
-        }
-        if (typeof online !== "undefined") {
-            conditions.push(eq(sites.online, online));
-        }
 
-        const baseQuery = querySitesBase().where(and(...conditions));
-
-        // we need to add `as` so that drizzle filters the result as a subquery
-        const countQuery = db.$count(
-            querySitesBase().where(and(...conditions))
-        );
-
-        const siteListQuery = baseQuery
-            .limit(pageSize)
-            .offset(pageSize * (page - 1))
-            .orderBy(
-                sort_by
-                    ? order === "asc"
-                        ? asc(sites[sort_by])
-                        : desc(sites[sort_by])
-                    : asc(sites.siteId)
-            );
-
-        const [totalCount, rows] = await Promise.all([
-            countQuery,
-            siteListQuery
-        ]);
+        const sitesList = await baseQuery.limit(limit).offset(offset);
+        const totalCountResult = await countQuery;
+        const totalCount = totalCountResult[0].count;
 
         // Get latest version asynchronously without blocking the response
         const latestNewtVersionPromise = getLatestNewtVersion();
 
-        const sitesWithUpdates: SiteWithUpdateAvailable[] = rows.map((site) => {
-            const siteWithUpdate: SiteWithUpdateAvailable = { ...site };
-            // Initially set to false, will be updated if version check succeeds
-            siteWithUpdate.newtUpdateAvailable = false;
-            return siteWithUpdate;
-        });
+        const sitesWithUpdates: SiteWithUpdateAvailable[] = sitesList.map(
+            (site) => {
+                const siteWithUpdate: SiteWithUpdateAvailable = { ...site };
+                // Initially set to false, will be updated if version check succeeds
+                siteWithUpdate.newtUpdateAvailable = false;
+                return siteWithUpdate;
+            }
+        );
 
         // Try to get the latest version, but don't block if it fails
         try {
@@ -342,8 +267,8 @@ export async function listSites(
                 sites: sitesWithUpdates,
                 pagination: {
                     total: totalCount,
-                    pageSize,
-                    page
+                    limit,
+                    offset
                 }
             },
             success: true,

server/routers/siteResource/createSiteResource.ts

@@ -284,7 +284,7 @@ export async function createSiteResource(
                     niceId,
                     orgId,
                     name,
-                    mode: mode as "host" | "cidr",
+                    mode,
                     // protocol: mode === "port" ? protocol : null,
                     // proxyPort: mode === "port" ? proxyPort : null,
                     // destinationPort: mode === "port" ? destinationPort : null,

server/routers/siteResource/listAllSiteResourcesByOrg.ts

@@ -1,90 +1,41 @@
-import { db, SiteResource, siteResources, sites } from "@server/db";
+import { Request, Response, NextFunction } from "express";
+import { z } from "zod";
+import { db } from "@server/db";
+import { siteResources, sites, SiteResource } from "@server/db";
 import response from "@server/lib/response";
+import HttpCode from "@server/types/HttpCode";
+import createHttpError from "http-errors";
+import { eq, and } from "drizzle-orm";
+import { fromError } from "zod-validation-error";
 import logger from "@server/logger";
 import { OpenAPITags, registry } from "@server/openApi";
-import HttpCode from "@server/types/HttpCode";
-import type { PaginatedResponse } from "@server/types/Pagination";
-import { and, asc, eq, like, or, sql } from "drizzle-orm";
-import { NextFunction, Request, Response } from "express";
-import createHttpError from "http-errors";
-import { z } from "zod";
-import { fromError } from "zod-validation-error";
 
 const listAllSiteResourcesByOrgParamsSchema = z.strictObject({
     orgId: z.string()
 });
 
 const listAllSiteResourcesByOrgQuerySchema = z.object({
-    pageSize: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .positive()
+    limit: z
+        .string()
         .optional()
-        .catch(20)
-        .default(20)
-        .openapi({
-            type: "integer",
-            default: 20,
-            description: "Number of items per page"
-        }),
-    page: z.coerce
-        .number<string>() // for prettier formatting
-        .int()
-        .min(0)
+        .default("1000")
+        .transform(Number)
+        .pipe(z.int().positive()),
+    offset: z
+        .string()
         .optional()
-        .catch(1)
-        .default(1)
-        .openapi({
-            type: "integer",
-            default: 1,
-            description: "Page number to retrieve"
-        }),
-    query: z.string().optional(),
-    mode: z
-        .enum(["host", "cidr"])
-        .optional()
-        .catch(undefined)
-        .openapi({
-            type: "string",
-            enum: ["host", "cidr"],
-            description: "Filter site resources by mode"
-        })
+        .default("0")
+        .transform(Number)
+        .pipe(z.int().nonnegative())
 });
 
-export type ListAllSiteResourcesByOrgResponse = PaginatedResponse<{
+export type ListAllSiteResourcesByOrgResponse = {
     siteResources: (SiteResource & {
         siteName: string;
         siteNiceId: string;
         siteAddress: string | null;
     })[];
-}>;
-
-function querySiteResourcesBase() {
-    return db
-        .select({
-            siteResourceId: siteResources.siteResourceId,
-            siteId: siteResources.siteId,
-            orgId: siteResources.orgId,
-            niceId: siteResources.niceId,
-            name: siteResources.name,
-            mode: siteResources.mode,
-            protocol: siteResources.protocol,
-            proxyPort: siteResources.proxyPort,
-            destinationPort: siteResources.destinationPort,
-            destination: siteResources.destination,
-            enabled: siteResources.enabled,
-            alias: siteResources.alias,
-            aliasAddress: siteResources.aliasAddress,
-            tcpPortRangeString: siteResources.tcpPortRangeString,
-            udpPortRangeString: siteResources.udpPortRangeString,
-            disableIcmp: siteResources.disableIcmp,
-            siteName: sites.name,
-            siteNiceId: sites.niceId,
-            siteAddress: sites.address
-        })
-        .from(siteResources)
-        .innerJoin(sites, eq(siteResources.siteId, sites.siteId));
-}
+};
 
 registry.registerPath({
     method: "get",
@@ -129,67 +80,39 @@ export async function listAllSiteResourcesByOrg(
         }
 
         const { orgId } = parsedParams.data;
-        const { page, pageSize, query, mode } = parsedQuery.data;
+        const { limit, offset } = parsedQuery.data;
 
-        const conditions = [and(eq(siteResources.orgId, orgId))];
-        if (query) {
-            conditions.push(
-                or(
-                    like(
-                        sql`LOWER(${siteResources.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${siteResources.niceId})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${siteResources.destination})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${siteResources.alias})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${siteResources.aliasAddress})`,
-                        "%" + query.toLowerCase() + "%"
-                    ),
-                    like(
-                        sql`LOWER(${sites.name})`,
-                        "%" + query.toLowerCase() + "%"
-                    )
-                )
-            );
-        }
+        // Get all site resources for the org with site names
+        const siteResourcesList = await db
+            .select({
+                siteResourceId: siteResources.siteResourceId,
+                siteId: siteResources.siteId,
+                orgId: siteResources.orgId,
+                niceId: siteResources.niceId,
+                name: siteResources.name,
+                mode: siteResources.mode,
+                protocol: siteResources.protocol,
+                proxyPort: siteResources.proxyPort,
+                destinationPort: siteResources.destinationPort,
+                destination: siteResources.destination,
+                enabled: siteResources.enabled,
+                alias: siteResources.alias,
+                aliasAddress: siteResources.aliasAddress,
+                tcpPortRangeString: siteResources.tcpPortRangeString,
+                udpPortRangeString: siteResources.udpPortRangeString,
+                disableIcmp: siteResources.disableIcmp,
+                siteName: sites.name,
+                siteNiceId: sites.niceId,
+                siteAddress: sites.address
+            })
+            .from(siteResources)
+            .innerJoin(sites, eq(siteResources.siteId, sites.siteId))
+            .where(eq(siteResources.orgId, orgId))
+            .limit(limit)
+            .offset(offset);
 
-        if (mode) {
-            conditions.push(eq(siteResources.mode, mode));
-        }
-
-        const baseQuery = querySiteResourcesBase().where(and(...conditions));
-
-        const countQuery = db.$count(
-            querySiteResourcesBase().where(and(...conditions))
-        );
-
-        const [siteResourcesList, totalCount] = await Promise.all([
-            baseQuery
-                .limit(pageSize)
-                .offset(pageSize * (page - 1))
-                .orderBy(asc(siteResources.siteResourceId)),
-            countQuery
-        ]);
-
-        return response<ListAllSiteResourcesByOrgResponse>(res, {
-            data: {
-                siteResources: siteResourcesList,
-                pagination: {
-                    total: totalCount,
-                    pageSize,
-                    page
-                }
-            },
+        return response(res, {
+            data: { siteResources: siteResourcesList },
             success: true,
             error: false,
             message: "Site resources retrieved successfully",

server/routers/target/handleHealthcheckStatusMessage.ts

@@ -105,10 +105,7 @@ export const handleHealthcheckStatusMessage: MessageHandler = async (
             await db
                 .update(targetHealthCheck)
                 .set({
-                    hcHealth: healthStatus.status as
-                        | "unknown"
-                        | "healthy"
-                        | "unhealthy"
+                    hcHealth: healthStatus.status
                 })
                 .where(eq(targetHealthCheck.targetId, targetIdNum))
                 .execute();

server/types/Pagination.ts

@@ -1,5 +0,0 @@
-export type Pagination = { total: number; pageSize: number; page: number };
-
-export type PaginatedResponse<T> = T & {
-    pagination: Pagination;
-};

src/app/[orgId]/settings/clients/machine/page.tsx

@@ -7,11 +7,10 @@ import { authCookieHeader } from "@app/lib/api/cookies";
 import { ListClientsResponse } from "@server/routers/client";
 import { AxiosResponse } from "axios";
 import { getTranslations } from "next-intl/server";
-import type { Pagination } from "@server/types/Pagination";
 
 type ClientsPageProps = {
     params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
+    searchParams: Promise<{ view?: string }>;
 };
 
 export const dynamic = "force-dynamic";
@@ -20,25 +19,17 @@ export default async function ClientsPage(props: ClientsPageProps) {
     const t = await getTranslations();
 
     const params = await props.params;
-    const searchParams = new URLSearchParams(await props.searchParams);
 
     let machineClients: ListClientsResponse["clients"] = [];
-    let pagination: Pagination = {
-        page: 1,
-        total: 0,
-        pageSize: 20
-    };
 
     try {
         const machineRes = await internal.get<
             AxiosResponse<ListClientsResponse>
         >(
-            `/org/${params.orgId}/clients?${searchParams.toString()}`,
+            `/org/${params.orgId}/clients?filter=machine`,
             await authCookieHeader()
         );
-        const responseData = machineRes.data.data;
-        machineClients = responseData.clients;
-        pagination = responseData.pagination;
+        machineClients = machineRes.data.data.clients;
     } catch (e) {}
 
     function formatSize(mb: number): string {
@@ -89,11 +80,6 @@ export default async function ClientsPage(props: ClientsPageProps) {
             <MachineClientsTable
                 machineClients={machineClientRows}
                 orgId={params.orgId}
-                rowCount={pagination.total}
-                pagination={{
-                    pageIndex: pagination.page - 1,
-                    pageSize: pagination.pageSize
-                }}
             />
         </>
     );

src/app/[orgId]/settings/clients/user/[niceId]/general/page.tsx

@@ -602,8 +602,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .biometricsEnabled ===
-                                                                  true
+                                                                  .biometricsEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -623,8 +622,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .diskEncrypted ===
-                                                                  true
+                                                                  .diskEncrypted
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -644,8 +642,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .firewallEnabled ===
-                                                                  true
+                                                                  .firewallEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -666,8 +663,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .autoUpdatesEnabled ===
-                                                                  true
+                                                                  .autoUpdatesEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -687,8 +683,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .tpmAvailable ===
-                                                                  true
+                                                                  .tpmAvailable
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -712,8 +707,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .windowsAntivirusEnabled ===
-                                                                  true
+                                                                  .windowsAntivirusEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -733,8 +727,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .macosSipEnabled ===
-                                                                  true
+                                                                  .macosSipEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -758,8 +751,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .macosGatekeeperEnabled ===
-                                                                  true
+                                                                  .macosGatekeeperEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -783,8 +775,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .macosFirewallStealthMode ===
-                                                                  true
+                                                                  .macosFirewallStealthMode
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -805,8 +796,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .linuxAppArmorEnabled ===
-                                                                  true
+                                                                  .linuxAppArmorEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>
@@ -827,8 +817,7 @@ export default function GeneralPage() {
                                                     )
                                                         ? formatPostureValue(
                                                               client.posture
-                                                                  .linuxSELinuxEnabled ===
-                                                                  true
+                                                                  .linuxSELinuxEnabled
                                                           )
                                                         : "-"}
                                                 </InfoSectionContent>

src/app/[orgId]/settings/clients/user/page.tsx

@@ -1,16 +1,14 @@
-import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
-import type { ClientRow } from "@app/components/UserDevicesTable";
-import UserDevicesTable from "@app/components/UserDevicesTable";
 import { internal } from "@app/lib/api";
 import { authCookieHeader } from "@app/lib/api/cookies";
-import { type ListUserDevicesResponse } from "@server/routers/client";
-import type { Pagination } from "@server/types/Pagination";
 import { AxiosResponse } from "axios";
+import SettingsSectionTitle from "@app/components/SettingsSectionTitle";
+import { ListClientsResponse } from "@server/routers/client";
 import { getTranslations } from "next-intl/server";
+import type { ClientRow } from "@app/components/UserDevicesTable";
+import UserDevicesTable from "@app/components/UserDevicesTable";
 
 type ClientsPageProps = {
     params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
 };
 
 export const dynamic = "force-dynamic";
@@ -19,26 +17,15 @@ export default async function ClientsPage(props: ClientsPageProps) {
     const t = await getTranslations();
 
     const params = await props.params;
-    const searchParams = new URLSearchParams(await props.searchParams);
 
-    let userClients: ListUserDevicesResponse["devices"] = [];
-
-    let pagination: Pagination = {
-        page: 1,
-        total: 0,
-        pageSize: 20
-    };
+    let userClients: ListClientsResponse["clients"] = [];
 
     try {
-        const userRes = await internal.get<
-            AxiosResponse<ListUserDevicesResponse>
-        >(
-            `/org/${params.orgId}/user-devices?${searchParams.toString()}`,
+        const userRes = await internal.get<AxiosResponse<ListClientsResponse>>(
+            `/org/${params.orgId}/clients?filter=user`,
             await authCookieHeader()
         );
-        const responseData = userRes.data.data;
-        userClients = responseData.devices;
-        pagination = responseData.pagination;
+        userClients = userRes.data.data.clients;
     } catch (e) {}
 
     function formatSize(mb: number): string {
@@ -52,29 +39,31 @@ export default async function ClientsPage(props: ClientsPageProps) {
     }
 
     const mapClientToRow = (
-        client: ListUserDevicesResponse["devices"][number]
+        client: ListClientsResponse["clients"][0]
     ): ClientRow => {
         // Build fingerprint object if any fingerprint data exists
         const hasFingerprintData =
-            client.fingerprintPlatform ||
-            client.fingerprintOsVersion ||
-            client.fingerprintKernelVersion ||
-            client.fingerprintArch ||
-            client.fingerprintSerialNumber ||
-            client.fingerprintUsername ||
-            client.fingerprintHostname ||
-            client.deviceModel;
+            (client as any).fingerprintPlatform ||
+            (client as any).fingerprintOsVersion ||
+            (client as any).fingerprintKernelVersion ||
+            (client as any).fingerprintArch ||
+            (client as any).fingerprintSerialNumber ||
+            (client as any).fingerprintUsername ||
+            (client as any).fingerprintHostname ||
+            (client as any).deviceModel;
 
         const fingerprint = hasFingerprintData
             ? {
-                  platform: client.fingerprintPlatform,
-                  osVersion: client.fingerprintOsVersion,
-                  kernelVersion: client.fingerprintKernelVersion,
-                  arch: client.fingerprintArch,
-                  deviceModel: client.deviceModel,
-                  serialNumber: client.fingerprintSerialNumber,
-                  username: client.fingerprintUsername,
-                  hostname: client.fingerprintHostname
+                  platform: (client as any).fingerprintPlatform || null,
+                  osVersion: (client as any).fingerprintOsVersion || null,
+                  kernelVersion:
+                      (client as any).fingerprintKernelVersion || null,
+                  arch: (client as any).fingerprintArch || null,
+                  deviceModel: (client as any).deviceModel || null,
+                  serialNumber:
+                      (client as any).fingerprintSerialNumber || null,
+                  username: (client as any).fingerprintUsername || null,
+                  hostname: (client as any).fingerprintHostname || null
               }
             : null;
 
@@ -82,19 +71,19 @@ export default async function ClientsPage(props: ClientsPageProps) {
             name: client.name,
             id: client.clientId,
             subnet: client.subnet.split("/")[0],
-            mbIn: formatSize(client.megabytesIn ?? 0),
-            mbOut: formatSize(client.megabytesOut ?? 0),
+            mbIn: formatSize(client.megabytesIn || 0),
+            mbOut: formatSize(client.megabytesOut || 0),
             orgId: params.orgId,
             online: client.online,
             olmVersion: client.olmVersion || undefined,
-            olmUpdateAvailable: Boolean(client.olmUpdateAvailable),
+            olmUpdateAvailable: client.olmUpdateAvailable || false,
             userId: client.userId,
             username: client.username,
             userEmail: client.userEmail,
             niceId: client.niceId,
             agent: client.agent,
-            archived: Boolean(client.archived),
-            blocked: Boolean(client.blocked),
+            archived: client.archived || false,
+            blocked: client.blocked || false,
             approvalState: client.approvalState,
             fingerprint
         };
@@ -112,11 +101,6 @@ export default async function ClientsPage(props: ClientsPageProps) {
             <UserDevicesTable
                 userClients={userClientRows}
                 orgId={params.orgId}
-                rowCount={pagination.total}
-                pagination={{
-                    pageIndex: pagination.page - 1,
-                    pageSize: pagination.pageSize
-                }}
             />
         </>
     );

src/app/[orgId]/settings/resources/client/page.tsx

@@ -14,7 +14,7 @@ import { redirect } from "next/navigation";
 
 export interface ClientResourcesPageProps {
     params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
+    searchParams: Promise<{ view?: string }>;
 }
 
 export default async function ClientResourcesPage(
@@ -22,24 +22,22 @@ export default async function ClientResourcesPage(
 ) {
     const params = await props.params;
     const t = await getTranslations();
-    const searchParams = new URLSearchParams(await props.searchParams);
+
+    let resources: ListResourcesResponse["resources"] = [];
+    try {
+        const res = await internal.get<AxiosResponse<ListResourcesResponse>>(
+            `/org/${params.orgId}/resources`,
+            await authCookieHeader()
+        );
+        resources = res.data.data.resources;
+    } catch (e) {}
 
     let siteResources: ListAllSiteResourcesByOrgResponse["siteResources"] = [];
-    let pagination: ListResourcesResponse["pagination"] = {
-        total: 0,
-        page: 1,
-        pageSize: 20
-    };
     try {
         const res = await internal.get<
             AxiosResponse<ListAllSiteResourcesByOrgResponse>
-        >(
-            `/org/${params.orgId}/site-resources?${searchParams.toString()}`,
-            await authCookieHeader()
-        );
-        const responseData = res.data.data;
-        siteResources = responseData.siteResources;
-        pagination = responseData.pagination;
+        >(`/org/${params.orgId}/site-resources`, await authCookieHeader());
+        siteResources = res.data.data.siteResources;
     } catch (e) {}
 
     let org = null;
@@ -91,10 +89,9 @@ export default async function ClientResourcesPage(
                 <ClientResourcesTable
                     internalResources={internalResourceRows}
                     orgId={params.orgId}
-                    rowCount={pagination.total}
-                    pagination={{
-                        pageIndex: pagination.page - 1,
-                        pageSize: pagination.pageSize
+                    defaultSort={{
+                        id: "name",
+                        desc: false
                     }}
                 />
             </OrgProvider>

src/app/[orgId]/settings/resources/proxy/page.tsx

@@ -16,7 +16,7 @@ import { cache } from "react";
 
 export interface ProxyResourcesPageProps {
     params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
+    searchParams: Promise<{ view?: string }>;
 }
 
 export default async function ProxyResourcesPage(
@@ -24,22 +24,14 @@ export default async function ProxyResourcesPage(
 ) {
     const params = await props.params;
     const t = await getTranslations();
-    const searchParams = new URLSearchParams(await props.searchParams);
 
     let resources: ListResourcesResponse["resources"] = [];
-    let pagination: ListResourcesResponse["pagination"] = {
-        total: 0,
-        page: 1,
-        pageSize: 20
-    };
     try {
         const res = await internal.get<AxiosResponse<ListResourcesResponse>>(
-            `/org/${params.orgId}/resources?${searchParams.toString()}`,
+            `/org/${params.orgId}/resources`,
             await authCookieHeader()
         );
-        const responseData = res.data.data;
-        resources = responseData.resources;
-        pagination = responseData.pagination;
+        resources = res.data.data.resources;
     } catch (e) {}
 
     let siteResources: ListAllSiteResourcesByOrgResponse["siteResources"] = [];
@@ -112,10 +104,9 @@ export default async function ProxyResourcesPage(
                 <ProxyResourcesTable
                     resources={resourceRows}
                     orgId={params.orgId}
-                    rowCount={pagination.total}
-                    pagination={{
-                        pageIndex: pagination.page - 1,
-                        pageSize: pagination.pageSize
+                    defaultSort={{
+                        id: "name",
+                        desc: false
                     }}
                 />
             </OrgProvider>

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

@@ -63,6 +63,7 @@ import { QRCodeCanvas } from "qrcode.react";
 import { useTranslations } from "next-intl";
 import { build } from "@server/build";
 import { NewtSiteInstallCommands } from "@app/components/newt-install-commands";
+import { id } from "date-fns/locale";
 
 type SiteType = "newt" | "wireguard" | "local";
 

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

@@ -9,30 +9,19 @@ import { getTranslations } from "next-intl/server";
 
 type SitesPageProps = {
     params: Promise<{ orgId: string }>;
-    searchParams: Promise<Record<string, string>>;
 };
 
 export const dynamic = "force-dynamic";
 
 export default async function SitesPage(props: SitesPageProps) {
     const params = await props.params;
-
-    const searchParams = new URLSearchParams(await props.searchParams);
-
     let sites: ListSitesResponse["sites"] = [];
-    let pagination: ListSitesResponse["pagination"] = {
-        total: 0,
-        page: 1,
-        pageSize: 20
-    };
     try {
         const res = await internal.get<AxiosResponse<ListSitesResponse>>(
-            `/org/${params.orgId}/sites?${searchParams.toString()}`,
+            `/org/${params.orgId}/sites`,
             await authCookieHeader()
         );
-        const responseData = res.data.data;
-        sites = responseData.sites;
-        pagination = responseData.pagination;
+        sites = res.data.data.sites;
     } catch (e) {}
 
     const t = await getTranslations();
@@ -71,6 +60,8 @@ export default async function SitesPage(props: SitesPageProps) {
 
     return (
         <>
+            {/* <SitesSplashCard /> */}
+
             <SettingsSectionTitle
                 title={t("siteManageSites")}
                 description={t("siteDescription")}
@@ -78,15 +69,7 @@ export default async function SitesPage(props: SitesPageProps) {
 
             <SitesBanner />
 
-            <SitesTable
-                sites={siteRows}
-                orgId={params.orgId}
-                rowCount={pagination.total}
-                pagination={{
-                    pageIndex: pagination.page - 1,
-                    pageSize: pagination.pageSize
-                }}
-            />
+            <SitesTable sites={siteRows} orgId={params.orgId} />
         </>
     );
 }

src/components/ApprovalFeed.tsx

@@ -2,16 +2,16 @@
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
+import { getUserDisplayName } from "@app/lib/getUserDisplayName";
 import { cn } from "@app/lib/cn";
 import { formatFingerprintInfo } from "@app/lib/formatDeviceFingerprint";
-import { getUserDisplayName } from "@app/lib/getUserDisplayName";
 import {
     approvalFiltersSchema,
     approvalQueries,
     type ApprovalItem
 } from "@app/lib/queries";
-import { useInfiniteQuery } from "@tanstack/react-query";
-import { Ban, Check, Loader, RefreshCw } from "lucide-react";
+import { useQuery } from "@tanstack/react-query";
+import { ArrowRight, Ban, Check, LaptopMinimal, RefreshCw } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
@@ -54,20 +54,12 @@ export function ApprovalFeed({
 
     const { isPaidUser } = usePaidStatus();
 
-    const {
-        data,
-        isFetching,
-        isLoading,
-        refetch,
-        hasNextPage,
-        fetchNextPage,
-        isFetchingNextPage
-    } = useInfiniteQuery({
+    const { data, isFetching, refetch } = useQuery({
         ...approvalQueries.listApprovals(orgId, filters),
         enabled: isPaidUser(tierMatrix.deviceApprovals)
     });
 
-    const approvals = data?.pages.flatMap((data) => data.approvals) ?? [];
+    const approvals = data?.approvals ?? [];
 
     // Show empty state if no approvals are enabled for any role
     if (!hasApprovalsEnabled) {
@@ -123,13 +115,13 @@ export function ApprovalFeed({
                         onClick={() => {
                             refetch();
                         }}
-                        disabled={isFetching || isLoading}
+                        disabled={isFetching}
                         className="lg:static gap-2"
                     >
                         <RefreshCw
                             className={cn(
                                 "size-4",
-                                (isFetching || isLoading) && "animate-spin"
+                                isFetching && "animate-spin"
                             )}
                         />
                         {t("refresh")}
@@ -153,30 +145,13 @@ export function ApprovalFeed({
                         ))}
 
                         {approvals.length === 0 && (
-                            <li className="flex justify-center items-center p-4 text-muted-foreground gap-2">
-                                {isLoading
-                                    ? t("loadingApprovals")
-                                    : t("approvalListEmpty")}
-
-                                {isLoading && (
-                                    <Loader className="size-4 flex-none animate-spin" />
-                                )}
+                            <li className="flex justify-center items-center p-4 text-muted-foreground">
+                                {t("approvalListEmpty")}
                             </li>
                         )}
                     </ul>
                 </CardHeader>
             </Card>
-            {hasNextPage && (
-                <Button
-                    variant="secondary"
-                    className="self-center"
-                    size="lg"
-                    loading={isFetchingNextPage}
-                    onClick={() => fetchNextPage()}
-                >
-                    {t("approvalLoadMore")}
-                </Button>
-            )}
         </div>
     );
 }

src/components/AuthPageBrandingForm.tsx

@@ -1,5 +1,9 @@
 "use client";
 
+import { zodResolver } from "@hookform/resolvers/zod";
+import { startTransition, useActionState, useState } from "react";
+import { useForm } from "react-hook-form";
+import z from "zod";
 import {
     Form,
     FormControl,
@@ -9,11 +13,6 @@ import {
     FormLabel,
     FormMessage
 } from "@app/components/ui/form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useTranslations } from "next-intl";
-import { useActionState } from "react";
-import { useForm } from "react-hook-form";
-import z from "zod";
 import {
     SettingsSection,
     SettingsSectionBody,
@@ -22,19 +21,19 @@ import {
     SettingsSectionHeader,
     SettingsSectionTitle
 } from "./Settings";
+import { useTranslations } from "next-intl";
 
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { usePaidStatus } from "@app/hooks/usePaidStatus";
-import { toast } from "@app/hooks/useToast";
-import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { build } from "@server/build";
 import type { GetLoginPageBrandingResponse } from "@server/routers/loginPage/types";
-import { XIcon } from "lucide-react";
-import { useRouter } from "next/navigation";
-import { PaidFeaturesAlert } from "./PaidFeaturesAlert";
-import { Button } from "./ui/button";
 import { Input } from "./ui/input";
-import { validateLocalPath } from "@app/lib/validateLocalPath";
+import { ExternalLink, InfoIcon, XIcon } from "lucide-react";
+import { Button } from "./ui/button";
+import { createApiClient, formatAxiosError } from "@app/lib/api";
+import { useEnvContext } from "@app/hooks/useEnvContext";
+import { useRouter } from "next/navigation";
+import { toast } from "@app/hooks/useToast";
+import { usePaidStatus } from "@app/hooks/usePaidStatus";
+import { build } from "@server/build";
+import { PaidFeaturesAlert } from "./PaidFeaturesAlert";
 import { Alert, AlertDescription, AlertTitle } from "./ui/alert";
 import { tierMatrix } from "@server/lib/billing/tierMatrix";
 
@@ -46,36 +45,13 @@ export type AuthPageCustomizationProps = {
 const AuthPageFormSchema = z.object({
     logoUrl: z.union([
         z.literal(""),
-        z.string().superRefine(async (urlOrPath, ctx) => {
-            const parseResult = z.url().safeParse(urlOrPath);
-            if (!parseResult.success) {
-                if (build !== "enterprise") {
-                    ctx.addIssue({
-                        code: "custom",
-                        message: "Must be a valid URL"
-                    });
-                    return;
-                } else {
-                    try {
-                        validateLocalPath(urlOrPath);
-                    } catch (error) {
-                        ctx.addIssue({
-                            code: "custom",
-                            message:
-                                "Must be either a valid image URL or a valid pathname starting with `/` and not containing query parameters, `..` or `*`"
-                        });
-                    } finally {
-                        return;
-                    }
-                }
-            }
-
+        z.url("Must be a valid URL").superRefine(async (url, ctx) => {
             try {
-                const response = await fetch(urlOrPath, {
+                const response = await fetch(url, {
                     method: "HEAD"
                 }).catch(() => {
                     // If HEAD fails (CORS or method not allowed), try GET
-                    return fetch(urlOrPath, { method: "GET" });
+                    return fetch(url, { method: "GET" });
                 });
 
                 if (response.status !== 200) {
@@ -295,25 +271,12 @@ export default function AuthPageBrandingForm({
                                         render={({ field }) => (
                                             <FormItem className="md:col-span-3">
                                                 <FormLabel>
-                                                    {build === "enterprise"
-                                                        ? t(
-                                                              "brandingLogoURLOrPath"
-                                                          )
-                                                        : t("brandingLogoURL")}
+                                                    {t("brandingLogoURL")}
                                                 </FormLabel>
                                                 <FormControl>
                                                     <Input {...field} />
                                                 </FormControl>
                                                 <FormMessage />
-                                                <FormDescription>
-                                                    {build === "enterprise"
-                                                        ? t(
-                                                              "brandingLogoPathDescription"
-                                                          )
-                                                        : t(
-                                                              "brandingLogoURLDescription"
-                                                          )}
-                                                </FormDescription>
                                             </FormItem>
                                         )}
                                     />

src/components/ClientResourcesTable.tsx

@@ -25,11 +25,6 @@ import CreateInternalResourceDialog from "@app/components/CreateInternalResource
 import EditInternalResourceDialog from "@app/components/EditInternalResourceDialog";
 import { orgQueries } from "@app/lib/queries";
 import { useQuery } from "@tanstack/react-query";
-import type { PaginationState } from "@tanstack/react-table";
-import { ControlledDataTable } from "./ui/controlled-data-table";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
-import { useDebouncedCallback } from "use-debounce";
-import { ColumnFilterButton } from "./ColumnFilterButton";
 
 export type InternalResourceRow = {
     id: number;
@@ -56,22 +51,18 @@ export type InternalResourceRow = {
 type ClientResourcesTableProps = {
     internalResources: InternalResourceRow[];
     orgId: string;
-    pagination: PaginationState;
-    rowCount: number;
+    defaultSort?: {
+        id: string;
+        desc: boolean;
+    };
 };
 
 export default function ClientResourcesTable({
     internalResources,
     orgId,
-    pagination,
-    rowCount
+    defaultSort
 }: ClientResourcesTableProps) {
     const router = useRouter();
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
     const t = useTranslations();
 
     const { env } = useEnvContext();
@@ -131,7 +122,19 @@ export default function ClientResourcesTable({
             accessorKey: "name",
             enableHiding: false,
             friendlyName: t("name"),
-            header: () => <span className="p-3">{t("name")}</span>
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("name")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            }
         },
         {
             id: "niceId",
@@ -177,24 +180,9 @@ export default function ClientResourcesTable({
             accessorKey: "mode",
             friendlyName: t("editInternalResourceDialogMode"),
             header: () => (
-                <ColumnFilterButton
-                    options={[
-                        {
-                            value: "host",
-                            label: t("editInternalResourceDialogModeHost")
-                        },
-                        {
-                            value: "cidr",
-                            label: t("editInternalResourceDialogModeCidr")
-                        }
-                    ]}
-                    selectedValue={searchParams.get("mode") ?? undefined}
-                    onValueChange={(value) => handleFilterChange("mode", value)}
-                    searchPlaceholder={t("searchPlaceholder")}
-                    emptyMessage={t("emptySearchOptions")}
-                    label={t("editInternalResourceDialogMode")}
-                    className="p-3"
-                />
+                <span className="p-3">
+                    {t("editInternalResourceDialogMode")}
+                </span>
             ),
             cell: ({ row }) => {
                 const resourceRow = row.original;
@@ -312,37 +300,6 @@ export default function ClientResourcesTable({
         }
     ];
 
-    function handleFilterChange(
-        column: string,
-        value: string | undefined | null
-    ) {
-        searchParams.delete(column);
-        searchParams.delete("page");
-
-        if (value) {
-            searchParams.set(column, value);
-        }
-        filter({
-            searchParams
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({
-            searchParams
-        });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({
-            searchParams
-        });
-    }, 300);
-
     return (
         <>
             {selectedInternalResource && (
@@ -370,20 +327,19 @@ export default function ClientResourcesTable({
                 />
             )}
 
-            <ControlledDataTable
+            <DataTable
                 columns={internalColumns}
-                rows={internalResources}
-                tableId="internal-resources"
+                data={internalResources}
+                persistPageSize="internal-resources"
                 searchPlaceholder={t("resourcesSearch")}
+                searchColumn="name"
                 onAdd={() => setIsCreateDialogOpen(true)}
                 addButtonText={t("resourceAdd")}
-                onSearch={handleSearchChange}
                 onRefresh={refreshData}
-                onPaginationChange={handlePaginationChange}
-                pagination={pagination}
-                rowCount={rowCount}
-                isRefreshing={isRefreshing || isFiltering}
-                enableColumnVisibility
+                isRefreshing={isRefreshing}
+                defaultSort={defaultSort}
+                enableColumnVisibility={true}
+                persistColumnVisibility="internal-resources"
                 columnVisibility={{
                     niceId: false,
                     aliasAddress: false

src/components/ColumnFilter.tsx

@@ -15,7 +15,6 @@ import {
 } from "@app/components/ui/command";
 import { CheckIcon, ChevronDownIcon, Filter } from "lucide-react";
 import { cn } from "@app/lib/cn";
-import { Badge } from "./ui/badge";
 
 interface FilterOption {
     value: string;
@@ -62,19 +61,16 @@ export function ColumnFilter({
                 >
                     <div className="flex items-center gap-2">
                         <Filter className="h-4 w-4" />
-
-                        {selectedOption && (
-                            <Badge className="truncate" variant="secondary">
-                                {selectedOption
-                                    ? selectedOption.label
-                                    : placeholder}
-                            </Badge>
-                        )}
+                        <span className="truncate">
+                            {selectedOption
+                                ? selectedOption.label
+                                : placeholder}
+                        </span>
                     </div>
                     <ChevronDownIcon className="h-4 w-4 shrink-0 opacity-50" />
                 </Button>
             </PopoverTrigger>
-            <PopoverContent className="p-0 w-50" align="start">
+            <PopoverContent className="p-0 w-[200px]" align="start">
                 <Command>
                     <CommandInput placeholder={searchPlaceholder} />
                     <CommandList>

src/components/ColumnFilterButton.tsx

@@ -1,126 +0,0 @@
-import { useState } from "react";
-import { Button } from "@app/components/ui/button";
-import {
-    Popover,
-    PopoverContent,
-    PopoverTrigger
-} from "@app/components/ui/popover";
-import {
-    Command,
-    CommandEmpty,
-    CommandGroup,
-    CommandInput,
-    CommandItem,
-    CommandList
-} from "@app/components/ui/command";
-import { CheckIcon, ChevronDownIcon, Funnel } from "lucide-react";
-import { cn } from "@app/lib/cn";
-import { Badge } from "./ui/badge";
-
-interface FilterOption {
-    value: string;
-    label: string;
-}
-
-interface ColumnFilterButtonProps {
-    options: FilterOption[];
-    selectedValue?: string;
-    onValueChange: (value: string | undefined) => void;
-    placeholder?: string;
-    searchPlaceholder?: string;
-    emptyMessage?: string;
-    className?: string;
-    label: string;
-}
-
-export function ColumnFilterButton({
-    options,
-    selectedValue,
-    onValueChange,
-    placeholder,
-    searchPlaceholder = "Search...",
-    emptyMessage = "No options found",
-    className,
-    label
-}: ColumnFilterButtonProps) {
-    const [open, setOpen] = useState(false);
-
-    const selectedOption = options.find(
-        (option) => option.value === selectedValue
-    );
-
-    return (
-        <Popover open={open} onOpenChange={setOpen}>
-            <PopoverTrigger asChild>
-                <Button
-                    variant="ghost"
-                    role="combobox"
-                    aria-expanded={open}
-                    className={cn(
-                        "justify-between text-sm h-8 px-2",
-                        !selectedValue && "text-muted-foreground",
-                        className
-                    )}
-                >
-                    <div className="flex items-center gap-2">
-                        {label}
-
-                        <Funnel className="size-4 flex-none" />
-
-                        {selectedOption && (
-                            <Badge className="truncate" variant="secondary">
-                                {selectedOption.label}
-                            </Badge>
-                        )}
-                    </div>
-                </Button>
-            </PopoverTrigger>
-            <PopoverContent className="p-0 w-50" align="start">
-                <Command>
-                    <CommandInput placeholder={searchPlaceholder} />
-                    <CommandList>
-                        <CommandEmpty>{emptyMessage}</CommandEmpty>
-                        <CommandGroup>
-                            {/* Clear filter option */}
-                            {selectedValue && (
-                                <CommandItem
-                                    onSelect={() => {
-                                        onValueChange(undefined);
-                                        setOpen(false);
-                                    }}
-                                    className="text-muted-foreground"
-                                >
-                                    Clear filter
-                                </CommandItem>
-                            )}
-                            {options.map((option) => (
-                                <CommandItem
-                                    key={option.value}
-                                    value={option.label}
-                                    onSelect={() => {
-                                        onValueChange(
-                                            selectedValue === option.value
-                                                ? undefined
-                                                : option.value
-                                        );
-                                        setOpen(false);
-                                    }}
-                                >
-                                    <CheckIcon
-                                        className={cn(
-                                            "mr-2 h-4 w-4",
-                                            selectedValue === option.value
-                                                ? "opacity-100"
-                                                : "opacity-0"
-                                        )}
-                                    />
-                                    {option.label}
-                                </CommandItem>
-                            ))}
-                        </CommandGroup>
-                    </CommandList>
-                </Command>
-            </PopoverContent>
-        </Popover>
-    );
-}

src/components/CreateInternalResourceDialog.tsx

@@ -255,7 +255,10 @@ export default function CreateInternalResourceDialog({
     const { data: usersResponse = [] } = useQuery(orgQueries.users({ orgId }));
     const { data: clientsResponse = [] } = useQuery(
         orgQueries.clients({
-            orgId
+            orgId,
+            filters: {
+                filter: "machine"
+            }
         })
     );
 

src/components/EditInternalResourceDialog.tsx

@@ -277,7 +277,10 @@ export default function EditInternalResourceDialog({
             orgQueries.roles({ orgId }),
             orgQueries.users({ orgId }),
             orgQueries.clients({
-                orgId
+                orgId,
+                filters: {
+                    filter: "machine"
+                }
             }),
             resourceQueries.siteResourceUsers({ siteResourceId: resource.id }),
             resourceQueries.siteResourceRoles({ siteResourceId: resource.id }),

src/components/MachineClientsTable.tsx

@@ -16,23 +16,13 @@ import {
     ArrowRight,
     ArrowUpDown,
     MoreHorizontal,
-    CircleSlash,
-    ArrowDown01Icon,
-    ArrowUp10Icon,
-    ChevronsUpDownIcon
+    CircleSlash
 } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useMemo, useState, useTransition } from "react";
 import { Badge } from "./ui/badge";
-import type { PaginationState } from "@tanstack/react-table";
-import { ControlledDataTable } from "./ui/controlled-data-table";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
-import { useDebouncedCallback } from "use-debounce";
-import z from "zod";
-import { getNextSortOrder, getSortDirection } from "@app/lib/sortColumn";
-import { ColumnFilterButton } from "./ColumnFilterButton";
 
 export type ClientRow = {
     id: number;
@@ -58,24 +48,14 @@ export type ClientRow = {
 type ClientTableProps = {
     machineClients: ClientRow[];
     orgId: string;
-    pagination: PaginationState;
-    rowCount: number;
 };
 
 export default function MachineClientsTable({
     machineClients,
-    orgId,
-    pagination,
-    rowCount
+    orgId
 }: ClientTableProps) {
     const router = useRouter();
 
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
-
     const t = useTranslations();
 
     const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
@@ -85,7 +65,6 @@ export default function MachineClientsTable({
 
     const api = createApiClient(useEnvContext());
     const [isRefreshing, startTransition] = useTransition();
-    const [isNavigatingToAddPage, startNavigation] = useTransition();
 
     const defaultMachineColumnVisibility = {
         subnet: false,
@@ -203,8 +182,22 @@ export default function MachineClientsTable({
             {
                 accessorKey: "name",
                 enableHiding: false,
-                friendlyName: t("name"),
-                header: () => <span className="px-3">{t("name")}</span>,
+                friendlyName: "Name",
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            Name
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                },
                 cell: ({ row }) => {
                     const r = row.original;
                     return (
@@ -231,35 +224,38 @@ export default function MachineClientsTable({
             {
                 accessorKey: "niceId",
                 friendlyName: "Identifier",
-                header: () => <span className="px-3">{t("identifier")}</span>
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("identifier")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                }
             },
             {
                 accessorKey: "online",
-                friendlyName: t("online"),
-                header: () => {
+                friendlyName: "Connectivity",
+                header: ({ column }) => {
                     return (
-                        <ColumnFilterButton
-                            options={[
-                                {
-                                    value: "true",
-                                    label: t("connected")
-                                },
-                                {
-                                    value: "false",
-                                    label: t("disconnected")
-                                }
-                            ]}
-                            selectedValue={
-                                searchParams.get("online") ?? undefined
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
                             }
-                            onValueChange={(value) =>
-                                handleFilterChange("online", value)
-                            }
-                            searchPlaceholder={t("searchPlaceholder")}
-                            emptyMessage={t("emptySearchOptions")}
-                            label={t("online")}
-                            className="p-3"
-                        />
+                        >
+                            Connectivity
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
                     );
                 },
                 cell: ({ row }) => {
@@ -283,52 +279,38 @@ export default function MachineClientsTable({
             },
             {
                 accessorKey: "mbIn",
-                friendlyName: t("dataIn"),
-                header: () => {
-                    const dataInOrder = getSortDirection(
-                        "megabytesIn",
-                        searchParams
-                    );
-
-                    const Icon =
-                        dataInOrder === "asc"
-                            ? ArrowDown01Icon
-                            : dataInOrder === "desc"
-                              ? ArrowUp10Icon
-                              : ChevronsUpDownIcon;
+                friendlyName: "Data In",
+                header: ({ column }) => {
                     return (
                         <Button
                             variant="ghost"
-                            onClick={() => toggleSort("megabytesIn")}
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
                         >
-                            {t("dataIn")}
-                            <Icon className="ml-2 h-4 w-4" />
+                            Data In
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
                         </Button>
                     );
                 }
             },
             {
                 accessorKey: "mbOut",
-                friendlyName: t("dataOut"),
-                header: () => {
-                    const dataOutOrder = getSortDirection(
-                        "megabytesOut",
-                        searchParams
-                    );
-
-                    const Icon =
-                        dataOutOrder === "asc"
-                            ? ArrowDown01Icon
-                            : dataOutOrder === "desc"
-                              ? ArrowUp10Icon
-                              : ChevronsUpDownIcon;
+                friendlyName: "Data Out",
+                header: ({ column }) => {
                     return (
                         <Button
                             variant="ghost"
-                            onClick={() => toggleSort("megabytesOut")}
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
                         >
-                            {t("dataOut")}
-                            <Icon className="ml-2 h-4 w-4" />
+                            Data Out
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
                         </Button>
                     );
                 }
@@ -336,7 +318,21 @@ export default function MachineClientsTable({
             {
                 accessorKey: "client",
                 friendlyName: t("agent"),
-                header: () => <span className="px-3">{t("agent")}</span>,
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("agent")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                },
                 cell: ({ row }) => {
                     const originalRow = row.original;
 
@@ -360,8 +356,22 @@ export default function MachineClientsTable({
             },
             {
                 accessorKey: "subnet",
-                friendlyName: t("address"),
-                header: () => <span className="px-3">{t("address")}</span>
+                friendlyName: "Address",
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            Address
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                }
             }
         ];
 
@@ -445,56 +455,7 @@ export default function MachineClientsTable({
         }
 
         return baseColumns;
-    }, [hasRowsWithoutUserId, t, getSortDirection, toggleSort]);
-
-    const booleanSearchFilterSchema = z
-        .enum(["true", "false"])
-        .optional()
-        .catch(undefined);
-
-    function handleFilterChange(
-        column: string,
-        value: string | null | undefined | string[]
-    ) {
-        searchParams.delete(column);
-        searchParams.delete("page");
-
-        if (typeof value === "string") {
-            searchParams.set(column, value);
-        } else if (value) {
-            for (const val of value) {
-                searchParams.append(column, val);
-            }
-        }
-
-        filter({
-            searchParams
-        });
-    }
-
-    function toggleSort(column: string) {
-        const newSearch = getNextSortOrder(column, searchParams);
-
-        filter({
-            searchParams: newSearch
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({
-            searchParams
-        });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({
-            searchParams
-        });
-    }, 300);
+    }, [hasRowsWithoutUserId, t]);
 
     return (
         <>
@@ -517,25 +478,20 @@ export default function MachineClientsTable({
                     title="Delete Client"
                 />
             )}
-            <ControlledDataTable
+            <DataTable
                 columns={columns}
-                rows={machineClients}
-                tableId="machine-clients"
+                data={machineClients || []}
+                persistPageSize="machine-clients"
                 searchPlaceholder={t("resourcesSearch")}
+                searchColumn="name"
                 onAdd={() =>
-                    startNavigation(() =>
-                        router.push(`/${orgId}/settings/clients/machine/create`)
-                    )
+                    router.push(`/${orgId}/settings/clients/machine/create`)
                 }
-                pagination={pagination}
-                rowCount={rowCount}
                 addButtonText={t("createClient")}
                 onRefresh={refreshData}
-                isRefreshing={isRefreshing || isFiltering}
-                onSearch={handleSearchChange}
-                onPaginationChange={handlePaginationChange}
-                isNavigatingToAddPage={isNavigatingToAddPage}
-                enableColumnVisibility
+                isRefreshing={isRefreshing}
+                enableColumnVisibility={true}
+                persistColumnVisibility="machine-clients"
                 columnVisibility={defaultMachineColumnVisibility}
                 stickyLeftColumn="name"
                 stickyRightColumn="actions"
@@ -562,10 +518,30 @@ export default function MachineClientsTable({
                                 value: "blocked"
                             }
                         ],
-                        onValueChange(selectedValues: string[]) {
-                            handleFilterChange("status", selectedValues);
+                        filterFn: (
+                            row: ClientRow,
+                            selectedValues: (string | number | boolean)[]
+                        ) => {
+                            if (selectedValues.length === 0) return true;
+                            const rowArchived = row.archived || false;
+                            const rowBlocked = row.blocked || false;
+                            const isActive = !rowArchived && !rowBlocked;
+
+                            if (selectedValues.includes("active") && isActive)
+                                return true;
+                            if (
+                                selectedValues.includes("archived") &&
+                                rowArchived
+                            )
+                                return true;
+                            if (
+                                selectedValues.includes("blocked") &&
+                                rowBlocked
+                            )
+                                return true;
+                            return false;
                         },
-                        values: searchParams.getAll("status")
+                        defaultValues: ["active"] // Default to showing active clients
                     }
                 ]}
             />

src/components/OrgSelector.tsx

@@ -83,7 +83,7 @@ export function OrgSelector({
             <PopoverContent className="w-[320px] p-0" align="start">
                 <Command className="rounded-lg">
                     <CommandInput
-                        placeholder={t("searchPlaceholder")}
+                        placeholder={t("searchProgress")}
                         className="border-0 focus:ring-0"
                     />
                     <CommandEmpty className="py-6 text-center">

src/components/ProxyResourcesTable.tsx

@@ -2,8 +2,9 @@
 
 import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import CopyToClipboard from "@app/components/CopyToClipboard";
-import { Button } from "@app/components/ui/button";
+import { DataTable } from "@app/components/ui/data-table";
 import { ExtendedColumnDef } from "@app/components/ui/data-table";
+import { Button } from "@app/components/ui/button";
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -13,14 +14,13 @@ import {
 import { InfoPopup } from "@app/components/ui/info-popup";
 import { Switch } from "@app/components/ui/switch";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
 import { UpdateResourceResponse } from "@server/routers/resource";
-import type { PaginationState } from "@tanstack/react-table";
 import { AxiosResponse } from "axios";
 import {
     ArrowRight,
+    ArrowUpDown,
     CheckCircle2,
     ChevronDown,
     Clock,
@@ -32,24 +32,14 @@ import {
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
-import {
-    useOptimistic,
-    useRef,
-    useState,
-    useTransition,
-    type ComponentRef
-} from "react";
-import { useDebouncedCallback } from "use-debounce";
-import z from "zod";
-import { ColumnFilterButton } from "./ColumnFilterButton";
-import { ControlledDataTable } from "./ui/controlled-data-table";
+import { useState, useTransition } from "react";
 
 export type TargetHealth = {
     targetId: number;
     ip: string;
     port: number;
     enabled: boolean;
-    healthStatus: "healthy" | "unhealthy" | "unknown" | null;
+    healthStatus?: "healthy" | "unhealthy" | "unknown";
 };
 
 export type ResourceRow = {
@@ -127,22 +117,18 @@ function StatusIcon({
 type ProxyResourcesTableProps = {
     resources: ResourceRow[];
     orgId: string;
-    pagination: PaginationState;
-    rowCount: number;
+    defaultSort?: {
+        id: string;
+        desc: boolean;
+    };
 };
 
 export default function ProxyResourcesTable({
     resources,
     orgId,
-    pagination,
-    rowCount
+    defaultSort
 }: ProxyResourcesTableProps) {
     const router = useRouter();
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
     const t = useTranslations();
 
     const { env } = useEnvContext();
@@ -154,7 +140,6 @@ export default function ProxyResourcesTable({
         useState<ResourceRow | null>();
 
     const [isRefreshing, startTransition] = useTransition();
-    const [isNavigatingToAddPage, startNavigation] = useTransition();
 
     const refreshData = () => {
         startTransition(() => {
@@ -189,24 +174,23 @@ export default function ProxyResourcesTable({
     };
 
     async function toggleResourceEnabled(val: boolean, resourceId: number) {
-        try {
-            await api.post<AxiosResponse<UpdateResourceResponse>>(
+        await api
+            .post<AxiosResponse<UpdateResourceResponse>>(
                 `resource/${resourceId}`,
                 {
                     enabled: val
                 }
-            );
-            router.refresh();
-        } catch (e) {
-            toast({
-                variant: "destructive",
-                title: t("resourcesErrorUpdate"),
-                description: formatAxiosError(
-                    e,
-                    t("resourcesErrorUpdateDescription")
-                )
+            )
+            .catch((e) => {
+                toast({
+                    variant: "destructive",
+                    title: t("resourcesErrorUpdate"),
+                    description: formatAxiosError(
+                        e,
+                        t("resourcesErrorUpdateDescription")
+                    )
+                });
             });
-        }
     }
 
     function TargetStatusCell({ targets }: { targets?: TargetHealth[] }) {
@@ -252,7 +236,7 @@ export default function ProxyResourcesTable({
                         <ChevronDown className="h-3 w-3" />
                     </Button>
                 </DropdownMenuTrigger>
-                <DropdownMenuContent align="start" className="min-w-70">
+                <DropdownMenuContent align="start" className="min-w-[280px]">
                     {monitoredTargets.length > 0 && (
                         <>
                             {monitoredTargets.map((target) => (
@@ -318,14 +302,38 @@ export default function ProxyResourcesTable({
             accessorKey: "name",
             enableHiding: false,
             friendlyName: t("name"),
-            header: () => <span className="p-3">{t("name")}</span>
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("name")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            }
         },
         {
             id: "niceId",
             accessorKey: "nice",
             friendlyName: t("identifier"),
             enableHiding: true,
-            header: () => <span className="p-3">{t("identifier")}</span>,
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("identifier")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            },
             cell: ({ row }) => {
                 return <span>{row.original.nice || "-"}</span>;
             }
@@ -351,33 +359,19 @@ export default function ProxyResourcesTable({
             id: "status",
             accessorKey: "status",
             friendlyName: t("status"),
-            header: () => (
-                <ColumnFilterButton
-                    options={[
-                        { value: "healthy", label: t("resourcesTableHealthy") },
-                        {
-                            value: "degraded",
-                            label: t("resourcesTableDegraded")
-                        },
-                        { value: "offline", label: t("resourcesTableOffline") },
-                        {
-                            value: "no_targets",
-                            label: t("resourcesTableNoTargets")
-                        },
-                        { value: "unknown", label: t("resourcesTableUnknown") }
-                    ]}
-                    selectedValue={
-                        searchParams.get("healthStatus") ?? undefined
-                    }
-                    onValueChange={(value) =>
-                        handleFilterChange("healthStatus", value)
-                    }
-                    searchPlaceholder={t("searchPlaceholder")}
-                    emptyMessage={t("emptySearchOptions")}
-                    label={t("status")}
-                    className="p-3"
-                />
-            ),
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("status")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            },
             cell: ({ row }) => {
                 const resourceRow = row.original;
                 return <TargetStatusCell targets={resourceRow.targets} />;
@@ -425,23 +419,19 @@ export default function ProxyResourcesTable({
         {
             accessorKey: "authState",
             friendlyName: t("authentication"),
-            header: () => (
-                <ColumnFilterButton
-                    options={[
-                        { value: "protected", label: t("protected") },
-                        { value: "not_protected", label: t("notProtected") },
-                        { value: "none", label: t("none") }
-                    ]}
-                    selectedValue={searchParams.get("authState") ?? undefined}
-                    onValueChange={(value) =>
-                        handleFilterChange("authState", value)
-                    }
-                    searchPlaceholder={t("searchPlaceholder")}
-                    emptyMessage={t("emptySearchOptions")}
-                    label={t("authentication")}
-                    className="p-3"
-                />
-            ),
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("authentication")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
+            },
             cell: ({ row }) => {
                 const resourceRow = row.original;
                 return (
@@ -466,28 +456,20 @@ export default function ProxyResourcesTable({
         {
             accessorKey: "enabled",
             friendlyName: t("enabled"),
-            header: () => (
-                <ColumnFilterButton
-                    options={[
-                        { value: "true", label: t("enabled") },
-                        { value: "false", label: t("disabled") }
-                    ]}
-                    selectedValue={booleanSearchFilterSchema.parse(
-                        searchParams.get("enabled")
-                    )}
-                    onValueChange={(value) =>
-                        handleFilterChange("enabled", value)
-                    }
-                    searchPlaceholder={t("searchPlaceholder")}
-                    emptyMessage={t("emptySearchOptions")}
-                    label={t("enabled")}
-                    className="p-3"
-                />
-            ),
+            header: () => <span className="p-3">{t("enabled")}</span>,
             cell: ({ row }) => (
-                <ResourceEnabledForm
-                    resource={row.original}
-                    onToggleResourceEnabled={toggleResourceEnabled}
+                <Switch
+                    defaultChecked={
+                        row.original.http
+                            ? !!row.original.domainId && row.original.enabled
+                            : row.original.enabled
+                    }
+                    disabled={
+                        row.original.http ? !row.original.domainId : false
+                    }
+                    onCheckedChange={(val) =>
+                        toggleResourceEnabled(val, row.original.id)
+                    }
                 />
             )
         },
@@ -543,42 +525,6 @@ export default function ProxyResourcesTable({
         }
     ];
 
-    const booleanSearchFilterSchema = z
-        .enum(["true", "false"])
-        .optional()
-        .catch(undefined);
-
-    function handleFilterChange(
-        column: string,
-        value: string | undefined | null
-    ) {
-        searchParams.delete(column);
-        searchParams.delete("page");
-
-        if (value) {
-            searchParams.set(column, value);
-        }
-        filter({
-            searchParams
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({
-            searchParams
-        });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({
-            searchParams
-        });
-    }, 300);
-
     return (
         <>
             {selectedResource && (
@@ -601,25 +547,21 @@ export default function ProxyResourcesTable({
                 />
             )}
 
-            <ControlledDataTable
+            <DataTable
                 columns={proxyColumns}
-                rows={resources}
-                tableId="proxy-resources"
+                data={resources}
+                persistPageSize="proxy-resources"
                 searchPlaceholder={t("resourcesSearch")}
-                pagination={pagination}
-                rowCount={rowCount}
-                onSearch={handleSearchChange}
-                onPaginationChange={handlePaginationChange}
+                searchColumn="name"
                 onAdd={() =>
-                    startNavigation(() =>
-                        router.push(`/${orgId}/settings/resources/proxy/create`)
-                    )
+                    router.push(`/${orgId}/settings/resources/proxy/create`)
                 }
                 addButtonText={t("resourceAdd")}
                 onRefresh={refreshData}
-                isRefreshing={isRefreshing || isFiltering}
-                isNavigatingToAddPage={isNavigatingToAddPage}
-                enableColumnVisibility
+                isRefreshing={isRefreshing}
+                defaultSort={defaultSort}
+                enableColumnVisibility={true}
+                persistColumnVisibility="proxy-resources"
                 columnVisibility={{ niceId: false }}
                 stickyLeftColumn="name"
                 stickyRightColumn="actions"
@@ -627,43 +569,3 @@ export default function ProxyResourcesTable({
         </>
     );
 }
-
-type ResourceEnabledFormProps = {
-    resource: ResourceRow;
-    onToggleResourceEnabled: (
-        val: boolean,
-        resourceId: number
-    ) => Promise<void>;
-};
-
-function ResourceEnabledForm({
-    resource,
-    onToggleResourceEnabled
-}: ResourceEnabledFormProps) {
-    const enabled = resource.http
-        ? !!resource.domainId && resource.enabled
-        : resource.enabled;
-    const [optimisticEnabled, setOptimisticEnabled] = useOptimistic(enabled);
-
-    const formRef = useRef<ComponentRef<"form">>(null);
-
-    async function submitAction(formData: FormData) {
-        const newEnabled = !(formData.get("enabled") === "on");
-        setOptimisticEnabled(newEnabled);
-        await onToggleResourceEnabled(newEnabled, resource.id);
-    }
-
-    return (
-        <form action={submitAction} ref={formRef}>
-            <Switch
-                checked={optimisticEnabled}
-                disabled={
-                    (resource.http && !resource.domainId) ||
-                    optimisticEnabled !== enabled
-                }
-                name="enabled"
-                onCheckedChange={() => formRef.current?.requestSubmit()}
-            />
-        </form>
-    );
-}

src/components/SitesDataTable.tsx

@@ -0,0 +1,50 @@
+"use client";
+
+import { ColumnDef } from "@tanstack/react-table";
+import { DataTable } from "@app/components/ui/data-table";
+import { useTranslations } from "next-intl";
+
+interface DataTableProps<TData, TValue> {
+    columns: ColumnDef<TData, TValue>[];
+    data: TData[];
+    createSite?: () => void;
+    onRefresh?: () => void;
+    isRefreshing?: boolean;
+    columnVisibility?: Record<string, boolean>;
+    enableColumnVisibility?: boolean;
+}
+
+export function SitesDataTable<TData, TValue>({
+    columns,
+    data,
+    createSite,
+    onRefresh,
+    isRefreshing,
+    columnVisibility,
+    enableColumnVisibility
+}: DataTableProps<TData, TValue>) {
+    const t = useTranslations();
+
+    return (
+        <DataTable
+            columns={columns}
+            data={data}
+            persistPageSize="sites-table"
+            title={t("sites")}
+            searchPlaceholder={t("searchSitesProgress")}
+            searchColumn="name"
+            onAdd={createSite}
+            addButtonText={t("siteAdd")}
+            onRefresh={onRefresh}
+            isRefreshing={isRefreshing}
+            defaultSort={{
+                id: "name",
+                desc: false
+            }}
+            columnVisibility={columnVisibility}
+            enableColumnVisibility={enableColumnVisibility}
+            stickyLeftColumn="name"
+            stickyRightColumn="actions"
+        />
+    );
+}

src/components/SitesTable.tsx

@@ -1,42 +1,37 @@
 "use client";
 
-import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
-
-import { Badge } from "@app/components/ui/badge";
-import { Button } from "@app/components/ui/button";
+import { Column, ColumnDef } from "@tanstack/react-table";
+import { ExtendedColumnDef } from "@app/components/ui/data-table";
+import { SitesDataTable } from "@app/components/SitesDataTable";
 import {
     DropdownMenu,
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger
 } from "@app/components/ui/dropdown-menu";
-import { InfoPopup } from "@app/components/ui/info-popup";
-import { useEnvContext } from "@app/hooks/useEnvContext";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
-import { getNextSortOrder, getSortDirection } from "@app/lib/sortColumn";
-import { toast } from "@app/hooks/useToast";
-import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { build } from "@server/build";
-import { type PaginationState } from "@tanstack/react-table";
+import { Button } from "@app/components/ui/button";
 import {
-    ArrowDown01Icon,
     ArrowRight,
-    ArrowUp10Icon,
+    ArrowUpDown,
     ArrowUpRight,
-    ChevronsUpDownIcon,
-    MoreHorizontal
+    Check,
+    MoreHorizontal,
+    X
 } from "lucide-react";
-import { useTranslations } from "next-intl";
 import Link from "next/link";
-import { usePathname, useRouter } from "next/navigation";
-import { useState, useTransition } from "react";
-import { useDebouncedCallback } from "use-debounce";
-import z from "zod";
-import { ColumnFilterButton } from "./ColumnFilterButton";
-import {
-    ControlledDataTable,
-    type ExtendedColumnDef
-} from "./ui/controlled-data-table";
+import { useRouter } from "next/navigation";
+import { AxiosResponse } from "axios";
+import { useState, useEffect } from "react";
+import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
+import { toast } from "@app/hooks/useToast";
+import { formatAxiosError } from "@app/lib/api";
+import { createApiClient } from "@app/lib/api";
+import { useEnvContext } from "@app/hooks/useEnvContext";
+import { useTranslations } from "next-intl";
+import { parseDataSize } from "@app/lib/dataSize";
+import { Badge } from "@app/components/ui/badge";
+import { InfoPopup } from "@app/components/ui/info-popup";
+import { build } from "@server/build";
 
 export type SiteRow = {
     id: number;
@@ -57,91 +52,79 @@ export type SiteRow = {
 
 type SitesTableProps = {
     sites: SiteRow[];
-    pagination: PaginationState;
     orgId: string;
-    rowCount: number;
 };
 
-export default function SitesTable({
-    sites,
-    orgId,
-    pagination,
-    rowCount
-}: SitesTableProps) {
+export default function SitesTable({ sites, orgId }: SitesTableProps) {
     const router = useRouter();
-    const pathname = usePathname();
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
 
     const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
     const [selectedSite, setSelectedSite] = useState<SiteRow | null>(null);
-    const [isRefreshing, startTransition] = useTransition();
-    const [isNavigatingToAddPage, startNavigation] = useTransition();
+    const [rows, setRows] = useState<SiteRow[]>(sites);
+    const [isRefreshing, setIsRefreshing] = useState(false);
 
     const api = createApiClient(useEnvContext());
     const t = useTranslations();
+    const { env } = useEnvContext();
 
-    const booleanSearchFilterSchema = z
-        .enum(["true", "false"])
-        .optional()
-        .catch(undefined);
+    // Update local state when props change (e.g., after refresh)
+    useEffect(() => {
+        setRows(sites);
+    }, [sites]);
 
-    function handleFilterChange(
-        column: string,
-        value: string | undefined | null
-    ) {
-        const sp = new URLSearchParams(searchParams);
-        sp.delete(column);
-        sp.delete("page");
-
-        if (value) {
-            sp.set(column, value);
+    const refreshData = async () => {
+        console.log("Data refreshed");
+        setIsRefreshing(true);
+        try {
+            await new Promise((resolve) => setTimeout(resolve, 200));
+            router.refresh();
+        } catch (error) {
+            toast({
+                title: t("error"),
+                description: t("refreshError"),
+                variant: "destructive"
+            });
+        } finally {
+            setIsRefreshing(false);
         }
-        startTransition(() => router.push(`${pathname}?${sp.toString()}`));
-    }
+    };
 
-    function refreshData() {
-        startTransition(async () => {
-            try {
-                router.refresh();
-            } catch (error) {
+    const deleteSite = (siteId: number) => {
+        api.delete(`/site/${siteId}`)
+            .catch((e) => {
+                console.error(t("siteErrorDelete"), e);
                 toast({
-                    title: t("error"),
-                    description: t("refreshError"),
-                    variant: "destructive"
+                    variant: "destructive",
+                    title: t("siteErrorDelete"),
+                    description: formatAxiosError(e, t("siteErrorDelete"))
                 });
-            }
-        });
-    }
+            })
+            .then(() => {
+                router.refresh();
+                setIsDeleteModalOpen(false);
 
-    function deleteSite(siteId: number) {
-        startTransition(async () => {
-            await api
-                .delete(`/site/${siteId}`)
-                .catch((e) => {
-                    console.error(t("siteErrorDelete"), e);
-                    toast({
-                        variant: "destructive",
-                        title: t("siteErrorDelete"),
-                        description: formatAxiosError(e, t("siteErrorDelete"))
-                    });
-                })
-                .then(() => {
-                    router.refresh();
-                    setIsDeleteModalOpen(false);
-                });
-        });
-    }
+                const newRows = rows.filter((row) => row.id !== siteId);
+
+                setRows(newRows);
+            });
+    };
 
     const columns: ExtendedColumnDef<SiteRow>[] = [
         {
             accessorKey: "name",
             enableHiding: false,
-            header: () => {
-                return <span className="p-3">{t("name")}</span>;
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("name")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
             }
         },
         {
@@ -149,8 +132,18 @@ export default function SitesTable({
             accessorKey: "nice",
             friendlyName: t("identifier"),
             enableHiding: true,
-            header: () => {
-                return <span className="p-3">{t("identifier")}</span>;
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("identifier")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
             },
             cell: ({ row }) => {
                 return <span>{row.original.nice || "-"}</span>;
@@ -159,24 +152,17 @@ export default function SitesTable({
         {
             accessorKey: "online",
             friendlyName: t("online"),
-            header: () => {
+            header: ({ column }) => {
                 return (
-                    <ColumnFilterButton
-                        options={[
-                            { value: "true", label: t("online") },
-                            { value: "false", label: t("offline") }
-                        ]}
-                        selectedValue={booleanSearchFilterSchema.parse(
-                            searchParams.get("online")
-                        )}
-                        onValueChange={(value) =>
-                            handleFilterChange("online", value)
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
                         }
-                        searchPlaceholder={t("searchPlaceholder")}
-                        emptyMessage={t("emptySearchOptions")}
-                        label={t("online")}
-                        className="p-3"
-                    />
+                    >
+                        {t("online")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
                 );
             },
             cell: ({ row }) => {
@@ -208,59 +194,58 @@ export default function SitesTable({
         {
             accessorKey: "mbIn",
             friendlyName: t("dataIn"),
-            header: () => {
-                const dataInOrder = getSortDirection(
-                    "megabytesIn",
-                    searchParams
-                );
-                const Icon =
-                    dataInOrder === "asc"
-                        ? ArrowDown01Icon
-                        : dataInOrder === "desc"
-                          ? ArrowUp10Icon
-                          : ChevronsUpDownIcon;
+            header: ({ column }) => {
                 return (
                     <Button
                         variant="ghost"
-                        onClick={() => toggleSort("megabytesIn")}
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
                     >
                         {t("dataIn")}
-                        <Icon className="ml-2 h-4 w-4" />
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
                     </Button>
                 );
-            }
+            },
+            sortingFn: (rowA, rowB) =>
+                parseDataSize(rowA.original.mbIn) -
+                parseDataSize(rowB.original.mbIn)
         },
         {
             accessorKey: "mbOut",
             friendlyName: t("dataOut"),
-            header: () => {
-                const dataOutOrder = getSortDirection(
-                    "megabytesOut",
-                    searchParams
-                );
-
-                const Icon =
-                    dataOutOrder === "asc"
-                        ? ArrowDown01Icon
-                        : dataOutOrder === "desc"
-                          ? ArrowUp10Icon
-                          : ChevronsUpDownIcon;
+            header: ({ column }) => {
                 return (
                     <Button
                         variant="ghost"
-                        onClick={() => toggleSort("megabytesOut")}
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
                     >
                         {t("dataOut")}
-                        <Icon className="ml-2 h-4 w-4" />
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
                     </Button>
                 );
-            }
+            },
+            sortingFn: (rowA, rowB) =>
+                parseDataSize(rowA.original.mbOut) -
+                parseDataSize(rowB.original.mbOut)
         },
         {
             accessorKey: "type",
             friendlyName: t("type"),
-            header: () => {
-                return <span className="p-3">{t("type")}</span>;
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("type")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
             },
             cell: ({ row }) => {
                 const originalRow = row.original;
@@ -305,8 +290,18 @@ export default function SitesTable({
         {
             accessorKey: "exitNode",
             friendlyName: t("exitNode"),
-            header: () => {
-                return <span className="p-3">{t("exitNode")}</span>;
+            header: ({ column }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        {t("exitNode")}
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
             },
             cell: ({ row }) => {
                 const originalRow = row.original;
@@ -359,8 +354,18 @@ export default function SitesTable({
         },
         {
             accessorKey: "address",
-            header: () => {
-                return <span className="p-3">{t("address")}</span>;
+            header: ({ column }: { column: Column<SiteRow, unknown> }) => {
+                return (
+                    <Button
+                        variant="ghost"
+                        onClick={() =>
+                            column.toggleSorting(column.getIsSorted() === "asc")
+                        }
+                    >
+                        Address
+                        <ArrowUpDown className="ml-2 h-4 w-4" />
+                    </Button>
+                );
             },
             cell: ({ row }: { row: any }) => {
                 const originalRow = row.original;
@@ -423,30 +428,6 @@ export default function SitesTable({
         }
     ];
 
-    function toggleSort(column: string) {
-        const newSearch = getNextSortOrder(column, searchParams);
-
-        filter({
-            searchParams: newSearch
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({
-            searchParams
-        });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({
-            searchParams
-        });
-    }, 300);
-
     return (
         <>
             {selectedSite && (
@@ -463,42 +444,27 @@ export default function SitesTable({
                         </div>
                     }
                     buttonText={t("siteConfirmDelete")}
-                    onConfirm={async () =>
-                        startTransition(() => deleteSite(selectedSite!.id))
-                    }
+                    onConfirm={async () => deleteSite(selectedSite!.id)}
                     string={selectedSite.name}
                     title={t("siteDelete")}
                 />
             )}
 
-            <ControlledDataTable
+            <SitesDataTable
                 columns={columns}
-                rows={sites}
-                tableId="sites-table"
-                searchPlaceholder={t("searchSitesProgress")}
-                pagination={pagination}
-                onPaginationChange={handlePaginationChange}
-                onAdd={() =>
-                    startNavigation(() =>
-                        router.push(`/${orgId}/settings/sites/create`)
-                    )
+                data={rows}
+                createSite={() =>
+                    router.push(`/${orgId}/settings/sites/create`)
                 }
-                isNavigatingToAddPage={isNavigatingToAddPage}
-                searchQuery={searchParams.get("query")?.toString()}
-                onSearch={handleSearchChange}
-                addButtonText={t("siteAdd")}
                 onRefresh={refreshData}
-                isRefreshing={isRefreshing || isFiltering}
-                rowCount={rowCount}
+                isRefreshing={isRefreshing}
                 columnVisibility={{
                     niceId: false,
                     nice: false,
                     exitNode: false,
                     address: false
                 }}
-                enableColumnVisibility
-                stickyLeftColumn="name"
-                stickyRightColumn="actions"
+                enableColumnVisibility={true}
             />
         </>
     );

src/components/TanstackQueryProvider.tsx

@@ -1,13 +1,11 @@
 "use client";
+import * as React from "react";
+import { QueryClientProvider } from "@tanstack/react-query";
+import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
+import { QueryClient } from "@tanstack/react-query";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { createApiClient } from "@app/lib/api";
-import {
-    keepPreviousData,
-    QueryClient,
-    QueryClientProvider
-} from "@tanstack/react-query";
-import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-import * as React from "react";
+import { durationToMs } from "@app/lib/durationToMs";
 
 export type ReactQueryProviderProps = {
     children: React.ReactNode;
@@ -24,8 +22,7 @@ export function TanstackQueryProvider({ children }: ReactQueryProviderProps) {
                         staleTime: 0,
                         meta: {
                             api
-                        },
-                        placeholderData: keepPreviousData
+                        }
                     },
                     mutations: {
                         meta: { api }

src/components/UserDevicesTable.tsx

@@ -2,41 +2,34 @@
 
 import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import { Button } from "@app/components/ui/button";
-import { ExtendedColumnDef } from "@app/components/ui/data-table";
+import { DataTable, ExtendedColumnDef } from "@app/components/ui/data-table";
 import {
     DropdownMenu,
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger
 } from "@app/components/ui/dropdown-menu";
-import { InfoPopup } from "@app/components/ui/info-popup";
 import { useEnvContext } from "@app/hooks/useEnvContext";
-import { useNavigationContext } from "@app/hooks/useNavigationContext";
-import { getNextSortOrder, getSortDirection } from "@app/lib/sortColumn";
 import { toast } from "@app/hooks/useToast";
 import { createApiClient, formatAxiosError } from "@app/lib/api";
-import { formatFingerprintInfo } from "@app/lib/formatDeviceFingerprint";
 import { getUserDisplayName } from "@app/lib/getUserDisplayName";
-import { build } from "@server/build";
-import type { PaginationState } from "@tanstack/react-table";
+import { formatFingerprintInfo, formatPlatform } from "@app/lib/formatDeviceFingerprint";
 import {
-    ArrowDown01Icon,
     ArrowRight,
-    ArrowUp10Icon,
+    ArrowUpDown,
     ArrowUpRight,
-    ChevronsUpDownIcon,
-    CircleSlash,
-    MoreHorizontal
+    MoreHorizontal,
+    CircleSlash
 } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { useMemo, useState, useTransition } from "react";
-import { useDebouncedCallback } from "use-debounce";
 import ClientDownloadBanner from "./ClientDownloadBanner";
-import { ColumnFilterButton } from "./ColumnFilterButton";
 import { Badge } from "./ui/badge";
-import { ControlledDataTable } from "./ui/controlled-data-table";
+import { build } from "@server/build";
+import { usePaidStatus } from "@app/hooks/usePaidStatus";
+import { InfoPopup } from "@app/components/ui/info-popup";
 
 export type ClientRow = {
     id: number;
@@ -72,15 +65,9 @@ export type ClientRow = {
 type ClientTableProps = {
     userClients: ClientRow[];
     orgId: string;
-    pagination: PaginationState;
-    rowCount: number;
 };
 
-export default function UserDevicesTable({
-    userClients,
-    pagination,
-    rowCount
-}: ClientTableProps) {
+export default function UserDevicesTable({ userClients }: ClientTableProps) {
     const router = useRouter();
     const t = useTranslations();
 
@@ -90,11 +77,6 @@ export default function UserDevicesTable({
     );
 
     const api = createApiClient(useEnvContext());
-    const {
-        navigate: filter,
-        isNavigating: isFiltering,
-        searchParams
-    } = useNavigationContext();
     const [isRefreshing, startTransition] = useTransition();
 
     const defaultUserColumnVisibility = {
@@ -206,12 +188,8 @@ export default function UserDevicesTable({
         try {
             // Fetch approvalId for this client using clientId query parameter
             const approvalsRes = await api.get<{
-                data: {
-                    approvals: Array<{ approvalId: number; clientId: number }>;
-                };
-            }>(
-                `/org/${clientRow.orgId}/approvals?approvalState=pending&clientId=${clientRow.id}`
-            );
+                data: { approvals: Array<{ approvalId: number; clientId: number }> };
+            }>(`/org/${clientRow.orgId}/approvals?approvalState=pending&clientId=${clientRow.id}`);
 
             const approval = approvalsRes.data.data.approvals[0];
 
@@ -224,12 +202,9 @@ export default function UserDevicesTable({
                 return;
             }
 
-            await api.put(
-                `/org/${clientRow.orgId}/approvals/${approval.approvalId}`,
-                {
-                    decision: "approved"
-                }
-            );
+            await api.put(`/org/${clientRow.orgId}/approvals/${approval.approvalId}`, {
+                decision: "approved"
+            });
 
             toast({
                 title: t("accessApprovalUpdated"),
@@ -255,12 +230,8 @@ export default function UserDevicesTable({
         try {
             // Fetch approvalId for this client using clientId query parameter
             const approvalsRes = await api.get<{
-                data: {
-                    approvals: Array<{ approvalId: number; clientId: number }>;
-                };
-            }>(
-                `/org/${clientRow.orgId}/approvals?approvalState=pending&clientId=${clientRow.id}`
-            );
+                data: { approvals: Array<{ approvalId: number; clientId: number }> };
+            }>(`/org/${clientRow.orgId}/approvals?approvalState=pending&clientId=${clientRow.id}`);
 
             const approval = approvalsRes.data.data.approvals[0];
 
@@ -273,12 +244,9 @@ export default function UserDevicesTable({
                 return;
             }
 
-            await api.put(
-                `/org/${clientRow.orgId}/approvals/${approval.approvalId}`,
-                {
-                    decision: "denied"
-                }
-            );
+            await api.put(`/org/${clientRow.orgId}/approvals/${approval.approvalId}`, {
+                decision: "denied"
+            });
 
             toast({
                 title: t("accessApprovalUpdated"),
@@ -311,7 +279,21 @@ export default function UserDevicesTable({
                 accessorKey: "name",
                 enableHiding: false,
                 friendlyName: t("name"),
-                header: () => <span className="px-3">{t("name")}</span>,
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("name")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                },
                 cell: ({ row }) => {
                     const r = row.original;
                     const fingerprintInfo = r.fingerprint
@@ -361,12 +343,40 @@ export default function UserDevicesTable({
             {
                 accessorKey: "niceId",
                 friendlyName: t("identifier"),
-                header: () => <span className="px-3">{t("identifier")}</span>
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("identifier")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                }
             },
             {
                 accessorKey: "userEmail",
                 friendlyName: t("users"),
-                header: () => <span className="px-3">{t("users")}</span>,
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("users")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                },
                 cell: ({ row }) => {
                     const r = row.original;
                     return r.userId ? (
@@ -388,31 +398,20 @@ export default function UserDevicesTable({
             },
             {
                 accessorKey: "online",
-                friendlyName: t("online"),
-                header: () => {
+                friendlyName: t("connectivity"),
+                header: ({ column }) => {
                     return (
-                        <ColumnFilterButton
-                            options={[
-                                {
-                                    value: "true",
-                                    label: t("connected")
-                                },
-                                {
-                                    value: "false",
-                                    label: t("disconnected")
-                                }
-                            ]}
-                            selectedValue={
-                                searchParams.get("online") ?? undefined
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
                             }
-                            onValueChange={(value) =>
-                                handleFilterChange("online", value)
-                            }
-                            searchPlaceholder={t("searchPlaceholder")}
-                            emptyMessage={t("emptySearchOptions")}
-                            label={t("online")}
-                            className="p-3"
-                        />
+                        >
+                            {t("online")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
                     );
                 },
                 cell: ({ row }) => {
@@ -437,25 +436,18 @@ export default function UserDevicesTable({
             {
                 accessorKey: "mbIn",
                 friendlyName: t("dataIn"),
-                header: () => {
-                    const dataInOrder = getSortDirection(
-                        "megabytesIn",
-                        searchParams
-                    );
-
-                    const Icon =
-                        dataInOrder === "asc"
-                            ? ArrowDown01Icon
-                            : dataInOrder === "desc"
-                              ? ArrowUp10Icon
-                              : ChevronsUpDownIcon;
+                header: ({ column }) => {
                     return (
                         <Button
                             variant="ghost"
-                            onClick={() => toggleSort("megabytesIn")}
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
                         >
                             {t("dataIn")}
-                            <Icon className="ml-2 h-4 w-4" />
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
                         </Button>
                     );
                 }
@@ -463,25 +455,18 @@ export default function UserDevicesTable({
             {
                 accessorKey: "mbOut",
                 friendlyName: t("dataOut"),
-                header: () => {
-                    const dataOutOrder = getSortDirection(
-                        "megabytesOut",
-                        searchParams
-                    );
-
-                    const Icon =
-                        dataOutOrder === "asc"
-                            ? ArrowDown01Icon
-                            : dataOutOrder === "desc"
-                              ? ArrowUp10Icon
-                              : ChevronsUpDownIcon;
+                header: ({ column }) => {
                     return (
                         <Button
                             variant="ghost"
-                            onClick={() => toggleSort("megabytesOut")}
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
                         >
                             {t("dataOut")}
-                            <Icon className="ml-2 h-4 w-4" />
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
                         </Button>
                     );
                 }
@@ -489,52 +474,21 @@ export default function UserDevicesTable({
             {
                 accessorKey: "client",
                 friendlyName: t("agent"),
-                header: () => (
-                    <ColumnFilterButton
-                        options={[
-                            {
-                                value: "macos",
-                                label: "Pangolin macOS"
-                            },
-                            {
-                                value: "ios",
-                                label: "Pangolin iOS"
-                            },
-                            {
-                                value: "ipados",
-                                label: "Pangolin iPadOS"
-                            },
-                            {
-                                value: "android",
-                                label: "Pangolin Android"
-                            },
-                            {
-                                value: "windows",
-                                label: "Pangolin Windows"
-                            },
-                            {
-                                value: "cli",
-                                label: "Pangolin CLI"
-                            },
-                            {
-                                value: "olm",
-                                label: "Olm CLI"
-                            },
-                            {
-                                value: "unknown",
-                                label: t("unknown")
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
                             }
-                        ]}
-                        selectedValue={searchParams.get("agent") ?? undefined}
-                        onValueChange={(value) =>
-                            handleFilterChange("agent", value)
-                        }
-                        searchPlaceholder={t("searchPlaceholder")}
-                        emptyMessage={t("emptySearchOptions")}
-                        label={t("agent")}
-                        className="p-3"
-                    />
-                ),
+                        >
+                            {t("agent")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                },
                 cell: ({ row }) => {
                     const originalRow = row.original;
 
@@ -560,7 +514,21 @@ export default function UserDevicesTable({
             {
                 accessorKey: "subnet",
                 friendlyName: t("address"),
-                header: () => <span className="px-3">{t("address")}</span>
+                header: ({ column }) => {
+                    return (
+                        <Button
+                            variant="ghost"
+                            onClick={() =>
+                                column.toggleSorting(
+                                    column.getIsSorted() === "asc"
+                                )
+                            }
+                        >
+                            {t("address")}
+                            <ArrowUpDown className="ml-2 h-4 w-4" />
+                        </Button>
+                    );
+                }
             }
         ];
 
@@ -580,25 +548,20 @@ export default function UserDevicesTable({
                                 </Button>
                             </DropdownMenuTrigger>
                             <DropdownMenuContent align="end">
-                                {clientRow.approvalState === "pending" &&
-                                    build !== "oss" && (
-                                        <>
-                                            <DropdownMenuItem
-                                                onClick={() =>
-                                                    approveDevice(clientRow)
-                                                }
-                                            >
-                                                <span>{t("approve")}</span>
-                                            </DropdownMenuItem>
-                                            <DropdownMenuItem
-                                                onClick={() =>
-                                                    denyDevice(clientRow)
-                                                }
-                                            >
-                                                <span>{t("deny")}</span>
-                                            </DropdownMenuItem>
-                                        </>
-                                    )}
+                                {clientRow.approvalState === "pending" && (
+                                    <>
+                                        <DropdownMenuItem
+                                            onClick={() => approveDevice(clientRow)}
+                                        >
+                                            <span>{t("approve")}</span>
+                                        </DropdownMenuItem>
+                                        <DropdownMenuItem
+                                            onClick={() => denyDevice(clientRow)}
+                                        >
+                                            <span>{t("deny")}</span>
+                                        </DropdownMenuItem>
+                                    </>
+                                )}
                                 <DropdownMenuItem
                                     onClick={() => {
                                         if (clientRow.archived) {
@@ -658,7 +621,7 @@ export default function UserDevicesTable({
         });
 
         return baseColumns;
-    }, [hasRowsWithoutUserId, t, getSortDirection, toggleSort]);
+    }, [hasRowsWithoutUserId, t]);
 
     const statusFilterOptions = useMemo(() => {
         const allOptions = [
@@ -689,59 +652,12 @@ export default function UserDevicesTable({
             }
         ];
 
-        if (build === "oss") {
-            return allOptions.filter(
-                (option) =>
-                    option.value !== "pending" && option.value !== "denied"
-            );
-        }
-
         return allOptions;
     }, [t]);
 
-    function handleFilterChange(
-        column: string,
-        value: string | null | undefined | string[]
-    ) {
-        searchParams.delete(column);
-        searchParams.delete("page");
-
-        if (typeof value === "string") {
-            searchParams.set(column, value);
-        } else if (value) {
-            for (const val of value) {
-                searchParams.append(column, val);
-            }
-        }
-
-        filter({
-            searchParams
-        });
-    }
-
-    function toggleSort(column: string) {
-        const newSearch = getNextSortOrder(column, searchParams);
-
-        filter({
-            searchParams: newSearch
-        });
-    }
-
-    const handlePaginationChange = (newPage: PaginationState) => {
-        searchParams.set("page", (newPage.pageIndex + 1).toString());
-        searchParams.set("pageSize", newPage.pageSize.toString());
-        filter({
-            searchParams
-        });
-    };
-
-    const handleSearchChange = useDebouncedCallback((query: string) => {
-        searchParams.set("query", query);
-        searchParams.delete("page");
-        filter({
-            searchParams
-        });
-    }, 300);
+    const statusFilterDefaultValues = useMemo(() => {
+        return ["active", "pending"];
+    }, []);
 
     return (
         <>
@@ -766,19 +682,17 @@ export default function UserDevicesTable({
             )}
             <ClientDownloadBanner />
 
-            <ControlledDataTable
+            <DataTable
                 columns={columns}
-                rows={userClients || []}
-                tableId="user-clients"
+                data={userClients || []}
+                persistPageSize="user-clients"
                 searchPlaceholder={t("resourcesSearch")}
+                searchColumn="name"
                 onRefresh={refreshData}
-                isRefreshing={isRefreshing || isFiltering}
-                enableColumnVisibility
+                isRefreshing={isRefreshing}
+                enableColumnVisibility={true}
+                persistColumnVisibility="user-clients"
                 columnVisibility={defaultUserColumnVisibility}
-                onSearch={handleSearchChange}
-                onPaginationChange={handlePaginationChange}
-                pagination={pagination}
-                rowCount={rowCount}
                 stickyLeftColumn="name"
                 stickyRightColumn="actions"
                 filters={[
@@ -788,10 +702,41 @@ export default function UserDevicesTable({
                         multiSelect: true,
                         displayMode: "calculated",
                         options: statusFilterOptions,
-                        onValueChange: (selectedValues: string[]) => {
-                            handleFilterChange("status", selectedValues);
+                        filterFn: (
+                            row: ClientRow,
+                            selectedValues: (string | number | boolean)[]
+                        ) => {
+                            if (selectedValues.length === 0) return true;
+                            const rowArchived = row.archived;
+                            const rowBlocked = row.blocked;
+                            const approvalState = row.approvalState;
+                            const isActive = !rowArchived && !rowBlocked && approvalState !== "pending" && approvalState !== "denied";
+
+                            if (selectedValues.includes("active") && isActive)
+                                return true;
+                            if (
+                                selectedValues.includes("pending") &&
+                                approvalState === "pending"
+                            )
+                                return true;
+                            if (
+                                selectedValues.includes("denied") &&
+                                approvalState === "denied"
+                            )
+                                return true;
+                            if (
+                                selectedValues.includes("archived") &&
+                                rowArchived
+                            )
+                                return true;
+                            if (
+                                selectedValues.includes("blocked") &&
+                                rowBlocked
+                            )
+                                return true;
+                            return false;
                         },
-                        values: searchParams.getAll("status")
+                        defaultValues: statusFilterDefaultValues
                     }
                 ]}
             />

src/components/resource-target-address-item.tsx

@@ -20,7 +20,6 @@ import {
 import { Input } from "./ui/input";
 import { Popover, PopoverContent, PopoverTrigger } from "./ui/popover";
 import { Select, SelectContent, SelectItem, SelectTrigger } from "./ui/select";
-import { useEffect } from "react";
 
 type SiteWithUpdateAvailable = ListSitesResponse["sites"][number];
 

src/components/ui/controlled-data-table.tsx

@@ -1,592 +0,0 @@
-"use client";
-
-import {
-    ColumnDef,
-    ColumnFiltersState,
-    flexRender,
-    getCoreRowModel,
-    PaginationState,
-    useReactTable
-} from "@tanstack/react-table";
-
-import {
-    Table,
-    TableBody,
-    TableCell,
-    TableHead,
-    TableHeader,
-    TableRow
-} from "@/components/ui/table";
-import { DataTablePagination } from "@app/components/DataTablePagination";
-import { Button } from "@app/components/ui/button";
-import { Card, CardContent, CardHeader } from "@app/components/ui/card";
-import {
-    DropdownMenu,
-    DropdownMenuCheckboxItem,
-    DropdownMenuContent,
-    DropdownMenuLabel,
-    DropdownMenuSeparator,
-    DropdownMenuTrigger
-} from "@app/components/ui/dropdown-menu";
-import { Input } from "@app/components/ui/input";
-import { useStoredColumnVisibility } from "@app/hooks/useStoredColumnVisibility";
-
-import { Columns, Filter, Plus, RefreshCw, Search } from "lucide-react";
-import { useTranslations } from "next-intl";
-import { useMemo, useState } from "react";
-
-// Extended ColumnDef type that includes optional friendlyName for column visibility dropdown
-export type ExtendedColumnDef<TData, TValue = unknown> = ColumnDef<
-    TData,
-    TValue
-> & {
-    friendlyName?: string;
-};
-
-type FilterOption = {
-    id: string;
-    label: string;
-    value: string;
-};
-
-type DataTableFilter = {
-    id: string;
-    label: string;
-    options: FilterOption[];
-    multiSelect?: boolean;
-    onValueChange: (selectedValues: string[]) => void;
-    values?: string[];
-    displayMode?: "label" | "calculated"; // How to display the filter button text
-};
-
-export type DataTablePaginationUpdateFn = (newPage: PaginationState) => void;
-
-type ControlledDataTableProps<TData, TValue> = {
-    columns: ExtendedColumnDef<TData, TValue>[];
-    rows: TData[];
-    tableId: string;
-    addButtonText?: string;
-    onAdd?: () => void;
-    onRefresh?: () => void;
-    isRefreshing?: boolean;
-    isNavigatingToAddPage?: boolean;
-    searchPlaceholder?: string;
-    filters?: DataTableFilter[];
-    filterDisplayMode?: "label" | "calculated"; // Global filter display mode (can be overridden per filter)
-    columnVisibility?: Record<string, boolean>;
-    enableColumnVisibility?: boolean;
-    onSearch?: (input: string) => void;
-    searchQuery?: string;
-    onPaginationChange: DataTablePaginationUpdateFn;
-    stickyLeftColumn?: string; // Column ID or accessorKey for left sticky column
-    stickyRightColumn?: string; // Column ID or accessorKey for right sticky column (typically "actions")
-    rowCount: number;
-    pagination: PaginationState;
-};
-
-export function ControlledDataTable<TData, TValue>({
-    columns,
-    rows,
-    addButtonText,
-    onAdd,
-    onRefresh,
-    isRefreshing,
-    searchPlaceholder = "Search...",
-    filters,
-    filterDisplayMode = "label",
-    columnVisibility: defaultColumnVisibility,
-    enableColumnVisibility = false,
-    tableId,
-    pagination,
-    stickyLeftColumn,
-    onSearch,
-    searchQuery,
-    onPaginationChange,
-    stickyRightColumn,
-    rowCount,
-    isNavigatingToAddPage
-}: ControlledDataTableProps<TData, TValue>) {
-    const t = useTranslations();
-
-    const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
-
-    const [columnVisibility, setColumnVisibility] = useStoredColumnVisibility(
-        tableId,
-        defaultColumnVisibility
-    );
-
-    // TODO: filters
-    const activeFilters = useMemo(() => {
-        const initial: Record<string, string[]> = {};
-        filters?.forEach((filter) => {
-            initial[filter.id] = filter.values || [];
-        });
-        return initial;
-    }, [filters]);
-
-    const table = useReactTable({
-        data: rows,
-        columns,
-        getCoreRowModel: getCoreRowModel(),
-        // getFilteredRowModel: getFilteredRowModel(),
-        onColumnVisibilityChange: setColumnVisibility,
-        onPaginationChange: (state) => {
-            const newState =
-                typeof state === "function" ? state(pagination) : state;
-            onPaginationChange(newState);
-        },
-        manualFiltering: true,
-        manualPagination: true,
-        rowCount,
-        state: {
-            columnFilters,
-            columnVisibility,
-            pagination
-        }
-    });
-
-    // Calculate display text for a filter based on selected values
-    const getFilterDisplayText = (filter: DataTableFilter): string => {
-        const selectedValues = activeFilters[filter.id] || [];
-
-        if (selectedValues.length === 0) {
-            return filter.label;
-        }
-
-        const selectedOptions = filter.options.filter((option) =>
-            selectedValues.includes(option.value)
-        );
-
-        if (selectedOptions.length === 0) {
-            return filter.label;
-        }
-
-        if (selectedOptions.length === 1) {
-            return selectedOptions[0].label;
-        }
-
-        // Multiple selections: always join with "and"
-        return selectedOptions.map((opt) => opt.label).join(" or ");
-    };
-
-    const handleFilterChange = (
-        filterId: string,
-        optionValue: string,
-        checked: boolean
-    ) => {
-        const currentValues = activeFilters[filterId] || [];
-        const filter = filters?.find((f) => f.id === filterId);
-
-        if (!filter) return;
-
-        let newValues: string[];
-
-        if (filter.multiSelect) {
-            // Multi-select: add or remove the value
-            if (checked) {
-                newValues = [...currentValues, optionValue];
-            } else {
-                newValues = currentValues.filter((v) => v !== optionValue);
-            }
-        } else {
-            // Single-select: replace the value
-            newValues = checked ? [optionValue] : [];
-        }
-
-        filter.onValueChange(newValues);
-    };
-
-    // Helper function to check if a column should be sticky
-    const isStickyColumn = (
-        columnId: string | undefined,
-        accessorKey: string | undefined,
-        position: "left" | "right"
-    ): boolean => {
-        if (position === "left" && stickyLeftColumn) {
-            return (
-                columnId === stickyLeftColumn ||
-                accessorKey === stickyLeftColumn
-            );
-        }
-        if (position === "right" && stickyRightColumn) {
-            return (
-                columnId === stickyRightColumn ||
-                accessorKey === stickyRightColumn
-            );
-        }
-        return false;
-    };
-
-    // Get sticky column classes
-    const getStickyClasses = (
-        columnId: string | undefined,
-        accessorKey: string | undefined
-    ): string => {
-        if (isStickyColumn(columnId, accessorKey, "left")) {
-            return "md:sticky md:left-0 z-10 bg-card [mask-image:linear-gradient(to_left,transparent_0%,black_20px)]";
-        }
-        if (isStickyColumn(columnId, accessorKey, "right")) {
-            return "sticky right-0 z-10 w-auto min-w-fit bg-card [mask-image:linear-gradient(to_right,transparent_0%,black_20px)]";
-        }
-        return "";
-    };
-
-    return (
-        <div className="container mx-auto max-w-12xl">
-            <Card>
-                <CardHeader className="flex flex-col space-y-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0 pb-4">
-                    <div className="flex flex-row space-y-3 w-full sm:mr-2 gap-2">
-                        {onSearch && (
-                            <div className="relative w-full sm:max-w-sm">
-                                <Input
-                                    placeholder={searchPlaceholder}
-                                    defaultValue={searchQuery}
-                                    onChange={(e) =>
-                                        onSearch(e.currentTarget.value)
-                                    }
-                                    className="w-full pl-8"
-                                />
-                                <Search className="h-4 w-4 absolute left-2 top-1/2 transform -translate-y-1/2 text-muted-foreground" />
-                            </div>
-                        )}
-
-                        {filters && filters.length > 0 && (
-                            <div className="flex gap-2">
-                                {filters.map((filter) => {
-                                    const selectedValues =
-                                        activeFilters[filter.id] || [];
-                                    const hasActiveFilters =
-                                        selectedValues.length > 0;
-                                    const displayMode =
-                                        filter.displayMode || filterDisplayMode;
-                                    const displayText =
-                                        displayMode === "calculated"
-                                            ? getFilterDisplayText(filter)
-                                            : filter.label;
-
-                                    return (
-                                        <DropdownMenu key={filter.id}>
-                                            <DropdownMenuTrigger asChild>
-                                                <Button
-                                                    variant={"outline"}
-                                                    size="sm"
-                                                    className="h-9"
-                                                >
-                                                    <Filter className="h-4 w-4 mr-2" />
-                                                    {displayText}
-                                                    {displayMode === "label" &&
-                                                        hasActiveFilters && (
-                                                            <span className="ml-2 bg-muted text-foreground rounded-full px-2 py-0.5 text-xs">
-                                                                {
-                                                                    selectedValues.length
-                                                                }
-                                                            </span>
-                                                        )}
-                                                </Button>
-                                            </DropdownMenuTrigger>
-                                            <DropdownMenuContent
-                                                align="start"
-                                                className="w-48"
-                                            >
-                                                <DropdownMenuLabel>
-                                                    {filter.label}
-                                                </DropdownMenuLabel>
-                                                <DropdownMenuSeparator />
-                                                {filter.options.map(
-                                                    (option) => {
-                                                        const isChecked =
-                                                            selectedValues.includes(
-                                                                option.value
-                                                            );
-                                                        return (
-                                                            <DropdownMenuCheckboxItem
-                                                                key={option.id}
-                                                                checked={
-                                                                    isChecked
-                                                                }
-                                                                onCheckedChange={(
-                                                                    checked
-                                                                ) => {
-                                                                    handleFilterChange(
-                                                                        filter.id,
-                                                                        option.value,
-                                                                        checked
-                                                                    );
-                                                                }}
-                                                                onSelect={(e) =>
-                                                                    e.preventDefault()
-                                                                }
-                                                            >
-                                                                {option.label}
-                                                            </DropdownMenuCheckboxItem>
-                                                        );
-                                                    }
-                                                )}
-                                            </DropdownMenuContent>
-                                        </DropdownMenu>
-                                    );
-                                })}
-                            </div>
-                        )}
-                    </div>
-                    <div className="flex items-center gap-2 sm:justify-end">
-                        {onRefresh && (
-                            <div>
-                                <Button
-                                    variant="outline"
-                                    onClick={onRefresh}
-                                    disabled={isRefreshing}
-                                >
-                                    <RefreshCw
-                                        className={`mr-0 sm:mr-2 h-4 w-4 ${isRefreshing ? "animate-spin" : ""}`}
-                                    />
-                                    <span className="hidden sm:inline">
-                                        {t("refresh")}
-                                    </span>
-                                </Button>
-                            </div>
-                        )}
-                        {onAdd && addButtonText && (
-                            <div>
-                                <Button
-                                    onClick={onAdd}
-                                    loading={isNavigatingToAddPage}
-                                >
-                                    <Plus className="mr-2 h-4 w-4" />
-                                    {addButtonText}
-                                </Button>
-                            </div>
-                        )}
-                    </div>
-                </CardHeader>
-                <CardContent>
-                    <div className="overflow-x-auto">
-                        <Table>
-                            <TableHeader>
-                                {table.getHeaderGroups().map((headerGroup) => (
-                                    <TableRow key={headerGroup.id}>
-                                        {headerGroup.headers.map((header) => {
-                                            const columnId = header.column.id;
-                                            const accessorKey = (
-                                                header.column.columnDef as any
-                                            ).accessorKey as string | undefined;
-                                            const stickyClasses =
-                                                getStickyClasses(
-                                                    columnId,
-                                                    accessorKey
-                                                );
-                                            const isRightSticky =
-                                                isStickyColumn(
-                                                    columnId,
-                                                    accessorKey,
-                                                    "right"
-                                                );
-                                            const hasHideableColumns =
-                                                enableColumnVisibility &&
-                                                table
-                                                    .getAllColumns()
-                                                    .some((col) =>
-                                                        col.getCanHide()
-                                                    );
-
-                                            return (
-                                                <TableHead
-                                                    key={header.id}
-                                                    className={`whitespace-nowrap ${stickyClasses}`}
-                                                >
-                                                    {header.isPlaceholder ? null : isRightSticky &&
-                                                      hasHideableColumns ? (
-                                                        <div className="flex flex-col items-end pr-3">
-                                                            <DropdownMenu>
-                                                                <DropdownMenuTrigger
-                                                                    asChild
-                                                                >
-                                                                    <Button
-                                                                        variant="ghost"
-                                                                        size="sm"
-                                                                        className="h-7 w-7 p-0 mb-1"
-                                                                    >
-                                                                        <Columns className="h-4 w-4" />
-                                                                        <span className="sr-only">
-                                                                            {t(
-                                                                                "columns"
-                                                                            ) ||
-                                                                                "Columns"}
-                                                                        </span>
-                                                                    </Button>
-                                                                </DropdownMenuTrigger>
-                                                                <DropdownMenuContent
-                                                                    align="end"
-                                                                    className="w-48"
-                                                                >
-                                                                    <DropdownMenuLabel>
-                                                                        {t(
-                                                                            "toggleColumns"
-                                                                        ) ||
-                                                                            "Toggle columns"}
-                                                                    </DropdownMenuLabel>
-                                                                    <DropdownMenuSeparator />
-                                                                    {table
-                                                                        .getAllColumns()
-                                                                        .filter(
-                                                                            (
-                                                                                column
-                                                                            ) =>
-                                                                                column.getCanHide()
-                                                                        )
-                                                                        .map(
-                                                                            (
-                                                                                column
-                                                                            ) => {
-                                                                                const columnDef =
-                                                                                    column.columnDef as any;
-                                                                                const friendlyName =
-                                                                                    columnDef.friendlyName;
-                                                                                const displayName =
-                                                                                    friendlyName ||
-                                                                                    (typeof columnDef.header ===
-                                                                                    "string"
-                                                                                        ? columnDef.header
-                                                                                        : column.id);
-                                                                                return (
-                                                                                    <DropdownMenuCheckboxItem
-                                                                                        key={
-                                                                                            column.id
-                                                                                        }
-                                                                                        className="capitalize"
-                                                                                        checked={column.getIsVisible()}
-                                                                                        onCheckedChange={(
-                                                                                            value
-                                                                                        ) =>
-                                                                                            column.toggleVisibility(
-                                                                                                !!value
-                                                                                            )
-                                                                                        }
-                                                                                        onSelect={(
-                                                                                            e
-                                                                                        ) =>
-                                                                                            e.preventDefault()
-                                                                                        }
-                                                                                    >
-                                                                                        {
-                                                                                            displayName
-                                                                                        }
-                                                                                    </DropdownMenuCheckboxItem>
-                                                                                );
-                                                                            }
-                                                                        )}
-                                                                </DropdownMenuContent>
-                                                            </DropdownMenu>
-                                                            <div className="h-0 opacity-0 pointer-events-none overflow-hidden">
-                                                                {flexRender(
-                                                                    header
-                                                                        .column
-                                                                        .columnDef
-                                                                        .header,
-                                                                    header.getContext()
-                                                                )}
-                                                            </div>
-                                                        </div>
-                                                    ) : (
-                                                        flexRender(
-                                                            header.column
-                                                                .columnDef
-                                                                .header,
-                                                            header.getContext()
-                                                        )
-                                                    )}
-                                                </TableHead>
-                                            );
-                                        })}
-                                    </TableRow>
-                                ))}
-                            </TableHeader>
-                            <TableBody>
-                                {table.getRowModel().rows?.length ? (
-                                    table.getRowModel().rows.map((row) => (
-                                        <TableRow
-                                            key={row.id}
-                                            data-state={
-                                                row.getIsSelected() &&
-                                                "selected"
-                                            }
-                                        >
-                                            {row
-                                                .getVisibleCells()
-                                                .map((cell) => {
-                                                    const columnId =
-                                                        cell.column.id;
-                                                    const accessorKey = (
-                                                        cell.column
-                                                            .columnDef as any
-                                                    ).accessorKey as
-                                                        | string
-                                                        | undefined;
-                                                    const stickyClasses =
-                                                        getStickyClasses(
-                                                            columnId,
-                                                            accessorKey
-                                                        );
-                                                    const isRightSticky =
-                                                        isStickyColumn(
-                                                            columnId,
-                                                            accessorKey,
-                                                            "right"
-                                                        );
-                                                    return (
-                                                        <TableCell
-                                                            key={cell.id}
-                                                            className={`whitespace-nowrap ${stickyClasses} ${isRightSticky ? "text-right" : ""}`}
-                                                        >
-                                                            {flexRender(
-                                                                cell.column
-                                                                    .columnDef
-                                                                    .cell,
-                                                                cell.getContext()
-                                                            )}
-                                                        </TableCell>
-                                                    );
-                                                })}
-                                        </TableRow>
-                                    ))
-                                ) : (
-                                    <TableRow>
-                                        <TableCell
-                                            colSpan={columns.length}
-                                            className="h-24 text-center"
-                                        >
-                                            No results found.
-                                        </TableCell>
-                                    </TableRow>
-                                )}
-                            </TableBody>
-                        </Table>
-                    </div>
-                    <div className="mt-4">
-                        {rowCount > 0 && (
-                            <DataTablePagination
-                                table={table}
-                                totalCount={rowCount}
-                                onPageSizeChange={(pageSize) =>
-                                    onPaginationChange({
-                                        ...pagination,
-                                        pageSize
-                                    })
-                                }
-                                onPageChange={(pageIndex) => {
-                                    onPaginationChange({
-                                        ...pagination,
-                                        pageIndex
-                                    });
-                                }}
-                                isServerPagination
-                                pageSize={pagination.pageSize}
-                                pageIndex={pagination.pageIndex}
-                            />
-                        )}
-                    </div>
-                </CardContent>
-            </Card>
-        </div>
-    );
-}

src/components/ui/data-table.tsx

@@ -151,20 +151,11 @@ type DataTableFilter = {
     label: string;
     options: FilterOption[];
     multiSelect?: boolean;
-    filterFn: (
-        row: any,
-        selectedValues: (string | number | boolean)[]
-    ) => boolean;
+    filterFn: (row: any, selectedValues: (string | number | boolean)[]) => boolean;
     defaultValues?: (string | number | boolean)[];
     displayMode?: "label" | "calculated"; // How to display the filter button text
 };
 
-export type DataTablePaginationState = PaginationState & {
-    pageCount: number;
-};
-
-export type DataTablePaginationUpdateFn = (newPage: PaginationState) => void;
-
 type DataTableProps<TData, TValue> = {
     columns: ExtendedColumnDef<TData, TValue>[];
     data: TData[];
@@ -187,11 +178,6 @@ type DataTableProps<TData, TValue> = {
     defaultPageSize?: number;
     columnVisibility?: Record<string, boolean>;
     enableColumnVisibility?: boolean;
-    manualFiltering?: boolean;
-    onSearch?: (input: string) => void;
-    searchQuery?: string;
-    pagination?: DataTablePaginationState;
-    onPaginationChange?: DataTablePaginationUpdateFn;
     persistColumnVisibility?: boolean | string;
     stickyLeftColumn?: string; // Column ID or accessorKey for left sticky column
     stickyRightColumn?: string; // Column ID or accessorKey for right sticky column (typically "actions")
@@ -217,12 +203,7 @@ export function DataTable<TData, TValue>({
     columnVisibility: defaultColumnVisibility,
     enableColumnVisibility = false,
     persistColumnVisibility = false,
-    manualFiltering = false,
-    pagination: paginationState,
     stickyLeftColumn,
-    onSearch,
-    searchQuery,
-    onPaginationChange,
     stickyRightColumn
 }: DataTableProps<TData, TValue>) {
     const t = useTranslations();
@@ -267,25 +248,22 @@ export function DataTable<TData, TValue>({
     const [columnVisibility, setColumnVisibility] = useState<VisibilityState>(
         initialColumnVisibility
     );
-    const [_pagination, setPagination] = useState<PaginationState>({
+    const [pagination, setPagination] = useState<PaginationState>({
         pageIndex: 0,
         pageSize: pageSize
     });
-
-    const pagination = paginationState ?? _pagination;
-
     const [activeTab, setActiveTab] = useState<string>(
         defaultTab || tabs?.[0]?.id || ""
     );
-    const [activeFilters, setActiveFilters] = useState<
-        Record<string, (string | number | boolean)[]>
-    >(() => {
-        const initial: Record<string, (string | number | boolean)[]> = {};
-        filters?.forEach((filter) => {
-            initial[filter.id] = filter.defaultValues || [];
-        });
-        return initial;
-    });
+    const [activeFilters, setActiveFilters] = useState<Record<string, (string | number | boolean)[]>>(
+        () => {
+            const initial: Record<string, (string | number | boolean)[]> = {};
+            filters?.forEach((filter) => {
+                initial[filter.id] = filter.defaultValues || [];
+            });
+            return initial;
+        }
+    );
 
     // Track initial values to avoid storing defaults on first render
     const initialPageSize = useRef(pageSize);
@@ -331,18 +309,12 @@ export function DataTable<TData, TValue>({
         getFilteredRowModel: getFilteredRowModel(),
         onGlobalFilterChange: setGlobalFilter,
         onColumnVisibilityChange: setColumnVisibility,
-        onPaginationChange: onPaginationChange
-            ? (state) => {
-                  const newState =
-                      typeof state === "function" ? state(pagination) : state;
-                  onPaginationChange(newState);
-              }
-            : setPagination,
-        manualFiltering,
-        manualPagination: Boolean(paginationState),
-        pageCount: paginationState?.pageCount,
+        onPaginationChange: setPagination,
         initialState: {
-            pagination,
+            pagination: {
+                pageSize: pageSize,
+                pageIndex: 0
+            },
             columnVisibility: initialColumnVisibility
         },
         state: {
@@ -396,11 +368,11 @@ export function DataTable<TData, TValue>({
         setActiveFilters((prev) => {
             const currentValues = prev[filterId] || [];
             const filter = filters?.find((f) => f.id === filterId);
-
+            
             if (!filter) return prev;
 
             let newValues: (string | number | boolean)[];
-
+            
             if (filter.multiSelect) {
                 // Multi-select: add or remove the value
                 if (checked) {
@@ -425,7 +397,7 @@ export function DataTable<TData, TValue>({
     // Calculate display text for a filter based on selected values
     const getFilterDisplayText = (filter: DataTableFilter): string => {
         const selectedValues = activeFilters[filter.id] || [];
-
+        
         if (selectedValues.length === 0) {
             return filter.label;
         }
@@ -505,15 +477,12 @@ export function DataTable<TData, TValue>({
                         <div className="relative w-full sm:max-w-sm">
                             <Input
                                 placeholder={searchPlaceholder}
-                                defaultValue={searchQuery}
-                                value={onSearch ? undefined : globalFilter}
-                                onChange={(e) => {
-                                    onSearch
-                                        ? onSearch(e.currentTarget.value)
-                                        : table.setGlobalFilter(
-                                              String(e.target.value)
-                                          );
-                                }}
+                                value={globalFilter ?? ""}
+                                onChange={(e) =>
+                                    table.setGlobalFilter(
+                                        String(e.target.value)
+                                    )
+                                }
                                 className="w-full pl-8"
                             />
                             <Search className="h-4 w-4 absolute left-2 top-1/2 transform -translate-y-1/2 text-muted-foreground" />
@@ -521,17 +490,13 @@ export function DataTable<TData, TValue>({
                         {filters && filters.length > 0 && (
                             <div className="flex gap-2">
                                 {filters.map((filter) => {
-                                    const selectedValues =
-                                        activeFilters[filter.id] || [];
-                                    const hasActiveFilters =
-                                        selectedValues.length > 0;
-                                    const displayMode =
-                                        filter.displayMode || filterDisplayMode;
-                                    const displayText =
-                                        displayMode === "calculated"
-                                            ? getFilterDisplayText(filter)
-                                            : filter.label;
-
+                                    const selectedValues = activeFilters[filter.id] || [];
+                                    const hasActiveFilters = selectedValues.length > 0;
+                                    const displayMode = filter.displayMode || filterDisplayMode;
+                                    const displayText = displayMode === "calculated" 
+                                        ? getFilterDisplayText(filter)
+                                        : filter.label;
+                                    
                                     return (
                                         <DropdownMenu key={filter.id}>
                                             <DropdownMenuTrigger asChild>
@@ -542,54 +507,37 @@ export function DataTable<TData, TValue>({
                                                 >
                                                     <Filter className="h-4 w-4 mr-2" />
                                                     {displayText}
-                                                    {displayMode === "label" &&
-                                                        hasActiveFilters && (
-                                                            <span className="ml-2 bg-muted text-foreground rounded-full px-2 py-0.5 text-xs">
-                                                                {
-                                                                    selectedValues.length
-                                                                }
-                                                            </span>
-                                                        )}
+                                                    {displayMode === "label" && hasActiveFilters && (
+                                                        <span className="ml-2 bg-muted text-foreground rounded-full px-2 py-0.5 text-xs">
+                                                            {selectedValues.length}
+                                                        </span>
+                                                    )}
                                                 </Button>
                                             </DropdownMenuTrigger>
-                                            <DropdownMenuContent
-                                                align="start"
-                                                className="w-48"
-                                            >
+                                            <DropdownMenuContent align="start" className="w-48">
                                                 <DropdownMenuLabel>
                                                     {filter.label}
                                                 </DropdownMenuLabel>
                                                 <DropdownMenuSeparator />
-                                                {filter.options.map(
-                                                    (option) => {
-                                                        const isChecked =
-                                                            selectedValues.includes(
-                                                                option.value
-                                                            );
-                                                        return (
-                                                            <DropdownMenuCheckboxItem
-                                                                key={option.id}
-                                                                checked={
-                                                                    isChecked
-                                                                }
-                                                                onCheckedChange={(
+                                                {filter.options.map((option) => {
+                                                    const isChecked = selectedValues.includes(option.value);
+                                                    return (
+                                                        <DropdownMenuCheckboxItem
+                                                            key={option.id}
+                                                            checked={isChecked}
+                                                            onCheckedChange={(checked) =>
+                                                                handleFilterChange(
+                                                                    filter.id,
+                                                                    option.value,
                                                                     checked
-                                                                ) =>
-                                                                    handleFilterChange(
-                                                                        filter.id,
-                                                                        option.value,
-                                                                        checked
-                                                                    )
-                                                                }
-                                                                onSelect={(e) =>
-                                                                    e.preventDefault()
-                                                                }
-                                                            >
-                                                                {option.label}
-                                                            </DropdownMenuCheckboxItem>
-                                                        );
-                                                    }
-                                                )}
+                                                                )
+                                                            }
+                                                            onSelect={(e) => e.preventDefault()}
+                                                        >
+                                                            {option.label}
+                                                        </DropdownMenuCheckboxItem>
+                                                    );
+                                                })}
                                             </DropdownMenuContent>
                                         </DropdownMenu>
                                     );
@@ -847,14 +795,12 @@ export function DataTable<TData, TValue>({
                         </Table>
                     </div>
                     <div className="mt-4">
-                        {table.getRowModel().rows?.length > 0 && (
-                            <DataTablePagination
-                                table={table}
-                                onPageSizeChange={handlePageSizeChange}
-                                pageSize={pagination.pageSize}
-                                pageIndex={pagination.pageIndex}
-                            />
-                        )}
+                        <DataTablePagination
+                            table={table}
+                            onPageSizeChange={handlePageSizeChange}
+                            pageSize={pagination.pageSize}
+                            pageIndex={pagination.pageIndex}
+                        />
                     </div>
                 </CardContent>
             </Card>

src/hooks/useNavigationContext.ts

@@ -1,36 +0,0 @@
-import { useSearchParams, usePathname, useRouter } from "next/navigation";
-import { useTransition } from "react";
-
-export function useNavigationContext() {
-    const router = useRouter();
-    const searchParams = useSearchParams();
-    const path = usePathname();
-    const [isNavigating, startTransition] = useTransition();
-
-    function navigate({
-        searchParams: params,
-        pathname = path,
-        replace = false
-    }: {
-        pathname?: string;
-        searchParams?: URLSearchParams;
-        replace?: boolean;
-    }) {
-        startTransition(() => {
-            const fullPath = pathname + (params ? `?${params.toString()}` : "");
-
-            if (replace) {
-                router.replace(fullPath);
-            } else {
-                router.push(fullPath);
-            }
-        });
-    }
-
-    return {
-        pathname: path,
-        searchParams: new URLSearchParams(searchParams), // we want the search params to be writeable
-        navigate,
-        isNavigating
-    };
-}

src/lib/queries.ts

@@ -16,16 +16,11 @@ import type {
 import type { ListTargetsResponse } from "@server/routers/target";
 import type { ListUsersResponse } from "@server/routers/user";
 import type ResponseT from "@server/types/Response";
-import {
-    infiniteQueryOptions,
-    keepPreviousData,
-    queryOptions
-} from "@tanstack/react-query";
+import { keepPreviousData, queryOptions } from "@tanstack/react-query";
 import type { AxiosResponse } from "axios";
 import z from "zod";
 import { remote } from "./api";
 import { durationToMs } from "./durationToMs";
-import { wait } from "./wait";
 
 export type ProductUpdate = {
     link: string | null;
@@ -91,7 +86,8 @@ export const productUpdatesQueries = {
 };
 
 export const clientFilterSchema = z.object({
-    pageSize: z.int().prefault(1000).optional()
+    filter: z.enum(["machine", "user"]),
+    limit: z.int().prefault(1000).optional()
 });
 
 export const orgQueries = {
@@ -100,13 +96,14 @@ export const orgQueries = {
         filters
     }: {
         orgId: string;
-        filters?: z.infer<typeof clientFilterSchema>;
+        filters: z.infer<typeof clientFilterSchema>;
     }) =>
         queryOptions({
             queryKey: ["ORG", orgId, "CLIENTS", filters] as const,
             queryFn: async ({ signal, meta }) => {
                 const sp = new URLSearchParams({
-                    pageSize: (filters?.pageSize ?? 1000).toString()
+                    ...filters,
+                    limit: (filters.limit ?? 1000).toString()
                 });
 
                 const res = await meta!.api.get<
@@ -191,16 +188,19 @@ export const logAnalyticsFiltersSchema = z.object({
         .refine((val) => !isNaN(Date.parse(val)), {
             error: "timeStart must be a valid ISO date string"
         })
-        .optional()
-        .catch(undefined),
+        .optional(),
     timeEnd: z
         .string()
         .refine((val) => !isNaN(Date.parse(val)), {
             error: "timeEnd must be a valid ISO date string"
         })
+        .optional(),
+    resourceId: z
+        .string()
+        .optional()
+        .transform(Number)
+        .pipe(z.int().positive())
         .optional()
-        .catch(undefined),
-    resourceId: z.coerce.number().optional().catch(undefined)
 });
 
 export type LogAnalyticsFilters = z.TypeOf<typeof logAnalyticsFiltersSchema>;
@@ -361,50 +361,22 @@ export const approvalQueries = {
         orgId: string,
         filters: z.infer<typeof approvalFiltersSchema>
     ) =>
-        infiniteQueryOptions({
+        queryOptions({
             queryKey: ["APPROVALS", orgId, filters] as const,
-            queryFn: async ({ signal, pageParam, meta }) => {
+            queryFn: async ({ signal, meta }) => {
                 const sp = new URLSearchParams();
 
                 if (filters.approvalState) {
                     sp.set("approvalState", filters.approvalState);
                 }
-                if (pageParam) {
-                    sp.set("cursorPending", pageParam.cursorPending.toString());
-                    sp.set(
-                        "cursorTimestamp",
-                        pageParam.cursorTimestamp.toString()
-                    );
-                }
 
                 const res = await meta!.api.get<
-                    AxiosResponse<{
-                        approvals: ApprovalItem[];
-                        pagination: {
-                            total: number;
-                            limit: number;
-                            cursorPending: number | null;
-                            cursorTimestamp: number | null;
-                        };
-                    }>
+                    AxiosResponse<{ approvals: ApprovalItem[] }>
                 >(`/org/${orgId}/approvals?${sp.toString()}`, {
                     signal
                 });
                 return res.data.data;
-            },
-            initialPageParam: null as {
-                cursorPending: number;
-                cursorTimestamp: number;
-            } | null,
-            placeholderData: keepPreviousData,
-            getNextPageParam: ({ pagination }) =>
-                pagination.cursorPending != null &&
-                pagination.cursorTimestamp != null
-                    ? {
-                          cursorPending: pagination.cursorPending,
-                          cursorTimestamp: pagination.cursorTimestamp
-                      }
-                    : null
+            }
         }),
     pendingCount: (orgId: string) =>
         queryOptions({
@@ -416,12 +388,6 @@ export const approvalQueries = {
                     signal
                 });
                 return res.data.data.count;
-            },
-            refetchInterval: (query) => {
-                if (query.state.data) {
-                    return durationToMs(30, "seconds");
-                }
-                return false;
             }
         })
 };

src/lib/sortColumn.ts

@@ -1,52 +0,0 @@
-import type { SortOrder } from "@app/lib/types/sort";
-
-export function getNextSortOrder(
-    column: string,
-    searchParams: URLSearchParams
-) {
-    const sp = new URLSearchParams(searchParams);
-
-    let nextDirection: SortOrder = "indeterminate";
-
-    if (sp.get("sort_by") === column) {
-        nextDirection = (sp.get("order") as SortOrder) ?? "indeterminate";
-    }
-
-    switch (nextDirection) {
-        case "indeterminate": {
-            nextDirection = "asc";
-            break;
-        }
-        case "asc": {
-            nextDirection = "desc";
-            break;
-        }
-        default: {
-            nextDirection = "indeterminate";
-            break;
-        }
-    }
-
-    sp.delete("sort_by");
-    sp.delete("order");
-
-    if (nextDirection !== "indeterminate") {
-        sp.set("sort_by", column);
-        sp.set("order", nextDirection);
-    }
-
-    return sp;
-}
-
-export function getSortDirection(
-    column: string,
-    searchParams: URLSearchParams
-) {
-    let currentDirection: SortOrder = "indeterminate";
-
-    if (searchParams.get("sort_by") === column) {
-        currentDirection =
-            (searchParams.get("order") as SortOrder) ?? "indeterminate";
-    }
-    return currentDirection;
-}

src/lib/types/sort.ts

@@ -1 +0,0 @@
-export type SortOrder = "asc" | "desc" | "indeterminate";

src/lib/validateLocalPath.ts

@@ -1,16 +0,0 @@
-export function validateLocalPath(value: string) {
-    try {
-        const url = new URL("https://pangoling.net" + value);
-        if (
-            url.pathname !== value ||
-            value.includes("..") ||
-            value.includes("*")
-        ) {
-            throw new Error("Invalid Path");
-        }
-    } catch {
-        throw new Error(
-            "should be a valid pathname starting with `/` and not containing query parameters, `..` or `*`"
-        );
-    }
-}

tsconfig.enterprise.json

@@ -29,7 +29,7 @@
                 "name": "next"
             }
         ],
-        "target": "ES2024"
+        "target": "ES2022"
     },
     "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
     "exclude": ["node_modules"]

tsconfig.oss.json

@@ -29,7 +29,7 @@
                 "name": "next"
             }
         ],
-        "target": "ES2024"
+        "target": "ES2022"
     },
     "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
     "exclude": ["node_modules"]

tsconfig.saas.json

@@ -29,7 +29,7 @@
                 "name": "next"
             }
         ],
-        "target": "ES2024"
+        "target": "ES2022"
     },
     "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
     "exclude": ["node_modules"]