Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/pages/audit-report/components/View/View.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,24 @@ const View: React.FC<ViewProps> = ({
false
);

// Apply display defaults synchronously so the first query uses them,
// avoiding a race where useEffect sets them after the initial fetch.
const effectiveTableSearchParams = useMemo(() => {
const params = new URLSearchParams(tableSearchParams);
if (defaultPageSize && defaultPageSize > 0 && !params.get("pageSize")) {
params.set("pageSize", defaultPageSize.toString());
}
if (!params.get("pageIndex")) {
params.set("pageIndex", "0");
}
if (defaultSorting && defaultSorting.length > 0 && !params.get("sortBy")) {
const sort = defaultSorting[0];
params.set("sortBy", sort.id);
params.set("sortOrder", sort.desc ? "desc" : "asc");
}
return params;
}, [tableSearchParams, defaultPageSize, defaultSorting]);

// Separate display mode state (frontend only, not sent to backend)
const [searchParams, setSearchParams] = useSearchParams();

Expand Down Expand Up @@ -193,15 +211,15 @@ const View: React.FC<ViewProps> = ({
"view-table",
namespace,
name,
tableSearchParams.toString(),
effectiveTableSearchParams.toString(),
requestFingerprint
],
queryFn: () =>
queryViewTable(
namespace ?? "",
name ?? "",
columns ?? [],
tableSearchParams,
effectiveTableSearchParams,
requestFingerprint
),
enabled: !!namespace && !!name && !!columns && columns.length > 0,
Expand Down
Loading