From 19e1cc2fbd211f39cee05d4e7cc7ed4b7a040e00 Mon Sep 17 00:00:00 2001
From: Oscar Zhou <100548325+oscarzhou-portainer@users.noreply.github.com>
Date: Fri, 19 Sep 2025 14:45:14 +1200
Subject: [PATCH] fix(activitylog): remove export limit and fix search function
 [BE-12270] (#1232)

---
 app/react/portainer/logs/ActivityLogsView/ActivityLogsView.tsx | 2 +-
 app/react/portainer/logs/ActivityLogsView/useActivityLogs.ts   | 2 +-
 app/react/portainer/logs/ActivityLogsView/useExportMutation.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/react/portainer/logs/ActivityLogsView/ActivityLogsView.tsx b/app/react/portainer/logs/ActivityLogsView/ActivityLogsView.tsx
index 240f29701..c651cf9ad 100644
--- a/app/react/portainer/logs/ActivityLogsView/ActivityLogsView.tsx
+++ b/app/react/portainer/logs/ActivityLogsView/ActivityLogsView.tsx
@@ -25,7 +25,7 @@ export function ActivityLogsView() {
     limit: tableState.pageSize,
     sortBy: getSortType(tableState.sortBy?.id),
     sortDesc: tableState.sortBy?.desc,
-    search: tableState.search,
+    keyword: tableState.search,
     ...(range
       ? {
           after: seconds(range?.start?.valueOf()),
diff --git a/app/react/portainer/logs/ActivityLogsView/useActivityLogs.ts b/app/react/portainer/logs/ActivityLogsView/useActivityLogs.ts
index f55b64416..a5d666697 100644
--- a/app/react/portainer/logs/ActivityLogsView/useActivityLogs.ts
+++ b/app/react/portainer/logs/ActivityLogsView/useActivityLogs.ts
@@ -20,7 +20,7 @@ export interface Query {
   limit: number;
   sortBy?: SortKey;
   sortDesc?: boolean;
-  search: string;
+  keyword: string;
   after?: number;
   before?: number;
 }
diff --git a/app/react/portainer/logs/ActivityLogsView/useExportMutation.ts b/app/react/portainer/logs/ActivityLogsView/useExportMutation.ts
index 7dfd48343..be79fc207 100644
--- a/app/react/portainer/logs/ActivityLogsView/useExportMutation.ts
+++ b/app/react/portainer/logs/ActivityLogsView/useExportMutation.ts
@@ -14,7 +14,7 @@ export function useExportMutation() {
 async function exportActivityLogs(query: Omit<Query, 'limit'>) {
   try {
     const { data, headers } = await axios.get<Blob>('/useractivity/logs.csv', {
-      params: { ...query, limit: 2000 },
+      params: { ...query, limit: 0 },
       responseType: 'blob',
       headers: {
         'Content-type': 'text/csv',