From 9a1e1140091c7b16b3ca4acb474cccb986e807da Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Fri, 5 May 2023 12:13:33 +0100
Subject: [PATCH] [v10.0.x] TablePanel: Do not allow auto-reset (#67907)

TablePanel: Do not allow auto-reset (#67477)

disallow react table to autoreset

(cherry picked from commit eb2eb65de85704cff08d5bfba7cd552ca0ef323f)

Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>
---
 packages/grafana-ui/src/components/Table/Table.tsx | 1 +
 public/app/plugins/panel/table/TablePanel.tsx      | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/Table/Table.tsx b/packages/grafana-ui/src/components/Table/Table.tsx
index 11559e32c57..be2ed09f413 100644
--- a/packages/grafana-ui/src/components/Table/Table.tsx
+++ b/packages/grafana-ui/src/components/Table/Table.tsx
@@ -120,6 +120,7 @@ export const Table = memo((props: Props) => {
       data: memoizedData,
       disableResizing: !resizable,
       stateReducer: stateReducer,
+      autoResetPage: false,
       initialState: getInitialState(initialSortBy, memoizedColumns),
       autoResetFilters: false,
       sortTypes: {
diff --git a/public/app/plugins/panel/table/TablePanel.tsx b/public/app/plugins/panel/table/TablePanel.tsx
index a080c36b3cf..fcc50f96d31 100644
--- a/public/app/plugins/panel/table/TablePanel.tsx
+++ b/public/app/plugins/panel/table/TablePanel.tsx
@@ -41,7 +41,6 @@ export function TablePanel(props: Props) {
   const tableElement = (
     <Table
       height={tableHeight}
-      // This calculation is to accommodate the optionally rendered Row Numbers Column
       width={width}
       data={main}
       noHeader={!options.showHeader}