Skip to content

Commit 6c63789

Browse files
remove pagination from stats
1 parent c5a8b42 commit 6c63789

File tree

1 file changed

+40
-14
lines changed

1 file changed

+40
-14
lines changed

client/packages/lowcoder/src/pages/setting/audit/dashboard.tsx

+40-14
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,34 @@ export function AuditLogDashboard() {
9494
form.setFieldsValue(getQueryParams());
9595
}, []);
9696

97+
const getAuditLogStatsMap = (stats: AuditLogStat[]) => {
98+
const statsMap = {};
99+
stats.forEach(stat => {
100+
// statsMap.push({})
101+
})
102+
};
103+
104+
const getCleanedParams = (newPage?: number) => {
105+
const formValues = form.getFieldsValue();
106+
107+
let cleanedParams = Object.fromEntries(
108+
Object.entries({
109+
...formValues,
110+
fromTimestamp: formValues.dateRange?.[0] ? formValues.dateRange[0].toISOString() : undefined,
111+
toTimestamp: formValues.dateRange?.[1] ? formValues.dateRange[1].toISOString() : undefined,
112+
}).filter(([key, value]) => value !== undefined && value !== null && value !== "" && key !== 'dateRange')
113+
);
114+
if (newPage) {
115+
cleanedParams = {
116+
...cleanedParams,
117+
pageSize: 100, // Always fetch 500 from API
118+
pageNum: newPage, // API page number
119+
}
120+
}
121+
122+
return cleanedParams;
123+
}
124+
97125
const handleQueryParams = (queryParams: Record<string, string>) => {
98126
const params = new URLSearchParams();
99127
Object.keys(queryParams).map((key) => {
@@ -106,30 +134,28 @@ export function AuditLogDashboard() {
106134
})
107135
history.push({ search: params.toString() })
108136
}
137+
138+
const fetchStatistics = async () => {
139+
const cleanedParams = getCleanedParams();
140+
141+
const stats = await getAuditLogStatistics(cleanedParams);
142+
setStatistics(stats?.data || []);
143+
}
109144

110145
// Fetch Logs with all form values if set
111146
const fetchLogs = async (newPage: number, resetData: boolean = false) => {
112-
const formValues = form.getFieldsValue();
113-
114-
const cleanedParams = Object.fromEntries(
115-
Object.entries({
116-
...formValues,
117-
pageSize: 100, // Always fetch 500 from API
118-
pageNum: newPage, // API page number
119-
fromTimestamp: formValues.dateRange?.[0] ? formValues.dateRange[0].toISOString() : undefined,
120-
toTimestamp: formValues.dateRange?.[1] ? formValues.dateRange[1].toISOString() : undefined,
121-
}).filter(([key, value]) => value !== undefined && value !== null && value !== "" && key !== 'dateRange')
122-
);
147+
const cleanedParams = getCleanedParams(newPage);
123148

124149
handleQueryParams(cleanedParams as any);
125150

126151
setLoading(true);
127152
try {
128153
const data = await getAuditLogs(cleanedParams);
129-
const stats = await getAuditLogStatistics(cleanedParams);
154+
// fetch statistics only when page is 1
155+
if (newPage === 1) {
156+
fetchStatistics();
157+
}
130158

131-
setStatistics(stats?.data || []);
132-
133159
if (resetData) {
134160
setAllLogs(data.data || []);
135161
setPagination({ pageSize: 25, current: 1 }); // Reset pagination

0 commit comments

Comments
 (0)