Filtering on all tables

server/private/routers/auditLogs/queryAccessAuditLog.ts

@@ -55,6 +55,7 @@ export const queryAccessAuditLogsQuery = z.object({
         .optional(),
     actor: z.string().optional(),
     type: z.string().optional(),
+    location: z.string().optional(),
     limit: z
         .string()
         .optional()
@@ -91,6 +92,7 @@ function getWhere(data: Q) {
             ? eq(accessAuditLog.actorType, data.actorType)
             : undefined,
         data.actorId ? eq(accessAuditLog.actorId, data.actorId) : undefined,
+        data.location ? eq(accessAuditLog.location, data.location) : undefined,
         data.type ? eq(accessAuditLog.type, data.type) : undefined,
         data.action !== undefined
             ? eq(accessAuditLog.action, data.action)

server/private/routers/auditLogs/queryActionAuditLog.ts

@@ -103,6 +103,38 @@ export function countActionQuery(data: Q) {
     return countQuery;
 }
 
+async function queryUniqueFilterAttributes(
+    timeStart: number,
+    timeEnd: number,
+    orgId: string
+) {
+    const baseConditions = and(
+        gt(actionAuditLog.timestamp, timeStart),
+        lt(actionAuditLog.timestamp, timeEnd),
+        eq(actionAuditLog.orgId, orgId)
+    );
+
+    // Get unique actors
+    const uniqueActors = await db
+        .selectDistinct({
+            actor: actionAuditLog.actor
+        })
+        .from(actionAuditLog)
+        .where(baseConditions);
+
+    const uniqueActions = await db
+        .selectDistinct({
+            action: actionAuditLog.action
+        })
+        .from(actionAuditLog)
+        .where(baseConditions);
+
+    return {
+        actors: uniqueActors.map(row => row.actor).filter((actor): actor is string => actor !== null),
+        actions: uniqueActions.map(row => row.action).filter((action): action is string => action !== null),
+    };
+}
+
 registry.registerPath({
     method: "get",
     path: "/org/{orgId}/logs/action",
@@ -149,6 +181,12 @@ export async function queryActionAuditLogs(
         const totalCountResult = await countActionQuery(data);
         const totalCount = totalCountResult[0].count;
 
+        const filterAttributes = await queryUniqueFilterAttributes(
+            data.timeStart,
+            data.timeEnd,
+            data.orgId
+        );
+
         return response<QueryActionAuditLogResponse>(res, {
             data: {
                 log: log,
@@ -156,7 +194,8 @@ export async function queryActionAuditLogs(
                     total: totalCount,
                     limit: data.limit,
                     offset: data.offset
-                }
+                },
+                filterAttributes
             },
             success: true,
             error: false,

server/routers/auditLogs/queryRequstAuditLog.ts

@@ -46,6 +46,7 @@ export const queryAccessAuditLogsQuery = z.object({
         .pipe(z.number().int().positive())
         .optional(),
     actor: z.string().optional(),
+    location: z.string().optional(),
     host: z.string().optional(),
     path: z.string().optional(),
     limit: z
@@ -82,6 +83,7 @@ function getWhere(data: Q) {
         data.method ? eq(requestAuditLog.method, data.method) : undefined,
         data.reason ? eq(requestAuditLog.reason, data.reason) : undefined,
         data.host ? eq(requestAuditLog.host, data.host) : undefined,
+        data.location ? eq(requestAuditLog.location, data.location) : undefined,
         data.path ? eq(requestAuditLog.path, data.path) : undefined,
         data.action !== undefined
             ? eq(requestAuditLog.action, data.action)

server/routers/auditLogs/types.ts

@@ -13,6 +13,9 @@ export type QueryActionAuditLogResponse = {
         limit: number;
         offset: number;
     };
+    filterAttributes: {
+        actors: string[];
+    };
 };
 
 export type QueryRequestAuditLogResponse = {