switch to first page before filtering

elastic · Aug 19, 2022 · b9b62b2 · b9b62b2
1 parent 2ad2211
commit b9b62b2
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/x-pack/plugins/lens/public/visualizations/datatable/components/table_basic.tsx b/x-pack/plugins/lens/public/visualizations/datatable/components/table_basic.tsx
@@ -177,10 +177,19 @@ export const DatatableComponent = (props: DatatableRenderProps) => {
     [dispatchEvent]
   );
 
-  const handleFilterClick = useMemo(
-    () => (isInteractive ? createGridFilterHandler(firstTableRef, onClickValue) : undefined),
-    [firstTableRef, onClickValue, isInteractive]
-  );
+  const handleFilterClick = useMemo(() => {
+    const handler = isInteractive
+      ? createGridFilterHandler(firstTableRef, onClickValue)
+      : undefined;
+    if (handler) {
+      const wrappedHandler: typeof handler = (...args) => {
+        // update pagination
+        onChangePage(0);
+        return handler(...args);
+      };
+      return wrappedHandler;
+    }
+  }, [firstTableRef, onClickValue, isInteractive, onChangePage]);
 
   const handleTransposedColumnClick = useMemo(
     () =>