diff --git a/server/routers/auditLogs/queryRequstAuditLog.ts b/server/routers/auditLogs/queryRequstAuditLog.ts index 8c9aa902..606f1ae8 100644 --- a/server/routers/auditLogs/queryRequstAuditLog.ts +++ b/server/routers/auditLogs/queryRequstAuditLog.ts @@ -129,7 +129,7 @@ export function queryRequest(data: Q) { eq(requestAuditLog.resourceId, resources.resourceId) ) // TODO: Is this efficient? .where(getWhere(data)) - .orderBy(desc(requestAuditLog.timestamp), desc(requestAuditLog.id)); + .orderBy(desc(requestAuditLog.timestamp)); } export function countRequestQuery(data: Q) { diff --git a/src/app/[orgId]/settings/logs/access/page.tsx b/src/app/[orgId]/settings/logs/access/page.tsx index 56071976..408b047e 100644 --- a/src/app/[orgId]/settings/logs/access/page.tsx +++ b/src/app/[orgId]/settings/logs/access/page.tsx @@ -640,7 +640,7 @@ export default function GeneralPage() { }} defaultSort={{ id: "timestamp", - desc: false + desc: true }} // Server-side pagination props totalCount={totalCount} diff --git a/src/app/[orgId]/settings/logs/action/page.tsx b/src/app/[orgId]/settings/logs/action/page.tsx index b9845afa..68f67b07 100644 --- a/src/app/[orgId]/settings/logs/action/page.tsx +++ b/src/app/[orgId]/settings/logs/action/page.tsx @@ -493,7 +493,7 @@ export default function GeneralPage() { }} defaultSort={{ id: "timestamp", - desc: false + desc: true }} // Server-side pagination props totalCount={totalCount} diff --git a/src/app/[orgId]/settings/logs/request/page.tsx b/src/app/[orgId]/settings/logs/request/page.tsx index 6060be9e..4a53e05f 100644 --- a/src/app/[orgId]/settings/logs/request/page.tsx +++ b/src/app/[orgId]/settings/logs/request/page.tsx @@ -778,7 +778,7 @@ export default function GeneralPage() { }} defaultSort={{ id: "timestamp", - desc: false + desc: true }} // Server-side pagination props totalCount={totalCount} diff --git a/src/components/LogDataTable.tsx b/src/components/LogDataTable.tsx index 58f7623e..465d4231 100644 --- a/src/components/LogDataTable.tsx +++ b/src/components/LogDataTable.tsx @@ -257,7 +257,10 @@ export function LogDataTable({ ? {} : { getPaginationRowModel: getPaginationRowModel() }), onSortingChange: setSorting, - getSortedRowModel: getSortedRowModel(), + // Disable client-side sorting for server-side pagination since data is already sorted on server + ...(isServerPagination + ? {} + : { getSortedRowModel: getSortedRowModel() }), onColumnFiltersChange: setColumnFilters, getFilteredRowModel: getFilteredRowModel(), onGlobalFilterChange: setGlobalFilter, @@ -269,6 +272,7 @@ export function LogDataTable({ } : {}), initialState: { + sorting: defaultSort ? [defaultSort] : [], pagination: { pageSize: pageSize, pageIndex: currentPage