diff --git a/ui/app/(prowler)/findings/page.tsx b/ui/app/(prowler)/findings/page.tsx index 0d35cac8c4..f619bccde9 100644 --- a/ui/app/(prowler)/findings/page.tsx +++ b/ui/app/(prowler)/findings/page.tsx @@ -26,11 +26,10 @@ export default async function Findings({ searchParams: SearchParamsProps; }) { const searchParamsKey = JSON.stringify(searchParams || {}); - const defaultSort = "severity,status"; - const sort = searchParams.sort?.toString() || defaultSort; + const sort = searchParams.sort?.toString(); // Make sure the sort is correctly encoded - const encodedSort = sort.replace(/^\+/, ""); + const encodedSort = sort?.replace(/^\+/, ""); // Extract all filter parameters and combine with default filters const defaultFilters = { @@ -137,7 +136,7 @@ const SSRDataTable = async ({ searchParams: SearchParamsProps; }) => { const page = parseInt(searchParams.page?.toString() || "1", 10); - const defaultSort = "severity,status"; + const defaultSort = "severity,status,-inserted_at"; const sort = searchParams.sort?.toString() || defaultSort; // Make sure the sort is correctly encoded diff --git a/ui/app/(prowler)/page.tsx b/ui/app/(prowler)/page.tsx index ff2ab3d28c..c6e0748362 100644 --- a/ui/app/(prowler)/page.tsx +++ b/ui/app/(prowler)/page.tsx @@ -129,7 +129,7 @@ const SSRFindingsBySeverity = async ({ const SSRDataNewFindingsTable = async () => { const page = 1; - const sort = "severity,updated_at"; + const sort = "severity,-inserted_at"; const defaultFilters = { "filter[status__in]": "FAIL",