chore: fix comment typo

backend/src/db/migrations/20250306134330_additional-audit-log-indexes.ts

@@ -0,0 +1,34 @@
+import { Knex } from "knex";
+
+import { TableName } from "../schemas";
+
+export async function up(knex: Knex): Promise<void> {
+  const hasEventTypeCol = await knex.schema.hasColumn(TableName.AuditLog, "eventType");
+  const hasEventMetadataCol = await knex.schema.hasColumn(TableName.AuditLog, "eventMetadata");
+  const hasUserAgentTypeCol = await knex.schema.hasColumn(TableName.AuditLog, "userAgentType");
+
+  await knex.schema.alterTable(TableName.AuditLog, (t) => {
+    if (hasEventTypeCol) t.index("eventType");
+    if (hasUserAgentTypeCol) t.index("userAgentType");
+  });
+
+  if (hasEventMetadataCol) {
+    await knex.raw(`CREATE INDEX IF NOT EXISTS idx_audit_logs_secret_path
+      ON audit_logs ("projectId", ("eventMetadata"->>'secretPath'), "createdAt" DESC);`);
+  }
+}
+
+export async function down(knex: Knex): Promise<void> {
+  const hasEventTypeCol = await knex.schema.hasColumn(TableName.AuditLog, "eventType");
+  const hasEventMetadataCol = await knex.schema.hasColumn(TableName.AuditLog, "eventMetadata");
+  const hasUserAgentTypeCol = await knex.schema.hasColumn(TableName.AuditLog, "userAgentType");
+
+  await knex.schema.alterTable(TableName.AuditLog, (t) => {
+    if (hasEventTypeCol) t.dropIndex("eventType");
+    if (hasUserAgentTypeCol) t.dropIndex("userAgentType");
+  });
+
+  if (hasEventMetadataCol) {
+    await knex.raw(`DROP INDEX IF EXISTS idx_audit_logs_secret_path`);
+  }
+}

backend/src/ee/services/audit-log/audit-log-dal.ts

@@ -91,7 +91,7 @@ export const auditLogDALFactory = (db: TDbClient) => {
       }
 
       if (projectId && secretPath) {
-        void sqlQuery.whereRaw(`"eventMetadata" @> jsonb_build_object('secretPath', ?::text)`, [secretPath]);
+        void sqlQuery.whereRaw(`"eventMetadata" ->> 'secretPath' = ?::text`, [secretPath]);
       }
 
       // Filter by actor type
@@ -112,8 +112,8 @@ export const auditLogDALFactory = (db: TDbClient) => {
         void sqlQuery.whereRaw(`"${TableName.AuditLog}"."createdAt" <= ?::timestamptz`, [endDate]);
       }
 
-      // we timeout long running queries to prevent DB resource issues (2 minutes)
-      const docs = await sqlQuery.timeout(1000 * 120);
+      // we time out long-running queries to prevent DB resource issues (a little less than 30 seconds [server timeout])
+      const docs = await sqlQuery.timeout(1000 * 29.5);
 
       return docs;
     } catch (error) {

frontend/src/pages/organization/AuditLogsPage/components/LogsTable.tsx

@@ -106,7 +106,7 @@ export const LogsTable = ({
           className="mb-20 mt-4 px-4 py-3 text-sm"
           isFullWidth
           variant="star"
-          isLoading={isFetchingNextPage}
+          isLoading={isFetchingNextPage || isPending}
           isDisabled={isFetchingNextPage || !hasNextPage}
           onClick={() => fetchNextPage()}
         >